Greg Kroah-Hartman f7a0d426f3 Merge 3.3-rc7 into usb-next ... This resolves the conflict with drivers/usb/host/ehci-fsl.h that happened with changes in Linus's and this branch at the same time. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-03-12 09:13:31 -07:00
..
firewire	tools/firewire: nosy-dump: increment program version	2010-07-27 11:04:12 +02:00
hv	Staging: hv: move hyperv code out of staging directory	2011-10-10 22:52:55 -06: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 tools: Handle kernels that don't support attr.exclude_{guest,host}	2012-03-03 12:19:56 -03: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	While demoing ktest at ELC in 2012, it was embarrassing that the	2012-02-27 15:43:05 -08:00
usb	usb: gadget: update Michal Nazarewicz's email address	2012-01-24 11:45:11 +02:00
virtio	virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf	2012-01-12 15:44:42 +10:30