]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:31:52 +0000 (11:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:31:52 +0000 (11:31 +1000)
commit8b75de89112928e7b298a2021421008884361967
tree93c505d37f9a9bed8c45fc92f5fca9a9aa069691
parent1de5341e1417de9c5124080ec0c8bb39cf16fe2a
parentfc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-omap.c