1. 03 3月, 2010 38 次提交
  2. 02 3月, 2010 2 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 · b7f3a209
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
        sparc: Support show_unhandled_signals.
        sparc: use __ratelimit
        sunxvr500: Additional PCI id for sunxvr500 driver
        sparc: use asm-generic/scatterlist.h
        sparc64: If 'slot-names' property exist, create sysfs PCI slot information.
        sparc: remove trailing space in messages
        sparc: remove redundant return statements
      b7f3a209
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 · 6d6b89bd
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
        virtio_net: remove forgotten assignment
        be2net: fix tx completion polling
        sis190: fix cable detect via link status poll
        net: fix protocol sk_buff field
        bridge: Fix build error when IGMP_SNOOPING is not enabled
        bnx2x: Tx barriers and locks
        scm: Only support SCM_RIGHTS on unix domain sockets.
        vhost-net: restart tx poll on sk_sndbuf full
        vhost: fix get_user_pages_fast error handling
        vhost: initialize log eventfd context pointer
        vhost: logging thinko fix
        wireless: convert to use netdev_for_each_mc_addr
        ethtool: do not set some flags, if others failed
        ipoib: returned back addrlen check for mc addresses
        netlink: Adding inode field to /proc/net/netlink
        axnet_cs: add new id
        bridge: Make IGMP snooping depend upon BRIDGE.
        bridge: Add multicast count/interval sysfs entries
        bridge: Add hash elasticity/max sysfs entries
        bridge: Add multicast_snooping sysfs toggle
        ...
      
      Trivial conflicts in Documentation/feature-removal-schedule.txt
      6d6b89bd