From: Linus Torvalds Date: Mon, 26 May 2008 17:24:06 +0000 (-0700) Subject: Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 X-Git-Tag: v2.6.26-rc4~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=84a881657d391121cd88c37f0a312dec3528fa44;p=linux-2.6-omap-h63xx.git Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Align i2c_device_id tuner: Do not alter i2c_client.name --- 84a881657d391121cd88c37f0a312dec3528fa44