]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2e8949f 4150764)
Merge branch 'for-linus' of git://www.jni.nu/cris
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Jun 2010 15:51:25 +0000 (08:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Jun 2010 15:51:25 +0000 (08:51 -0700)
commitb904d7131d116900524bd36ec170dcd97846bfd3
treeacd97b3f0027a8dd8659181a316677ee9f578bcctree | snapshot
parent2e8949f09e3097c629f33323eaf280cf5c88c81acommit | diff
parent4150764fbba03ce4675b02b10872c665bb05a8aacommit | 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
Linux kernel for KaRo TX COM modules