]> 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, 30 Apr 2012 01:33:01 +0000 (11:33 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 01:33:01 +0000 (11:33 +1000)
commiteb67e7bf770fa71f8ece85c36f49e0af21523e42
treec26976feb7d06db7588d2c32165c0584f9cb92bc
parent41f1ae3dc75f175208a421b808a57b645fd3dfd0
parentfc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-omap.c