]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07bf925 8de8187)
Merge remote-tracking branch 'idle/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Nov 2013 00:26:37 +0000 (11:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Nov 2013 00:26:37 +0000 (11:26 +1100)
Conflicts:
drivers/idle/intel_idle.c


Trivial merge
Linux kernel for KaRo TX COM modules