diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:52:43 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:52:43 +0200 |
| commit | f8da810cbb823c9781d703319ac4303568008fae (patch) | |
| tree | 03b33a2e85f0cfc2547749aa28acf4630f6989ac /scripts/patch-kernel | |
| parent | Merge tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2 (diff) | |
| parent | clk: tegra: fix enum tegra114_clk to match binding (diff) | |
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 'scripts/patch-kernel')
0 files changed, 0 insertions, 0 deletions