summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 10:24:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-26 10:24:06 -0700
commit84a881657d391121cd88c37f0a312dec3528fa44 (patch)
treeb997a21cfa759cc2856197822e34277dbf5538a3 /kernel
parent1434b65731963207a4cc84bd87e6191e34321986 (diff)
parent2548baa07ddf37ea8604e9627f042616d1cdc43e (diff)
downloadlinux-84a881657d391121cd88c37f0a312dec3528fa44.tar.bz2
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions