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
..
arch-v10/arch	CRIS: Don't use mask_irq as symbol name	2010-05-25 17:48:14 +02:00
arch-v32	CRIS: Don't use mask_irq as symbol name	2010-05-25 17:48:14 +02:00
asm	Merge branch 'for-linus' of git://www.jni.nu/cris	2010-06-01 08:51:25 -07:00