aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-08 10:51:01 -0800
committerOlof Johansson <olof@lixom.net>2013-01-08 10:51:19 -0800
commitfd41d91df99be02f4fc3fe79d707d2786d6e40eb (patch)
tree10fdd9626f5085e9b2c22204aea949a6bc0d8bba /arch/arm/mach-prima2
parentMerge tag 'swarren-for-3.9-arm-timer-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup (diff)
parentARM: sunxi: fix struct sys_timer removal (diff)
downloadlinux-dev-fd41d91df99be02f4fc3fe79d707d2786d6e40eb.tar.xz
linux-dev-fd41d91df99be02f4fc3fe79d707d2786d6e40eb.zip
Merge branch 'timer/cleanup' into next/cleanup
Adding a manually applied bugfix for sunxi. * timer/cleanup: ARM: sunxi: fix struct sys_timer removal Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-prima2')
0 files changed, 0 insertions, 0 deletions