]> 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>
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)
commitb4dfad0fcd088ae03b7701826b6a428326ffb348
tree3a0fcc6a7c62408aacc806212aedd787d215180e
parent9d53502060d891df1c8f1500702c0de999eb85c3
parentfc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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