diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:21:16 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:21:16 +0000 |
| commit | 9cad9a5ff61abeddc2acb22aace9245f39b98f72 (patch) | |
| tree | 802d6da614bc5fdeb2e21d7f86587368cb8ae9d5 /include/net/dn_route.h | |
| parent | e817e49f400b3fd5a7dd68f8f10b31451c4beef0 (diff) | |
| parent | bad134090385d577e9ecabef83f8fa737eb7a1af (diff) | |
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 'include/net/dn_route.h')
0 files changed, 0 insertions, 0 deletions