diff options
author | 2010-06-01 08:51:25 -0700 | |
---|---|---|
committer | 2010-06-01 08:51:25 -0700 | |
commit | b904d7131d116900524bd36ec170dcd97846bfd3 (patch) | |
tree | acd97b3f0027a8dd8659181a316677ee9f578bcc /COPYING | |
parent | intel_scu_ipc: Length fix (diff) | |
parent | CRIS: Don't use mask_irq as symbol name (diff) | |
download | linux-b904d7131d116900524bd36ec170dcd97846bfd3.tar.gz linux-b904d7131d116900524bd36ec170dcd97846bfd3.tar.bz2 linux-b904d7131d116900524bd36ec170dcd97846bfd3.zip |
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
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions