summaryrefslogtreecommitdiffstats
path: root/arch (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into cpus4096Ingo Molnar2008-12-1715-26/+53
|\
| * Merge branch 'sh/for-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2008-12-161-0/+2
| |\
| | * sh: Disable GENERIC_HARDIRQS_NO__DO_IRQ for unconverted platforms.Paul Mundt2008-12-161-0/+2
| * | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/...Linus Torvalds2008-12-163-5/+17
| |\ \
| | * | powerpc/cell/axon-msi: Fix MSI after kexecArnd Bergmann2008-12-161-0/+3
| | * | powerpc: Fix bootmem reservation on uninitialized nodeDave Hansen2008-12-161-5/+11
| | * | powerpc: Check for valid hugepage size in hugetlb_get_unmapped_areaBrian King2008-12-161-0/+3
| | |/
| * | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-12-165-6/+7
| |\ \
| | * | [ARM] Ensure linux/hardirqs.h is included where requiredRussell King2008-12-152-0/+2
| | * | [ARM] fix kernel-doc syntaxRandy Dunlap2008-12-141-3/+2
| | * | [ARM] arch/arm/common/sa1111.c: Correct error handling codeJulia Lawall2008-12-141-1/+1
| | * | [ARM] 5341/2: there is no copy_page on nommu ARMNicolas Pitre2008-12-111-2/+2
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-12-161-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | IA64: HP_SIMETH needs to depend upon NETAlexander Beregalov2008-12-111-0/+1
| * | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/p...Linus Torvalds2008-12-151-0/+3
| |\ \ \
| | * | | powerpc/fsl-booke: Fix problem with _tlbil_va being interruptedKumar Gala2008-12-141-0/+3
| * | | | x86 Fix VMI crash on boot in 2.6.28-rc8Zachary Amsden2008-12-154-15/+23
* | | | | x86: fix build error with post-merge of tip/cpus4096 and rr-for-ingo/master.Mike Travis2008-12-161-2/+2
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Ingo Molnar2008-12-16110-308/+213
|\ \ \ \ \
| * \ \ \ \ Merge ../linux-2.6-x86Rusty Russell2008-12-1391-1645/+2749
| |\ \ \ \ \
| * | | | | | cpumask: convert struct clock_event_device to cpumask pointers.Rusty Russell2008-12-1347-53/+53
| * | | | | | cpumask: make irq_set_affinity() take a const struct cpumaskRusty Russell2008-12-1333-119/+120
| * | | | | | cpumask: change cpumask_scnprintf, cpumask_parse_user, cpulist_parse, and cpu...Rusty Russell2008-12-135-7/+7
| * | | | | | cpumask: centralize cpu_online_map and cpu_possible_mapRusty Russell2008-12-1332-125/+27
* | | | | | | Merge branch 'linus' into cpus4096Ingo Molnar2008-12-165-437/+639
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer...Linus Torvalds2008-12-131-0/+1
| |\ \ \ \ \
| | * | | | | powerpc/40x: Add proper BOOTCFLAGS for cuboot-acadiaJosh Boyer2008-12-111-0/+1
| | | |/ / / | | |/| | |
| * | | | | MIPS: IP32: Update defconfigDavid Daney2008-12-121-436/+624
| * | | | | MIPS: Add missing calls to plat_unmap_dma_mem.David Daney2008-12-121-0/+3
| * | | | | MIPS: Kconfig: Fix the arch-specific header pathDmitri Vorobiev2008-12-121-1/+1
| * | | | | MIPS: Use EI/DI for MIPS R2.David Daney2008-12-121-0/+10
| | |/ / / | |/| | |
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge branches 'irq/sparseirq', 'x86/quirks' and 'x86/reboot' into cpus4096Ingo Molnar2008-12-1242-427/+724
|\ \ \ \ \ \ \
| | | * | | | | x86, apm: remove CONFIG_APM_REAL_MODE_POWER_OFF in favor of a kernel parameterNiels de Vos2008-12-022-11/+0
| | | * | | | | x86: drop REBOOT_CF9_COND from reboot fallback chainH. Peter Anvin2008-11-241-4/+4
| | | * | | | | x86: revert default reboot method to REBOOT_KBDH. Peter Anvin2008-11-231-1/+1
| | | * | | | | x86: attempt reboot via port CF9 if we have standard PCI portsH. Peter Anvin2008-11-124-9/+34
| | | * | | | | x86: call machine_shutdown and stop all CPUs in native_machine_haltIvan Vecera2008-11-115-13/+24
| | * | | | | | x86: clean up get_smp_config()Yinghai Lu2008-12-082-14/+22
| | * | | | | | Merge branch 'linus' into x86/quirksIngo Molnar2008-12-08195-2674/+5877
| | |\ \ \ \ \ \
| | * | | | | | | x86: fix wakeup_cpu with numaq/es7000 v2 - call ->update_genapic()Yinghai Lu2008-11-201-1/+11
| | * | | | | | | x86: use update_genapic to get rid of ES7000_CLUSTERED_APIC v2Yinghai Lu2008-11-185-32/+80
| | * | | | | | | x86: fix wakeup_cpu with numaq/es7000, v2, fix #2Ingo Molnar2008-11-181-2/+4
| | * | | | | | | x86: fix wakeup_cpu with numaq/es7000, v2, fixYinghai Lu2008-11-1811-15/+48
| | * | | | | | | x86: fix wakeup_cpu with numaq/es7000, v2Yinghai Lu2008-11-1715-95/+110
| * | | | | | | | sparseirq: fix !SMP && !PCI_MSI && !HT_IRQ buildYinghai Lu2008-12-091-1/+1
| * | | | | | | | sparseirq: fix typo in !CONFIG_IO_APIC caseIngo Molnar2008-12-081-5/+2
| * | | | | | | | x86, MSI: pass irq_cfg and irq_descYinghai Lu2008-12-081-137/+181
| * | | | | | | | x86: MSI start irq numbering from nr_irqs_gsiYinghai Lu2008-12-083-9/+19
| * | | | | | | | x86: use NR_IRQS_LEGACYYinghai Lu2008-12-084-7/+9
| * | | | | | | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-088-113/+216
| | |/ / / / / / | |/| | | | | |