]> 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, 14 Dec 2011 01:03:48 +0000 (12:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 01:03:48 +0000 (12:03 +1100)
commit270942c3c3849a143477e7ae02dba9bb09bd4cfc
tree0805d83488878d6cc628942a6bb0c32a856c38e8
parentde853ce9c0592a648889b479afeab7183565d798
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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