]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:31:52 +0000 (11:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 01:31:52 +0000 (11:31 +1000)
Conflicts:
drivers/i2c/busses/i2c-omap.c


Trivial merge