tree b997a21cfa759cc2856197822e34277dbf5538a3
parent 1434b65731963207a4cc84bd87e6191e34321986
parent 2548baa07ddf37ea8604e9627f042616d1cdc43e
author Linus Torvalds <torvalds@linux-foundation.org> 1211822646 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1211822646 -0700

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