summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra-trimslice.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-27 21:21:44 -0700
committerOlof Johansson <olof@lixom.net>2012-03-27 21:24:03 -0700
commit1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544 (patch)
tree41ea81fdecc67d766789ea3e46b1a49773dc8ec4 /arch/arm/boot/dts/tegra-trimslice.dts
parent4788d72ce6c0d71220c06a242f935a056eccf424 (diff)
parent489e7bece7f6859a7df484a4dce08fa51fb0d876 (diff)
Merge branch 'fixes-non-critical' into next/drivers2
fixes-non-critical has already been merged upstream, and there are a handful of annoying context conflicts that it makes sense to resolve before sending up. Part of this is because there was parallel development going on between more urgent fixes and general driver fixups, it should settle down once the lpc32xx platform reaches a more steady state. Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-lpc32xx/common.h Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/tegra-trimslice.dts')
0 files changed, 0 insertions, 0 deletions