]> 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>
Thu, 24 Nov 2011 02:01:31 +0000 (13:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 02:01:31 +0000 (13:01 +1100)
commit4157cab5bb27174892eeeab459b7e95b54cae746
treebbe89a3752a366b92c8879804574c2531c2c6d4f
parent72d6dd011f7bed4fe2689bb326eff4552a986bea
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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