]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 31e06a4 93bbd0c)
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Dec 2012 00:59:50 +0000 (16:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Dec 2012 00:59:50 +0000 (16:59 -0800)
Pull C6X fixes from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: use generic kvm_para.h
  c6x: remove internal kernel symbols from exported setup.h
  c6x: fix misleading comment
  c6x: run do_notify_resume with interrupts enabled


Trivial merge
Linux kernel for KaRo TX COM modules