aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAge
* Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-30
|\
| *---. Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.2...Ingo Molnar2008-12-25
| |\ \ \
| | * | | x86, sparseirq: clean up Kconfig entryIngo Molnar2008-12-25
| | * | | x86: turn CONFIG_SPARSE_IRQ off by defaultIngo Molnar2008-12-25
| | * | | sparseirq: fix numa_migrate_irq_desc dependency and commentsYinghai Lu2008-12-19
| | * | | sparseirq: fix !SMP building, #2Yinghai Lu2008-12-16
| | * | | x86, sparseirq: move irq_desc according to smp_affinity, v7Yinghai Lu2008-12-16
| | * | | sparseirq: fix !SMP && !PCI_MSI && !HT_IRQ buildYinghai Lu2008-12-09
| | * | | sparseirq: fix typo in !CONFIG_IO_APIC caseIngo Molnar2008-12-08
| | * | | x86, MSI: pass irq_cfg and irq_descYinghai Lu2008-12-08
| | * | | x86: MSI start irq numbering from nr_irqs_gsiYinghai Lu2008-12-08
| | * | | x86: use NR_IRQS_LEGACYYinghai Lu2008-12-08
| | * | | sparse irq_desc[] array: core kernel and x86 changesYinghai Lu2008-12-08
* | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-12-30
|\ \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-----. \ \ \ \ Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timer...Ingo Molnar2008-12-25
| |\ \ \ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | | * | | | | x86: make sure we really have an hpet mapping before using itJeremy Fitzhardinge2008-12-16
| | | * | | | | x86: enable HPET on Fujitsu u9200Janne Kulmala2008-12-16
| | | * | | | | x86: correct link to HPET timer specificationDenis V. Lunev2008-11-24
| | | |/ / / /
* | | | | | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-30
|\ \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| | \ \ \ \ \ \
| *-------. | | | | | | Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/print...Ingo Molnar2008-12-25
| |\ \ \ \ \| | | | | | | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | | * | | | | | | Merge commit 'v2.6.28-rc7' into core/lockingIngo Molnar2008-12-04
| | | | |\ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ | | | | | |/| | | | |
| | | * | | | | | | | x86/swiotlb: add default swiotlb_arch_range_needs_mappingIan Campbell2008-12-17
| | | * | | | | | | | x86/swiotlb: add default phys<->bus conversionIan Campbell2008-12-17
| | | * | | | | | | | x86: unify pci iommu setup and allow swiotlb to compile for 32 bitJeremy Fitzhardinge2008-12-17
| | | * | | | | | | | x86: add swiotlb allocation functionsJeremy Fitzhardinge2008-12-17
| | | * | | | | | | | x86: remove unused iommu_nr_pagesJeremy Fitzhardinge2008-12-16
| | | | |_|_|_|/ / / | | | |/| | | | | |
| * | | | | | | | | Merge commit 'v2.6.28' into core/coreIngo Molnar2008-12-25
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | | | | | | | |
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \
| *---------. \ \ \ \ \ \ \ \ Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor...Ingo Molnar2008-11-24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | / / / / / | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge branch 'linus' into core/lockingIngo Molnar2008-11-12
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc2' into core/lockingIngo Molnar2008-10-28
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.27-rc7' into core/lockingIngo Molnar2008-09-23
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v3Ingo Molnar2008-09-11
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v2Nick Piggin2008-09-11
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy pathsNick Piggin2008-09-10
| | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-nextLinus Torvalds2008-12-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | allow stripping of generated symbols under CONFIG_KALLSYMS_ALLJan Beulich2008-12-19
* | | | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2008-12-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | [S390] arch_setup_additional_pages argumentsMartin Schwidefsky2008-12-25
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-12-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-. | | | | | | | | | | | | | | | | Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/coreIngo Molnar2008-12-25
| |\ \| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge commit 'v2.6.28-rc8' into sched/coreIngo Molnar2008-12-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-12-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc6' into sched/coreIngo Molnar2008-11-21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'linus' into sched/coreIngo Molnar2008-11-19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTERIngo Molnar2008-11-11
| * | | | | | | | | | | | | | | | | | | Merge branch 'sched/urgent' into sched/coreIngo Molnar2008-11-07
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | x86, sched: enable wchan config menu item on 64-bitKen Chen2008-11-06
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| *-----. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Revert "x86: disable X86_PTRACE_BTS"Ingo Molnar2008-12-24