linux/drivers/staging/westbridge/astoria
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
..
api drivers/staging: delete double assignment 2010-11-09 14:05:22 -08:00
arch/arm Staging: Cypress WestBridge OMAP3430 Kernel Hal: Remove unneeded local variables from alloc functions 2010-11-09 16:38:40 -08:00
block staging: Final semaphore cleanup 2010-10-30 12:12:50 +02:00
device staging: west bridge, addition of common lock on cyasdevice 2010-10-05 20:28:34 -07:00
gadget staging: west bridge cyasgadget, removal of " " before ";" 2010-10-05 18:47:59 -07:00
include/linux/westbridge Staging: west bridge, removal of " " before ";" 2010-09-29 18:28:26 -07:00
Kconfig
Makefile