David S. Miller 0d6c4a2e46 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/e1000e/param.c drivers/net/wireless/iwlwifi/iwl-agn-rx.c drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c drivers/net/wireless/iwlwifi/iwl-trans.h Resolved the iwlwifi conflict with mainline using 3-way diff posted by John Linville and Stephen Rothwell. In 'net' we added a bug fix to make iwlwifi report a more accurate skb->truesize but this conflicted with RX path changes that happened meanwhile in net-next. In e1000e a conflict arose in the validation code for settings of adapter->itr. 'net-next' had more sophisticated logic so that logic was used. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-07 23:35:40 -04:00
..
firewire
hv	Tools: hv: Support enumeration from all the pools	2012-03-16 13:36:04 -07:00
include/tools	tools/include: Add byteshift headers for endian access	2012-02-28 10:22:51 -08:00
lguest	lguest: move the lguest tool to the tools directory	2012-01-12 15:44:47 +10:30
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	perf symbols: Read plt symbols from proper symtab_type binary	2012-04-20 13:34:49 -03:00
power	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-03-30 16:45:39 -07:00
testing	ktest: Fix reboot on success stopping all reboots	2012-05-01 08:25:48 -04:00
usb	Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-22 09:40:53 -07:00
virtio	virtio/tools: add delayed interupt mode	2012-05-02 18:22:14 +03:00
vm	mm: move slabinfo.c to tools/vm	2012-03-28 17:14:37 -07:00