]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'quilt/i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 02:16:31 +0000 (12:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Sep 2012 02:16:31 +0000 (12:16 +1000)
commitcd226766ce46f9027ed07d4343469da10d362cbe
tree3b93754f522c9cb001195a8f68c99dc48cac61e3
parenta4d9344ac37b97113f952cefe31eeea72f2152f4
parent12dc268132e07afcf2e5432b429905bcc0348081
Merge branch 'quilt/i2c'

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