]> 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, 29 Nov 2011 01:01:14 +0000 (12:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 01:01:14 +0000 (12:01 +1100)
commitadc0e577745f485400f522463af77e2fb14090f5
treef9e162b34898847090947adfce62e71b09b284a6
parentf598e414ceda970aea7313d0c484b8e29983b812
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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