1. 06 Jan, 2007 38 commits
  2. 04 Jan, 2007 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 · 05a8057b
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
        [SOUND] Sparc CS4231: Use 64 for period_bytes_min
        [SOUND] Sparc CS4231: Fix IRQ return value and initialization.
      05a8057b
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 8be7ed14
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [IPV4/IPV6]: Fix inet{,6} device initialization order.
        [TCP]: Use old definition of before
        [NETFILTER]: ebtables: don't compute gap before checking struct type
        [NETFILTER]: nf_nat: fix MASQUERADE crash on device down
        [NETFILTER]: New connection tracking is not EXPERIMENTAL anymore
        [NETFILTER]: Fix routing of REJECT target generated packets in output chain
        [NETFILTER]: compat offsets size change
        [SUNGEM]: PHY updates & pause fixes (#2)
        [X25]: proper prototype for x25_init_timers()
        [AF_NETLINK]: module_put cleanup
        [XFRM_USER]: avoid pointless void ** casts
        [NETFILTER] xt_hashlimit.c: fix typo
        [NET] drivers/net/loopback.c: convert to module_init()
        [PKTGEN]: Convert to kthread API.
        [NET]: ifb double-counts packets
      8be7ed14