Merge branch 'i2c_reset_devel_3.3' of git://git.pwsan.com/linux-2.6 into i2c
authorTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:13:34 +0000 (16:13 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 17 Dec 2011 00:13:34 +0000 (16:13 -0800)

Trivial merge