Merge branch 'for_3.1/i2c-andy' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Wed, 13 Jul 2011 08:06:23 +0000 (01:06 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 13 Jul 2011 08:06:23 +0000 (01:06 -0700)
Conflicts:
include/linux/i2c-omap.h


Trivial merge