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
..
boot	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
configs	xtensa: enable m41t80 driver in s6105_defconfig	2009-06-22 02:38:11 -07:00
include/asm	MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself	2010-02-20 16:41:46 +00:00
kernel	resource/PCI: mark struct resource as const	2010-02-22 16:16:57 -08:00
lib	xtensa: move headers files to arch/xtensa/include	2008-11-06 10:25:09 -08:00
mm	MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself	2010-02-20 16:41:46 +00:00
platforms	net: use netdev_mc_count and netdev_mc_empty when appropriate	2010-02-12 11:38:58 -08:00
variants	xtensa: support s6000 gpio irqs and alternate function selection	2009-06-22 02:37:26 -07:00
Kconfig	xtensa: implement ccount calibration for s6000	2009-05-11 22:00:17 -07:00
Kconfig.debug	[PATCH] xtensa: Architecture support for Tensilica Xtensa Part 1	2005-06-24 00:05:21 -07:00
Makefile	xtensa: only build platform or variant if they contain a Makefile	2009-04-03 00:06:45 -07:00