]> 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, 21 Dec 2011 00:47:18 +0000 (11:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 00:47:18 +0000 (11:47 +1100)
commit9e275302c1748363e92ba37d03db1e31d0da41a9
treea346cb64a17c56377d8e4a2c0019981ffa52fd2c
parent223c6dafb521e0565113003a2896fa190059f1a7
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c