Linus Torvalds 6d6b89bd2e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * 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		2010-03-02 07:55:08 -08:00
..
block	Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block	2010-03-01 09:00:29 -08:00
char	Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block	2010-03-01 09:00:29 -08:00
cio	[S390] Cleanup struct _lowcore usage and defines.	2010-02-26 22:37:31 +01:00
crypto	[S390] seq_file: convert drivers/s390/	2010-02-26 22:37:32 +01:00
kvm	[S390] Cleanup struct _lowcore usage and defines.	2010-02-26 22:37:31 +01:00
net	net: use helpers to access uc list V2	2010-01-25 13:36:10 -08:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2010-02-26 16:55:27 -08:00
Makefile	[S390] split/move machine check handler code	2009-03-26 15:24:10 +01:00