aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-loki
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-30 08:40:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-30 08:40:46 -0700
commit95237b80a3021ce5abb4d9ad330355549026f9c3 (patch)
tree8c816393b87d0a90c3a94d52e29bd3ac50d9f4d1 /arch/arm/mach-loki
parentcf4b0b2c9520728e170f7a3061e24dbae0b56ed4 (diff)
parent61e9916eba35dfb76d38013a5aae9a59cc50877a (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix failure to shutdown with CPU hotplug powerpc: Fix PCI in Holly device tree
Diffstat (limited to 'arch/arm/mach-loki')
0 files changed, 0 insertions, 0 deletions