]> 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, 20 Dec 2011 00:52:37 +0000 (11:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 00:52:37 +0000 (11:52 +1100)
commit08004a908cd973b5cfb6bc9cd76f6ef534bd5406
tree5fa69640603c701506d498d121e9778a11ac5b94
parent50f788522bd42cdb84bd1793b8a9f44a55a2b119
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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