Merge branch 'for-2636/i2c/nxp' into next-i2c
Ben Dooks [Tue, 10 Aug 2010 23:35:22 +0000 (00:35 +0100)]

Trivial merge