]> 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>
Mon, 7 Nov 2011 00:33:52 +0000 (11:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:33:52 +0000 (11:33 +1100)
commit7ed4e4f6ccd588b14fcc0e777acd859ee44389f9
tree4de1258901fd802a2af38c0a191874621d113823
parent41aa8a1168de79d74308c4a8978e94f791c4dcbd
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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