Greg Kroah-Hartman 6eafa4604c Merge 3.1-rc4 into staging-next ... This resolves a conflict with: drivers/staging/brcm80211/brcmsmac/types.h Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2011-08-29 08:47:46 -07:00
..
core	staging: tidspbridge: fix compilation on dsp clock functions	2011-08-24 14:35:26 -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: dont cast void* from kmalloc()	2011-08-23 15:22:57 -07:00
hw	Fix common misspellings	2011-03-31 11:26:23 -03:00
include/dspbridge	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
pmgr	Fix common misspellings	2011-03-31 11:26:23 -03:00
rmgr	Fix common misspellings	2011-03-31 11:26:23 -03:00
Kconfig	Revert "staging: tidspbridge - update Kconfig to select IOMMU module"	2010-11-10 18:34:42 -06:00
Makefile	staging: tidspbridge: remove gb bitmap implementation	2011-02-04 20:11:33 -06:00
TODO	staging: tidspbridge: remove custom linked list	2011-02-04 20:11:41 -06:00