diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-18 05:05:50 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-18 05:05:50 +0100 |
| commit | d695cfa54e9ec48aeb149cadc8dab1240751572a (patch) | |
| tree | 503d342f303181c4a8e4fb89e070117d5760c513 /arch/arm/mm/copypage-v4wb.c | |
| parent | arm/tegra: initial device tree for tegra30 (diff) | |
| parent | ARM: kexec: use soft_restart for branching to the reboot buffer (diff) | |
| download | linux-d695cfa54e9ec48aeb149cadc8dab1240751572a.tar.xz linux-d695cfa54e9ec48aeb149cadc8dab1240751572a.zip | |
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mm/copypage-v4wb.c')
0 files changed, 0 insertions, 0 deletions