]> 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, 2 Apr 2012 00:59:58 +0000 (10:59 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Apr 2012 00:59:58 +0000 (10:59 +1000)
commitcaf9292ac8eff31449f81b598c2ee9bc5049f950
treede1744f55a5b3f864b1f997c50e2a643a048514a
parentb12973d676343103d29119824cac59b591211b0f
parentfc84fe19ffb9eee7e6b3301bc6cd45b22f187bd7
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

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