Merge branch 'for-2639/i2c/i2c-tegra' of git://git.fluff.org/bjdooks/linux into for...
authorColin Cross <ccross@android.com>
Thu, 3 Mar 2011 22:17:49 +0000 (14:17 -0800)
committerColin Cross <ccross@android.com>
Thu, 3 Mar 2011 22:17:49 +0000 (14:17 -0800)

Trivial merge