| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke... | Linus Torvalds | 2008-12-30 | 3 | -4/+7 |
|\ |
|
| *-----. | Merge branches 'timers/clocksource', 'timers/hpet', 'timers/hrtimers', 'timer... | Ingo Molnar | 2008-12-25 | 3 | -4/+7 |
| |\ \ \ \ |
|
| | | * | | | x86: make sure we really have an hpet mapping before using it | Jeremy Fitzhardinge | 2008-12-16 | 1 | -2/+3 |
| | | * | | | x86: enable HPET on Fujitsu u9200 | Janne Kulmala | 2008-12-16 | 2 | -1/+3 |
| | | * | | | x86: correct link to HPET timer specification | Denis V. Lunev | 2008-11-24 | 1 | -1/+1 |
| | | |/ / |
|
* | | | | | Merge branch 'core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... | Linus Torvalds | 2008-12-30 | 13 | -24/+59 |
|\ \ \ \ \ |
|
| | \ \ \ \ | |
| | \ \ \ \ | |
| | \ \ \ \ | |
| | \ \ \ \ | |
| | \ \ \ \ | |
| | \ \ \ \ | |
| | \ \ \ \ | |
| | \ \ \ \ | |
| *-------. \ \ \ \ | Merge branches 'core/debugobjects', 'core/iommu', 'core/locking', 'core/print... | Ingo Molnar | 2008-12-25 | 8 | -14/+41 |
| |\ \ \ \ \ \ \ \ \
| | | | | | |/ / / /
| | | | | | | | / /
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | | | * | | | | | Merge commit 'v2.6.28-rc7' into core/locking | Ingo Molnar | 2008-12-04 | 42 | -147/+286 |
| | | | |\ \ \ \ \ |
|
| | | * | | | | | | | x86/swiotlb: add default swiotlb_arch_range_needs_mapping | Ian Campbell | 2008-12-17 | 1 | -0/+5 |
| | | * | | | | | | | x86/swiotlb: add default phys<->bus conversion | Ian Campbell | 2008-12-17 | 1 | -0/+10 |
| | | * | | | | | | | x86: unify pci iommu setup and allow swiotlb to compile for 32 bit | Jeremy Fitzhardinge | 2008-12-17 | 7 | -5/+14 |
| | | * | | | | | | | x86: add swiotlb allocation functions | Jeremy Fitzhardinge | 2008-12-17 | 1 | -0/+12 |
| | | * | | | | | | | x86: remove unused iommu_nr_pages | Jeremy Fitzhardinge | 2008-12-16 | 2 | -9/+0 |
| | | | |_|_|_|/ /
| | | |/| | | | | |
|
| * | | | | | | | | Merge commit 'v2.6.28' into core/core | Ingo Molnar | 2008-12-25 | 39 | -194/+253 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|/ /
| | |/| | | | | | |
|
| | | | | | | | | | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ | |
| *---------. \ \ \ \ \ \ \ | Merge branches 'core/debug', 'core/futexes', 'core/locking', 'core/rcu', 'cor... | Ingo Molnar | 2008-11-24 | 5 | -10/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ / / / / /
| |/| | | | | | | | / / / /
| | | | | |_|_|_|_|/ / / /
| | | | |/| | | | | | | | |
|
| | | | * | | | | | | | | | Merge branch 'linus' into core/locking | Ingo Molnar | 2008-11-12 | 66 | -210/+398 |
| | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ | Merge commit 'v2.6.28-rc2' into core/locking | Ingo Molnar | 2008-10-28 | 586 | -14873/+58376 |
| | | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ \ \ | Merge commit 'v2.6.27-rc7' into core/locking | Ingo Molnar | 2008-09-23 | 9 | -30/+27 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v3 | Ingo Molnar | 2008-09-11 | 1 | -0/+1 |
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths, v2 | Nick Piggin | 2008-09-11 | 2 | -15/+5 |
| | | | * | | | | | | | | | | | | x86: some lock annotations for user copy paths | Nick Piggin | 2008-09-10 | 2 | -1/+10 |
| | | |/ / / / / / / / / / / /
| | |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next | Linus Torvalds | 2008-12-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | allow stripping of generated symbols under CONFIG_KALLSYMS_ALL | Jan Beulich | 2008-12-19 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 | Linus Torvalds | 2008-12-28 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | [S390] arch_setup_additional_pages arguments | Martin Schwidefsky | 2008-12-25 | 3 | -3/+3 |
| | |_|_|_|_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker... | Linus Torvalds | 2008-12-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'sched/urgent'; commit 'v2.6.28' into sched/core | Ingo Molnar | 2008-12-25 | 11 | -29/+54 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / / /
| | | | | | | | | | | | | | | | / /
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge commit 'v2.6.28-rc8' into sched/core | Ingo Molnar | 2008-12-12 | 11 | -48/+55 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / /
| | |/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | Merge branch 'sched/urgent' into sched/core | Ingo Molnar | 2008-12-08 | 20 | -117/+144 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'v2.6.28-rc6' into sched/core | Ingo Molnar | 2008-11-21 | 16 | -23/+150 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge branch 'linus' into sched/core | Ingo Molnar | 2008-11-19 | 18 | -44/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | sched: rename SCHED_NO_NO_OMIT_FRAME_POINTER => SCHED_OMIT_FRAME_POINTER | Ingo Molnar | 2008-11-11 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | Merge branch 'sched/urgent' into sched/core | Ingo Molnar | 2008-11-07 | 19 | -46/+113 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | | x86, sched: enable wchan config menu item on 64-bit | Ken Chen | 2008-11-06 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | | | Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k... | Linus Torvalds | 2008-12-28 | 35 | -1113/+1731 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| *-----. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin... | Ingo Molnar | 2008-12-25 | 15 | -58/+156 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | |_|_|_|_|_|_|/ / / / / / / / / / /
| | | | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | Revert "x86: disable X86_PTRACE_BTS" | Ingo Molnar | 2008-12-24 | 1 | -1/+0 |
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch 'linus' into tracing/hw-branch-tracing | Ingo Molnar | 2008-12-24 | 7 | -14/+31 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | |/ / / / / / / / / / / / / / / / / /
| | | | |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | | x86, bts: memory accounting | Markus Metzger | 2008-12-20 | 1 | -11/+34 |
| | | * | | | | | | | | | | | | | | | | | | | | x86, bts: add fork and exit handling | Markus Metzger | 2008-12-20 | 6 | -32/+85 |
| | | | |/ / / / / / / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | | tracing/ftrace: don't trace on early stage of a secondary cpu boot, v3 | Frederic Weisbecker | 2008-12-25 | 3 | -2/+8 |
| | |/ / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'x86/tsc' into tracing/core | Ingo Molnar | 2008-12-25 | 5 | -5/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i... | Ingo Molnar | 2008-12-19 | 13 | -62/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / /
| | |/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | | Merge branches 'tracing/ftrace' and 'tracing/hw-branch-tracing' into tracing/... | Ingo Molnar | 2008-12-18 | 1 | -33/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | | | | | x86, bts: correctly report invalid bts records | Markus Metzger | 2008-12-16 | 1 | -0/+3 |
| | * | | | | | | | | | | | | | | | | | | | | x86, bts: remove recursion from get_context | Markus Metzger | 2008-12-16 | 1 | -33/+25 |
| * | | | | | | | | | | | | | | | | | | | | | x86: entry_64 - introduce FTRACE_ frame macro v2 | Cyrill Gorcunov | 2008-12-17 | 2 | -51/+35 |
| |/ / / / / / / / / / / / / / / / / / / / |
|
| | | | | | | | | | | | | | | | | | | | | | |
| | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |
| *-. \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branches 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-graph-... | Ingo Molnar | 2008-12-16 | 13 | -873/+817 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | | x86, bts: fix build error | Ingo Molnar | 2008-12-12 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | | | | | | x86, bts: provide in-kernel branch-trace interface | Markus Metzger | 2008-12-12 | 9 | -871/+810 |