]> 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, 6 Dec 2011 00:24:12 +0000 (11:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:24:12 +0000 (11:24 +1100)
commitf0dd1cd470577c03ecb903aef940f5f6238b602f
tree33eb645b52e3eae2eeea30cb463ba44050fcad24
parent2a1c3c9d141e32df843ea873927bfa1c25734105
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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