aboutsummaryrefslogtreecommitdiff
path: root/include/asm-um/system-x86_64.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-07 10:52:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-07 10:52:00 -0700
commitba00003aa83a61b615542dd66f5af8fb4a7cee1d (patch)
tree013dde7e89730e54433aa40b5e9d67997931aed6 /include/asm-um/system-x86_64.h
parent9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 (diff)
parent40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] PReP fixup after irq changes [POWERPC] SPU fixup after irq changes [POWERPC] Fix up after irq changes [POWERPC] Fix iseries/smp.c for irq breakage [POWERPC] Fix viocons for irq breakage [POWERPC] Update iseries_defconfig [POWERPC] Fix fsl_soc build breaks [POWERPC] Minor fix for bootargs property [POWERPC] Update MTFSF_L() comment [POWERPC] Update pSeries defconfig for SATA [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ [POWERPC] Fix zImage decompress location [POWERPC] linux,tce-size property is 32 bits [POWERPC] Add DTS for MPC8349E-mITX board [POWERPC] Fix harmless typo [PPC] Fix some irq breakage with ARCH=ppc
Diffstat (limited to 'include/asm-um/system-x86_64.h')
0 files changed, 0 insertions, 0 deletions