1. 27 Mar, 2007 35 commits
  2. 26 Mar, 2007 5 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 703071b5
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [SUNGEM]: Fix MAC address setting when interface is up.
        [IPV4] fib_trie: Document locking.
        [NET]: Correct accept(2) recovery after sock_attach_fd()
        [PPP]: Don't leak an sk_buff on interface destruction.
        [NET_SCHED]: Fix ingress locking
        [NET_SCHED]: cls_basic: fix NULL pointer dereference
        [DCCP]: make dccp_write_xmit_timer() static again
        [TG3]: Update version and reldate.
        [TG3]: Exit irq handler during chip reset.
        [TG3]: Eliminate the unused TG3_FLAG_SPLIT_MODE flag.
        [IPV6]: Fix routing round-robin locking.
        [DECNet] fib: Fix out of bound access of dn_fib_props[]
        [IPv4] fib: Fix out of bound access of fib_props[]
        [NET] AX.25 Kconfig and docs updates and fixes
        [NET]: Fix neighbour destructor handling.
        [NET]: Fix fib_rules compatibility breakage
        [SCTP]: Update SCTP Maintainers entry
        [NET]: remove unused header file: drivers/net/wan/lmc/lmc_media.h
      703071b5
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 6288c338
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] zcrypt: Fix ap_poll_requests counter in lost requests error path.
        [S390] zcrypt: Fix possible dead lock in AP bus module.
        [S390] cio: Device status validity.
        [S390] kprobes: Align probe address.
        [S390] Fix TCP/UDP pseudo header checksum computation.
        [S390] dasd: Work around gcc bug.
      6288c338
    • Ruben Vandeginste's avatar
      [SUNGEM]: Fix MAC address setting when interface is up. · 09c72ec8
      Ruben Vandeginste authored
      This patch implements set_mac_address for the sungem driver.  This
      allows changing the mac address of the interface, even when the
      interface is up.
      Signed-off-by: default avatarRuben Vandeginste <snowbender@gmail.com>
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      09c72ec8
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 8b66a454
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: fix usb-serial/ftdi build warning
        USB: fix usb-serial/generic build warning
        USB: another entry for the quirk list
        USB: remove duplicated device id in airprime driver
        USB: omap_udc: workaround dma_free_coherent() bogosity
        UHCI: Fix problem caused by lack of terminating QH
      8b66a454
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 55ab9756
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
        PCI: Fix warning message in PCIE port driver
        PCI: Stop unhiding the SMBus on Toshiba laptops
        PCI: Fix up PCI power management doc
        pci: set pci=bfsort for PowerEdge R900
      55ab9756