summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:15:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-27 07:15:53 -0700
commit1929cef46fb057377e43a3d594404f1432db4934 (patch)
tree47bad76826a41a841998fe45dfffb9b254a2c535 /arch/alpha/kernel/Makefile
parentb5edfefc65526b34960bbff3477ded477b0328f6 (diff)
parent7c9d93604b25c25dc059e2b12ad5e89ca3ed4376 (diff)
downloadlinux-stable-1929cef46fb057377e43a3d594404f1432db4934.tar.gz
linux-stable-1929cef46fb057377e43a3d594404f1432db4934.tar.bz2
linux-stable-1929cef46fb057377e43a3d594404f1432db4934.zip
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 mpic_resume on early G5 macs powerpc: rtas_flash needs to use rtas_data_buf powerpc: Unconditionally enabled irq stacks powerpc/kexec: Wait for online/possible CPUs only. powerpc: Disable CONFIG_SYSFS_DEPRECATED powerpc/boot: Remove addRamdisk.c since it is now unused powerpc: Move kdump default base address to 64MB on 64bit powerpc: Remove dead CONFIG_HIGHPTE powerpc/fsl-booke: Move loadcam_entry back to asm code to fix SMP ftrace powerpc/fsl-booke: Fix InstructionTLBError execute permission check
Diffstat (limited to 'arch/alpha/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions