]> 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, 30 Nov 2011 01:36:18 +0000 (12:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 01:36:18 +0000 (12:36 +1100)
commit145a5696030c117edc5fbe85fe12dc2e43426c38
tree181b63f94f237acae9bdd16569427c3a40565337
parentbb12e873dacb18a48da64b556a297bc635ee2e8a
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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