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
..
core	Merge 3.4-rc5 into staging-next	2012-05-02 11:48:07 -07:00
Documentation	staging: ti dspbridge: remove contributor leftovers	2010-07-08 13:31:45 -07:00
dynload	Revert wrong fixes for common misspellings	2011-04-26 23:31:11 -07:00
gen	staging: tidspbridge: remove gh_init() and gh_exit()	2012-03-09 13:21:08 -08:00
hw	staging: tidspbridge: MMU2 registers are limited to 32-bit data access	2011-10-19 13:42:49 -07:00
include/dspbridge	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
pmgr	staging: tidspbridge: remove gh_init() and gh_exit()	2012-03-09 13:21:08 -08:00
rmgr	staging: tidspbridge: remove nldr_init() and nldr_exit()	2012-03-09 13:21:08 -08:00
Kconfig	staging: tidspbridge: always compile dsp wdt code	2012-02-24 12:05:38 -08:00
Makefile	staging: tidspbridge: Rename module from bridgedriver to tidspbridge	2012-02-09 09:37:11 -08:00
TODO	staging: tidspbridge: remove custom linked list	2011-02-04 20:11:41 -06:00