]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:41:20 +0000 (12:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:41:20 +0000 (12:41 +1100)
commit1984afc8d59bc506bf1689af6898777f275f7580
tree41cdff90857a1739e04835418147d8a3c2fc5323
parent22b4e8e32e66f461a3c2e7f4f09f9b493ebf0cfb
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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