]> 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, 25 Jul 2012 00:10:55 +0000 (10:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:10:55 +0000 (10:10 +1000)
commit458d632c762881d914fded7a5086738cc2ecc923
tree442b67e3b085b01848f849a5e5a9bb9c25733e69
parent7ecd64596b5e14edf444581bfba3dfe18f1c6c9a
parentfc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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