diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:43:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 17:43:45 -0400 |
| commit | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 (patch) | |
| tree | ca8654a286f61da917318645cab9e061095ecdba /Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt | |
| parent | a94d236dc355f374857ee4e6e78b7dec8a0f29e3 (diff) | |
| parent | f31c2f1c68aff83277eddc6798adf3438e9c680a (diff) | |
Merge branch 'late/clksrc' into late/cleanup
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.
Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
Diffstat (limited to 'Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt b/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt index 0921fac73528..e885680f6b45 100644 --- a/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt +++ b/Documentation/devicetree/bindings/clock/nvidia,tegra20-car.txt | |||
| @@ -120,8 +120,8 @@ Required properties : | |||
| 120 | 90 clk_d | 120 | 90 clk_d |
| 121 | 91 unassigned | 121 | 91 unassigned |
| 122 | 92 sus | 122 | 92 sus |
| 123 | 93 cdev1 | 123 | 93 cdev2 |
| 124 | 94 cdev2 | 124 | 94 cdev1 |
| 125 | 95 unassigned | 125 | 95 unassigned |
| 126 | 126 | ||
| 127 | 96 uart2 | 127 | 96 uart2 |