diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:52:43 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:52:43 (GMT) |
| commit | f8da810cbb823c9781d703319ac4303568008fae (patch) | |
| tree | 03b33a2e85f0cfc2547749aa28acf4630f6989ac /Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt | |
| parent | 03e86b3a27d4649fe0109617bae1fced54e150e0 (diff) | |
| parent | 964ea47572b89589b61b553e44bbe9907d4f12a6 (diff) | |
| download | linux-fsl-qoriq-f8da810cbb823c9781d703319ac4303568008fae.tar.xz | |
Merge branch 'tegra/clk' into next/dt2
This is a dependency for the tegra/dt branch.
Conflicts:
drivers/clocksource/tegra20_timer.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.txt')
0 files changed, 0 insertions, 0 deletions