Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07:00
..
Kconfig	…
Makefile	drivers/staging: do not use EXTRA_CFLAGS	2011-08-23 15:24:46 -07:00
TODO	staging: Update TODO for rts5139 and rts_pstor	2012-02-24 12:03:14 -08:00
debug.h	staging: rts_pstor: use #ifdef instead of #if	2011-04-25 17:08:31 -07:00
general.c	…
general.h	…
ms.c	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
ms.h	…
rtsx.c	staging:rts_pstor:Avoid "Bad target number" message when probing driver	2012-04-10 09:18:16 -07:00
rtsx.h	drivers: staging: rts_pstor fixed checkpatch warnings	2011-10-17 15:17:17 -07:00
rtsx_card.c	…
rtsx_card.h	…
rtsx_chip.c	staging: Convert vmalloc/memset to vzalloc	2011-06-28 13:23:57 -07:00
rtsx_chip.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
rtsx_scsi.c	staging: rts_pstor: dont cast void* from kmalloc()	2011-08-23 15:22:58 -07:00
rtsx_scsi.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
rtsx_sys.h	…
rtsx_transport.c	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
rtsx_transport.h	…
sd.c	staging:rts_pstor:Fix SDIO issue	2011-10-17 15:17:17 -07:00
sd.h	staging: rts_pstor: Fix a bug that a MMCPlus card can't be accessed	2011-07-05 19:54:58 -07:00
spi.c	Staging: rts_pstor: dont cast void* from kmalloc()	2011-08-23 15:22:57 -07:00
spi.h	…
trace.h	staging: rts_pstor: use #ifdef instead of #if	2011-04-25 17:08:31 -07:00
xd.c	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6	2011-05-23 12:49:28 -07:00
xd.h	…