Greg Kroah-Hartman 491acf0032 Staging: Merge 2.6.37-rc2 into staging-next ... This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drivers/staging/intel_sst/intel_sst_app_interface.c All should be resolved now. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2010-11-16 10:44:50 -08:00
..
ft1000-pcmcia	Staging: ft1000:ft1000-pcmia: Makefile: replace the use of <module>-objs with <module>-y	2010-10-08 07:23:49 -07:00
ft1000-usb	Staging: Merge 2.6.37-rc2 into staging-next	2010-11-16 10:44:50 -08:00
Kconfig	Staging: ft1000: mark pcmcia driver broken	2010-09-22 12:17:16 -07:00
Makefile	Staging: Add support for Flarion OFDM usb and pcmcia devices.	2010-09-22 08:24:30 -07:00
TODO	Staging: Add support for Flarion OFDM usb and pcmcia devices.	2010-09-22 08:24:30 -07:00