diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:21:16 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 00:21:16 +0100 |
| commit | 9cad9a5ff61abeddc2acb22aace9245f39b98f72 (patch) | |
| tree | 802d6da614bc5fdeb2e21d7f86587368cb8ae9d5 /drivers/usb/host/ehci-mxc.c | |
| parent | Merge branch 'tegra/cleanup' into next/dt (diff) | |
| parent | Merge branch 'for-3.3/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/ol... (diff) | |
| download | linux-9cad9a5ff61abeddc2acb22aace9245f39b98f72.tar.xz linux-9cad9a5ff61abeddc2acb22aace9245f39b98f72.zip | |
Merge branch 'tegra/dt' into next/dt
* tegra/dt:
arm/tegra: Seaboard: Add GPIO key device tree nodes
arm/dt: Add ADT7461 to Seaboard
arm/dt: tegra: Use new compatible value for DVC I2C controller
arm/tegra: initial device tree for tegra30
arm/tegra: convert tegra20 to GIC devicetree binding
arm/dt: tegra: Fix SDHCI nodes to match board files
arm/dt: tegra: Fix serial nodes to match board files
arm/dt: tegra: Fix I2C nodes to match board files
arm/dt: tegra: Remove /chosen node
arm/dt: tegra: Remove /memreserve/ from device-tree files
arm/tegra: board-dt: Enable audio-related clocks
arm/tegra: board-dt: Fix AUXDATA typo
arm/dt: tegra: add dts file for paz00
arm/tegra: Add device-tree support for TrimSlice board
arm/dt: tegra: Clean up I2S and DAS nodes
USB: ehci-tegra: add probing through device tree
arm/dt: add basic usb nodes to tegra device trees
arm/tegra: fix variable formatting in makefile
Conflicts:
arch/arm/mach-tegra/Makefile
Diffstat (limited to 'drivers/usb/host/ehci-mxc.c')
0 files changed, 0 insertions, 0 deletions