Merge branch 'topic-0620/samsung-i2c-3.4' into chromeos-exynos-3.4
authorOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 18:52:59 +0000 (11:52 -0700)
committerOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 18:52:59 +0000 (11:52 -0700)
commitc7de230355558eeff2cee8103dbe2c69752e45e8
tree726eaa4f28bc47cc796eb3965a014900cb2e70f2
parent21c9b5eeab1773128c9ff3b9cf0df3fcfce4cabd
parent7908060e6bce5876524ceb073738c3e08b21fb68
Merge branch 'topic-0620/samsung-i2c-3.4' into chromeos-exynos-3.4

* topic-0620/samsung-i2c-3.4:
  i2c-s3c2410: Get the i2c bus number from alias id
  CHROMIUM: i2c: chromeos_ec: add I2C pass-through
  i2c-s3c2410: Use of_match_ptr for defining the of_match_table
  UPSTREAM: i2c: Dynamically assign adapter id if it wasn't explictly specified
  UPSTREAM: i2c-s3c2410: Add HDMIPHY quirk for S3C2440
  UPSTREAM: i2c-s3c2410: Rework device type handling