summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2011-01-061-0/+1
|\
| * Merge branch 'clksrc' into develRussell King2011-01-051-0/+1
| |\
| | * Fix rounding in clocks_calc_mult_shift()john stultz2010-12-221-0/+1
| | |
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
| \ \
*---------. \ \ Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-...Linus Torvalds2011-01-062-10/+17
|\ \ \ \ \ \ \ \
| | | | | * | | | locking, lockdep: Convert sprintf_symbol to %pSJoe Perches2010-11-101-10/+6
| | | | | |/ / /
| * | | | | | | x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resumeSuresh Siddha2010-12-131-0/+11
* | | | | | | | Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-01-061-2/+169
|\ \ \ \ \ \ \ \
| * | | | | | | | module: Move RO/NX module protection to after ftrace module updateSteven Rostedt2010-12-231-12/+12
| * | | | | | | | Merge commit 'v2.6.37-rc7' into x86/securityIngo Molnar2010-12-2327-257/+570
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | x86: Add RO/NX protection for loadable kernel modulesmatthieu castet2010-11-181-2/+169
* | | | | | | | | Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2011-01-066-102/+63
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | timers: Use this_cpu_readChristoph Lameter2010-12-121-2/+2
| * | | | | | | | | hrtimer: fix timerqueue conversion flubJohn Stultz2010-12-101-5/+2
| * | | | | | | | | hrtimers: Convert hrtimers to use timerlist infrastructureJohn Stultz2010-12-102-60/+34
| * | | | | | | | | timer: Warn when del_timer_sync() is called in hardirq contextYong Zhang2010-10-221-1/+5
| * | | | | | | | | timer: Del_timer_sync() can be used in softirq contextYong Zhang2010-10-221-5/+3
| * | | | | | | | | timer: Make try_to_del_timer_sync() the same on SMP and UPYong Zhang2010-10-221-14/+3
| * | | | | | | | | posix-timers: Annotate lock_timer()Namhyung Kim2010-10-211-2/+8
| * | | | | | | | | timer: Permit statically-declared work with deferrable timersPhil Carmody2010-10-211-14/+1
| * | | | | | | | | time: Use ARRAY_SIZE macro in timecompare.cNikitas Angelinas2010-10-211-2/+3
| * | | | | | | | | time: Compensate for rounding on odd-frequency clocksourcesKasper Pedersen2010-10-211-2/+7
* | | | | | | | | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-01-0619-585/+785
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sched: Change wait_for_completion_*_timeout() to return a signed longNeilBrown2011-01-051-2/+2
| * | | | | | | | | | Merge commit 'v2.6.37' into sched/coreIngo Molnar2011-01-0513-171/+361
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | sched, autogroup: Fix reference leakMike Galbraith2011-01-041-1/+1
| * | | | | | | | | | sched, autogroup: Fix potential access to freed memoryMike Galbraith2011-01-041-8/+17
| * | | | | | | | | | sched: Remove redundant CONFIG_CGROUP_SCHED ifdefYong Zhang2011-01-041-4/+0
| * | | | | | | | | | sched: Fix interactivity bug by charging unaccounted run-time on entity re-we...Paul Turner2010-12-191-1/+5
| * | | | | | | | | | sched: Move periodic share updates to entity_tick()Paul Turner2010-12-191-4/+17
| * | | | | | | | | | Merge commit 'v2.6.37-rc6' into sched/coreIngo Molnar2010-12-191-3/+4
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | printk: Use this_cpu_{read|write} api on printk_pendingEric Dumazet2010-12-081-4/+4
| * | | | | | | | | | | sched: Make pushable_tasks CONFIG_SMP dependantDario Faggioli2010-12-081-0/+2
| * | | | | | | | | | | Merge branch 'linus' into sched/coreIngo Molnar2010-12-0814-60/+188
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | sched: Add 'autogroup' scheduling feature: automated per session task groupsMike Galbraith2010-11-307-49/+292
| * | | | | | | | | | | | sched: Fix unregister_fair_sched_group()Paul Turner2010-11-301-2/+1
| * | | | | | | | | | | | sched: Remove unused argument dest_cpu to migrate_task()Nikanth Karthikesan2010-11-261-5/+3
| * | | | | | | | | | | | mutexes, sched: Introduce arch_mutex_cpu_relax()Gerald Schaefer2010-11-262-2/+3
| * | | | | | | | | | | | Merge commit 'v2.6.37-rc3' into sched/coreIngo Molnar2010-11-2611-39/+84
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | sched: Add some clock info to sched_debugPeter Zijlstra2010-11-232-5/+28
| * | | | | | | | | | | | cpu: Remove incorrect BUG_ONPeter Zijlstra2010-11-231-1/+4
| * | | | | | | | | | | | cpu: Remove unused variableDhaval Giani2010-11-231-1/+0
| * | | | | | | | | | | | sched: Fix UP build breakagePeter Zijlstra2010-11-231-1/+1
| * | | | | | | | | | | | sched: Make task dump print all 15 chars of proc commErik Gilling2010-11-231-1/+1
| * | | | | | | | | | | | sched: Update tg->shares after cpu.shares writePaul Turner2010-11-181-31/+11
| * | | | | | | | | | | | sched: Allow update_cfs_load() to update global loadPaul Turner2010-11-181-15/+29
| * | | | | | | | | | | | sched: Implement demand based update_cfs_load()Paul Turner2010-11-182-1/+20
| * | | | | | | | | | | | sched: Update shares on idle_balancePaul Turner2010-11-181-0/+1
| * | | | | | | | | | | | sched: Add sysctl_sched_shares_windowPaul Turner2010-11-182-1/+15
| * | | | | | | | | | | | sched: Introduce hierarchal order on shares update listPaul Turner2010-11-181-10/+16
| * | | | | | | | | | | | sched: Fix update_cfs_load() synchronizationPaul Turner2010-11-182-13/+22