Greg Kroah-Hartman 2af10844eb USB: Merge 2.6.37-rc5 into usb-next ... This is to resolve the conflict in the file, drivers/usb/gadget/composite.c that was due to a revert in Linus's tree needed for the 2.6.37 release. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-12-22 12:25:34 -08:00
..
common	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-12-20 10:35:04 -08:00
dvb
IR
radio	Merge branch 'bkl_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-12-17 09:28:17 -08:00
video	USB: Merge 2.6.37-rc5 into usb-next	2010-12-22 12:25:34 -08:00
Kconfig
Makefile