]> 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: 016c3fd 79787f2)
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:38:01 +0000 (15:38 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:38:01 +0000 (15:38 +1000)
Conflicts:
drivers/of/base.c


Trivial merge
Linux kernel for KaRo TX COM modules