1. 30 1月, 2008 38 次提交
  2. 29 1月, 2008 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25 · 0ba6c33b
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits)
        [IPV6] ADDRLABEL: Fix double free on label deletion.
        [PPP]: Sparse warning fixes.
        [IPV4] fib_trie: remove unneeded NULL check
        [IPV4] fib_trie: More whitespace cleanup.
        [NET_SCHED]: Use nla_policy for attribute validation in ematches
        [NET_SCHED]: Use nla_policy for attribute validation in actions
        [NET_SCHED]: Use nla_policy for attribute validation in classifiers
        [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers
        [NET_SCHED]: sch_api: introduce constant for rate table size
        [NET_SCHED]: Use typeful attribute parsing helpers
        [NET_SCHED]: Use typeful attribute construction helpers
        [NET_SCHED]: Use NLA_PUT_STRING for string dumping
        [NET_SCHED]: Use nla_nest_start/nla_nest_end
        [NET_SCHED]: Propagate nla_parse return value
        [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get
        [NET_SCHED]: act_api: use nlmsg_parse
        [NET_SCHED]: act_api: fix netlink API conversion bug
        [NET_SCHED]: sch_netem: use nla_parse_nested_compat
        [NET_SCHED]: sch_atm: fix format string warning
        [NETNS]: Add namespace for ICMP replying code.
        ...
      0ba6c33b
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 21af0297
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (68 commits)
        [MIPS] remove Documentation/mips/GT64120.README
        [MIPS] Malta: remaining bits of the board support code cleanup
        [MIPS] Malta: make the helper function static
        [MIPS] Malta: fix braces at single statement blocks
        [MIPS] Malta, Atlas: move an extern function declaration to the header file
        [MIPS] Malta: Use C89 style for comments
        [MIPS] Malta: else should follow close brace in malta_int.c
        [MIPS] Malta: remove a superfluous comment
        [MIPS] Malta: include <linux/cpu.h> instead of <asm/cpu.h>
        [MIPS] Malta, Atlas, Sead: remove an extern from .c files
        [MIPS] Malta: fix oversized lines in malta_int.c
        [MIPS] Malta: remove a dead function declaration
        [MIPS] Malta: use tabs not spaces
        [MIPS] Malta: set up the screen info in a separate function
        [MIPS] Malta: check the PCI clock frequency in a separate function
        [MIPS] Malta: use the KERN_ facility level in printk()
        [MIPS] Malta: use Linux kernel style for structure initialization
        [MIPS]: constify function pointer tables
        [MIPS] compat: handle argument endianess of sys32_(f)truncate64 with merge_64
        [MIPS] Cobalt 64-bits kernels can be safely unmarked experimental
        ...
      21af0297