]> 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>
Fri, 18 Nov 2011 00:48:48 +0000 (11:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 00:48:48 +0000 (11:48 +1100)
commit40a20435e40c48577217d6dc30abdbc47436fe0c
tree5b757f760284b5a6151741266dc2576c160f3eef
parent67e050bbc7dc2cccfb39e98a7e7bc3f9a99ba206
parentf8420b7bf6ce1a3c483cbc0a5a48ee82715224a0
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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