diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 21:57:28 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 21:57:28 +0100 |
commit | f4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (patch) | |
tree | 71c0860b9271daac24dfa37350ec3f569e2583f2 /arch/arm/mach-s3c2410/include/mach/bast-map.h | |
parent | Merge branch 'spear/dt' into next/dt2 (diff) | |
parent | arm: tegra: dts: Mark USB1 as an OTG port on Seaboard (diff) | |
download | linux-f4eb28340771c12cdbf8b5ec149dbd3b0eef1687.tar.xz linux-f4eb28340771c12cdbf8b5ec149dbd3b0eef1687.zip |
Merge branch 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into next/dt2
* 'for-3.4/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
arm: tegra: dts: Mark USB1 as an OTG port on Seaboard
arm: tegra: dts: Add legacy mode support to Tegra2x USB1 port
arm: tegra: dts: Support host/device selection and legacy mode
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/bast-map.h')
0 files changed, 0 insertions, 0 deletions