Merge branch 'topic-0620/samsung-spi-3.4' into chromeos-exynos-3.4
authorOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 18:50:59 +0000 (11:50 -0700)
committerOlof Johansson <olofj@chromium.org>
Wed, 20 Jun 2012 18:50:59 +0000 (11:50 -0700)
commiteab5f4db7d3a9c29716d575c1119b817871f462e
tree404ff6385ef78afd37d3cad6c4c1775c0baafb9c
parent488beefdb1d6df6c3e03a4de9b06e9e657abc08b
parent5aade32f25ef45913230216b51ec2cfc1974b86b
Merge branch 'topic-0620/samsung-spi-3.4' into chromeos-exynos-3.4

* topic-0620/samsung-spi-3.4:
  mtd: m25p80: Add support for Winbond W25Q80BW
  ARM: Exynos4: Fix the incorrect hierarchy of spi controller bus clock
  spi: s3c64xx: add device tree support
  spi: s3c64xx: Remove the 'set_level' callback from controller data
  ARM: Samsung: Modify s3c64xx_spi{0|1|2}_set_platdata function
  ARM: Samsung: Remove pdev pointer paremeter from spi gpio setup functions
  spi: s3c64xx: move controller information into driver data
  spi: s3c64xx: remove unused S3C64XX_SPI_ST_TRLCNTZ macro
arch/arm/plat-samsung/devs.c