]> 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: 2a1c3c9 f8420b7)
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:24:12 +0000 (11:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:24:12 +0000 (11:24 +1100)
Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c


Trivial merge
Linux kernel for KaRo TX COM modules