summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/include/mach
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-28 00:20:21 (GMT)
committerOlof Johansson <olof@lixom.net>2012-03-28 00:25:45 (GMT)
commit88b48684fe2d4f6207223423227c80d5408bccaf (patch)
tree856e9ce9f7b1ec5d94569925ac78c38daef71317 /arch/arm/mach-pxa/include/mach
parentb521d929b330d665cb3a42b26eaaa5690dc9dad7 (diff)
parent7175f80ba38a6b056508c4eadaab829593abbf2b (diff)
downloadlinux-fsl-qoriq-88b48684fe2d4f6207223423227c80d5408bccaf.tar.xz
Merge branch 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup2
* 'for-3.4/fixes-for-io-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: tegra: Include assembler.h in sleep.S to fix build break
Diffstat (limited to 'arch/arm/mach-pxa/include/mach')
0 files changed, 0 insertions, 0 deletions