]> 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: da00414 f1d58d7)
Merge remote-tracking branch 'slab/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 01:29:28 +0000 (12:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 01:29:28 +0000 (12:29 +1100)
Conflicts:
mm/slob.c


Trivial merge
Linux kernel for KaRo TX COM modules