]> 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, 15 Nov 2011 23:38:15 +0000 (10:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:38:15 +0000 (10:38 +1100)
commitf13c24601be6f3979b749f1873287c38975975df
tree250c247939e3abc1aa3d668f1331ea4c79f58f35
parent2267cced779db0423d031477d6ccf0fc983c3043
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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