]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/boards' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 20:42:47 +0000 (13:42 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 5 May 2014 20:42:47 +0000 (13:42 -0700)
commit791a991fa1c8795ffd39f67f91bb27b2478314d7
treec0734b5c8cc4e66677ad03b5ac9083501907b484
parent8bebb85c22e32bfa6d5b19d1f4e24bbd06aaf50f
parenta2fc987ae2e2aec49a59f4da53525bfe094af316
Merge branch 'next/boards' into for-next

* next/boards:
  ARM: shmobile: Enable USB [EO]HCI HCD support in shmobile_defconfig
  ARM: shmobile: Enable VSP1 in shmobile_defconfig
  ARM: shmobile: Enable HIGHMEM in shmobile_defconfig
  ARM: shmobile: Enable USBHS gadget support in shmobile_defconfig
  ARM: shmobile: Include at24.c in shmobile_defconfig
  ARM: shmobile: Include i2c-shmobile.c in shmobile_defconfig
  ARM: shmobile: multiplatform: Enable MSIOF in defconfig