]> 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: bbbcde9 ff5dd32)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Dec 2010 18:25:02 +0000 (10:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Dec 2010 18:25:02 +0000 (10:25 -0800)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_cs5536: avoid implicit MSR API inclusion on x86-64


Trivial merge
Linux kernel for KaRo TX COM modules