Ingo Molnar 7fd52392c5 Merge branch 'linus' into perf/urgent ... Merge reason: we need to fix a non-trivial merge conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2012-03-26 17:19:03 +02:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
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	Merge branch 'linus' into perf/urgent	2012-03-26 17:19:03 +02:00
power	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-01-18 15:51:48 -08:00
slub	Merge branches 'slab/next' and 'slub/partial' into slab/for-linus	2011-10-26 18:09:12 +03:00
testing	ktest for v3.4	2012-03-23 09:28:45 -07: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: rename virtqueue_add_buf_gfp to virtqueue_add_buf	2012-01-12 15:44:42 +10:30