Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux into...
authorTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 12:11:18 +0000 (05:11 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 6 Jul 2012 12:11:18 +0000 (05:11 -0700)

Trivial merge