]> 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, 22 Nov 2011 02:42:00 +0000 (13:42 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:42:00 +0000 (13:42 +1100)
commitd49fa446b6a3ef46978a768942302060456f3f78
tree4fd80833b1c2efeb33ddefed9ca31f5796aea8d3
parentdd2e1a1ce3458ee3db18157cbf4b338fe3a1790b
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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