Sascha Hauer e0f4fb2c98 Merge branch 'master' into next ... Conflicts: drivers/ata/disk_drive.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>		2011-11-29 20:45:23 +01:00
..
core	Merge branch 'next'	2011-10-09 03:58:49 +02:00
gadget	commands/cp: add verbose mode which displays progress bar	2011-11-22 21:13:05 +01:00
host	at91: add config option for ohci driver	2011-11-10 09:09:24 +01:00
otg	introduce io.h	2011-09-22 19:03:05 +02:00
storage	Use generic block layer to access the drives and do partition parsing	2011-11-28 09:23:24 +01:00
Kconfig	USB mass storage device driver initial implementation	2011-09-23 08:53:22 +02:00
Makefile	USB mass storage device driver initial implementation	2011-09-23 08:53:22 +02:00