]> 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: 9d53502 fc84fe1)
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:12:37 +0000 (11:12 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 4 Apr 2012 01:12:37 +0000 (11:12 +1000)
Conflicts:
drivers/i2c/busses/i2c-omap.c


Trivial merge
Linux kernel for KaRo TX COM modules