]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 01:30:18 +0000 (11:30 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Sep 2012 01:30:18 +0000 (11:30 +1000)
Conflicts:
drivers/i2c/busses/i2c-i801.c


Trivial merge