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)
1  2 
drivers/i2c/busses/i2c-omap.c

Simple merge