From: Linus Torvalds Date: Wed, 17 Jun 2009 04:26:42 +0000 (-0700) Subject: Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux X-Git-Tag: upstream/snapshot3+hdmi~18571 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65795efbd380a832ae508b04dba8f8e53f0b84d9;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux * 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux: i2c-stu300: Make driver depend on MACH_U300 i2c-s3c2410: use resource_size() i2c: Use resource_size macro i2c: ST DDC I2C U300 bus driver v3 i2c-bfin-twi: pull in io.h for ioremap() --- 65795efbd380a832ae508b04dba8f8e53f0b84d9