Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638
authorBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:24:36 +0000 (22:24 +0000)
committerBen Dooks <ben-linux@fluff.org>
Wed, 12 Jan 2011 22:24:36 +0000 (22:24 +0000)
commit7f42f9fef7bbc4f3250a33bf58170c640cd3db18
tree1414676d0fa9a4d51bfb95bbb758f6141657f907
parentcc3feac34617ec685551905507cd8d909be6431f
parent6a91b558648cffa94227b4ff9c6c996930bbdfd2
Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638
drivers/i2c/busses/i2c-omap.c