summaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Rusty Russell2008-12-3127-347/+682
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linusLinus Torvalds2008-12-301-15/+0
| |\
| | * lguest: move the initial guest page table creation code to the hostMatias Zabaljauregui2008-12-301-15/+0
| * | Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-301-43/+46
| |\ \
| | * | x86/oprofile: cleanup IBS init/exit functions in op_model_amd.cRobert Richter2008-12-101-15/+17
| | * | x86/oprofile: reordering IBS code in op_model_amd.cRobert Richter2008-12-101-13/+13
| | * | oprofile: whitspace changes onlyRobert Richter2008-12-101-2/+2
| | * | oprofile: comment cleanupRobert Richter2008-12-101-15/+16
| * | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2008-12-3010-255/+563
| |\ \ \
| | | \ \
| | | \ \
| | | \ \
| | | \ \
| | *---. \ \ Merge branches 'irq/sparseirq', 'irq/genirq' and 'irq/urgent'; commit 'v2.6.2...Ingo Molnar2008-12-2547-439/+806
| | |\ \ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | x86, sparseirq: clean up Kconfig entryIngo Molnar2008-12-251-3/+7
| | | * | | | x86: turn CONFIG_SPARSE_IRQ off by defaultIngo Molnar2008-12-251-1/+0
| | | * | | | sparseirq: fix numa_migrate_irq_desc dependency and commentsYinghai Lu2008-12-192-2/+2
| | | * | | | sparseirq: fix !SMP building, #2Yinghai Lu2008-12-171-1/+1
| | | * | | | x86, sparseirq: move irq_desc according to smp_affinity, v7Yinghai Lu2008-12-172-1/+150
| | | * | | | 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
| * | | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2008-12-303-4/+7
| |\ \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | | \ \ \ \ \
| | *-----. \ \ \ \ \ Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timer...Ingo Molnar2008-12-253-4/+7
| | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | / / | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | | * | | | | | x86: make sure we really have an hpet mapping before using itJeremy Fitzhardinge2008-12-161-2/+3
| | | | * | | | | | x86: enable HPET on Fujitsu u9200Janne Kulmala2008-12-162-1/+3
| | | | * | | | | | x86: correct link to HPET timer specificationDenis V. Lunev2008-11-241-1/+1
| | | | |/ / / / /
| * | | | | | | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2008-12-3013-24/+59
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | | | | | | |
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | | \ \ \ \ \ \
| | *-------. \ \ \ \ \ \ Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/print...Ingo Molnar2008-12-258-14/+41
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | / / / / | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | | * | | | | | | Merge commit 'v2.6.28-rc7' into core/lockingIngo Molnar2008-12-0442-147/+286
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|_|/ | | | | | | |/| | | | |
| | | | * | | | | | | | x86/swiotlb: add default swiotlb_arch_range_needs_mappingIan Campbell2008-12-171-0/+5
| | | | * | | | | | | | x86/swiotlb: add default phys<->bus conversionIan Campbell2008-12-171-0/+10
| | | | * | | | | | | | x86: unify pci iommu setup and allow swiotlb to compile for 32 bitJeremy Fitzhardinge2008-12-177-5/+14
| | | | * | | | | | | | x86: add swiotlb allocation functionsJeremy Fitzhardinge2008-12-171-0/+12
| | | | * | | | | | | | x86: remove unused iommu_nr_pagesJeremy Fitzhardinge2008-12-162-9/+0
| | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | * | | | | | | | | Merge commit 'v2.6.28' into core/coreIngo Molnar2008-12-2539-194/+253
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | | | | | | | | |
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | *---------. \ \ \ \ \ \ \ \ Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor...Ingo Molnar2008-11-245-10/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | / / / / / | | | | | | |_|_|_|_|/ / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Merge branch 'linus' into core/lockingIngo Molnar2008-11-1266-210/+398
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.28-rc2' into core/lockingIngo Molnar2008-10-28586-14873/+58376
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'v2.6.27-rc7' into core/lockingIngo Molnar2008-09-239-30/+27
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v3Ingo Molnar2008-09-111-0/+1
| | | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v2Nick Piggin2008-09-112-15/+5
| | | | | * | | | | | | | | | | | | x86: some lock annotations for user copy pathsNick Piggin2008-09-102-1/+10
| | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Rusty Russell2008-12-30184-5166/+6194
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-nextLinus Torvalds2008-12-281-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | allow stripping of generated symbols under CONFIG_KALLSYMS_ALLJan Beulich2008-12-191-0/+1
| * | | | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6Linus Torvalds2008-12-283-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | [S390] arch_setup_additional_pages argumentsMartin Schwidefsky2008-12-253-3/+3
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2008-12-281-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/coreIngo Molnar2008-12-2511-29/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge commit 'v2.6.28-rc8' into sched/coreIngo Molnar2008-12-1211-48/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | |
OpenPOWER on IntegriCloud