Linus Torvalds b904d7131d Merge branch 'for-linus' of git://www.jni.nu/cris ... * 'for-linus' of git://www.jni.nu/cris: CRIS: Don't use mask_irq as symbol name CRIS: Simplify param.h by simply including <asm-generic/param.h> CRISv10: Whitespace fixes for hw_settings.S CRISv10: Trivial fixes. CRISv32: Fix RS485 port 4 CD Kconfig item. CRISv32: Remove duplicated Kconfig items. cris: push down BKL into some device drivers		2010-06-01 08:51:25 -07:00
..
drivers	CRISv32: Fix RS485 port 4 CD Kconfig item.	2010-05-25 13:35:31 +02:00
kernel	Merge branch 'for-linus' of git://www.jni.nu/cris	2010-06-01 08:51:25 -07:00
lib	CRISv32: Add arch optimized strcmp.	2009-06-10 15:21:03 +02:00
mach-a3	CRIS v32: Should index be positive?	2009-11-03 14:11:53 +01:00
mach-fs	cris v32: typo in crisv32_arbiter_unwatch()?	2010-03-06 11:26:28 -08:00
mm	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
Kconfig	trivial: fix typos/grammar errors in Kconfig texts	2009-03-30 15:22:01 +02:00
output_arch.ld