summaryrefslogtreecommitdiffstats
path: root/arch/x86
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/...Mike Travis2009-01-03148-4041/+4560
|\
| * 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
| | * | | | | | 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 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 branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2008-12-2835-1113/+1731
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \ \
| | | *-----. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin...Ingo Molnar2008-12-2515-58/+156
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|/ / / / / / / / / | | | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | | | Revert "x86: disable X86_PTRACE_BTS"Ingo Molnar2008-12-241-1/+0
| | | | | * | | | | | | | | | | | | Merge branch 'linus' into tracing/hw-branch-tracingIngo Molnar2008-12-247-14/+31
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / | | | | | | |/| | | | | | | | | | |
| | | | | * | | | | | | | | | | | | x86, bts: memory accountingMarkus Metzger2008-12-201-11/+34
| | | | | * | | | | | | | | | | | | x86, bts: add fork and exit handlingMarkus Metzger2008-12-206-32/+85
| | | | | | |/ / / / / / / / / / / | | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | | tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3Frederic Weisbecker2008-12-253-2/+8
| | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge branch 'x86/tsc' into tracing/coreIngo Molnar2008-12-255-5/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i...Ingo Molnar2008-12-1913-62/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/...Ingo Molnar2008-12-181-33/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | x86, bts: correctly report invalid bts recordsMarkus Metzger2008-12-161-0/+3
| | | | * | | | | | | | | | | | | x86, bts: remove recursion from get_contextMarkus Metzger2008-12-161-33/+25
| | | * | | | | | | | | | | | | | x86: entry_64 - introduce FTRACE_ frame macro v2Cyrill Gorcunov2008-12-172-51/+35
| | | |/ / / / / / / / / / / / /
| | | | | | | | | | | | | | | |
| | | | \ \ \ \ \ \ \ \ \ \ \ \
| | | *-. \ \ \ \ \ \ \ \ \ \ \ \ Merge branches 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-graph-...Ingo Molnar2008-12-1613-873/+817
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | x86, bts: fix build errorIngo Molnar2008-12-121-1/+1
OpenPOWER on IntegriCloud