Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638

This commit is contained in:
Ben Dooks 2011-01-12 22:25:32 +00:00
commit adeaf46d31