]> 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>
Thu, 3 Nov 2011 03:20:00 +0000 (14:20 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 03:20:00 +0000 (14:20 +1100)
commit112c06426baf1b7cc87ac288516a1ddfec8b3dc9
tree3468b190fa55047bb3e860878871a87373d2aefc
parent978494d7b8bfb415950fa54441930d0f7a8051fe
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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