]> 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>
Wed, 7 Dec 2011 00:50:49 +0000 (11:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 00:50:49 +0000 (11:50 +1100)
commit1c71852452d17f960ce65bb9026a866f223cfa13
tree75c48aecbdf3b017130cda921c46c3ee4e04a28a
parentd9f3fd9d61092c426a5316eece7cbe8061f73ca3
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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