diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:51:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:51:25 -0400 |
| commit | b904d7131d116900524bd36ec170dcd97846bfd3 (patch) | |
| tree | acd97b3f0027a8dd8659181a316677ee9f578bcc /scripts/kconfig/zconf.tab.c_shipped | |
| parent | 2e8949f09e3097c629f33323eaf280cf5c88c81a (diff) | |
| parent | 4150764fbba03ce4675b02b10872c665bb05a8aa (diff) | |
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 'scripts/kconfig/zconf.tab.c_shipped')
0 files changed, 0 insertions, 0 deletions