| commit | b904d7131d116900524bd36ec170dcd97846bfd3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 01 08:51:25 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 01 08:51:25 2010 -0700 |
| tree | acd97b3f0027a8dd8659181a316677ee9f578bcc | |
| 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