![]() 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> |
||
---|---|---|
.. | ||
sisusbvga | ||
adutux.c | ||
appledisplay.c | ||
cypress_cy7c63.c | ||
cytherm.c | ||
emi26.c | ||
emi62.c | ||
ftdi-elan.c | ||
idmouse.c | ||
iowarrior.c | ||
isight_firmware.c | ||
Kconfig | ||
ldusb.c | ||
legousbtower.c | ||
Makefile | ||
rio500.c | ||
rio500_usb.h | ||
trancevibrator.c | ||
usb_u132.h | ||
usblcd.c | ||
usbled.c | ||
usbsevseg.c | ||
usbtest.c | ||
uss720.c | ||
yurex.c |