Merge branch 'i2c-next-s3c' into i2c-next
Ben Dooks [Mon, 5 Jan 2009 10:54:50 +0000 (10:54 +0000)]

Trivial merge