]> 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>
Mon, 12 Dec 2011 00:35:43 +0000 (11:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:35:43 +0000 (11:35 +1100)
commiteaa6ae7ccd12c210ff3b70c9606f36e91d049da6
tree0ce280ce2327eeccbb44e8d2711fa36ff2d62e8e
parentd52ba1d35016a4de90d7a8919cf04f72abcabc08
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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