diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 20:57:28 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 20:57:28 +0000 |
commit | f4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (patch) | |
tree | 71c0860b9271daac24dfa37350ec3f569e2583f2 /drivers/watchdog | |
parent | a94c7b0a8f31a8bcf3b136d469f7eb6b6b57bb78 (diff) | |
parent | 0a428036dfb28be3e5f0d671e3457509d1f4ea29 (diff) |
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 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions