summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...Linus Torvalds2011-01-101-1/+1
|\
| * kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIGBen Gardiner2010-12-141-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2011-01-105-11/+20
|\ \
| * | PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending()Rafael J. Wysocki2010-12-243-4/+4
| * | PM / Hibernate: When failed, in_suspend should be resetMyungJoo Ham2010-12-241-0/+1
| * | PM / Hibernate: hibernation_ops->leave should be checked tooMyungJoo Ham2010-12-241-1/+1
| * | Freezer: Fix a race during freezing of TASK_STOPPED tasksTejun Heo2010-12-242-2/+13
| * | PM: Use proper ccflag flag in kernel/power/MakefileTracey Dent2010-12-241-4/+1
* | | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...Linus Torvalds2011-01-0711-63/+62
|\ \ \
| * | | irq_work: Use per cpu atomics instead of regular atomicsChristoph Lameter2010-12-181-9/+9
| * | | taskstats: Use this_cpu_opsChristoph Lameter2010-12-171-3/+2
| * | | Merge branch 'this_cpu_ops' into for-2.6.38Tejun Heo2010-12-173-5/+8
| |\ \ \
| * | | | core: Replace __get_cpu_var with __this_cpu_read if not used for an address.Christoph Lameter2010-12-179-49/+49
| * | | | kprobes: Use this_cpu_opsChristoph Lameter2010-12-171-4/+4
* | | | | Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2011-01-071-1/+59
|\ \ \ \ \
| * | | | | workqueue: allow chained queueing during destructionTejun Heo2010-12-201-1/+59
* | | | | | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2011-01-077-35/+33
|\ \ \ \ \ \
| * | | | | | sched: Constify function scope static struct sched_param usagePeter Zijlstra2011-01-074-4/+4
| * | | | | | sched: Fix strncmp operationHillf Danton2011-01-071-1/+1
| * | | | | | sched: Move sched_autogroup_exit() to free_signal_struct()Mike Galbraith2011-01-071-4/+3
| * | | | | | sched: Fix struct autogroup memory leakMike Galbraith2011-01-071-0/+1
| * | | | | | sched: Mark autogroup_init() __initYong Zhang2011-01-071-1/+1
| * | | | | | sched: Consolidate the name of root_task_group and init_task_groupYong Zhang2011-01-072-25/+23
* | | | | | | Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2011-01-071-6/+2
|\ \ \ \ \ \ \
| * | | | | | | tty: add 'active' sysfs attribute to tty0 and console deviceKay Sievers2010-12-161-0/+2
| * | | | | | | console: move for_each_console to linux/console.hJiri Slaby2010-11-161-6/+0
* | | | | | | | Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-01-071-15/+39
|\ \ \ \ \ \ \ \
| * | | | | | | | fs: dcache reduce branches in lookup pathNick Piggin2011-01-071-1/+1
| * | | | | | | | fs: dcache rationalise dget variantsNick Piggin2011-01-071-1/+1
| * | | | | | | | fs: dcache remove dcache_lockNick Piggin2011-01-071-6/+0
| * | | | | | | | fs: dcache scale subdirsNick Piggin2011-01-071-2/+17
| * | | | | | | | fs: dcache scale dentry refcountNick Piggin2011-01-071-2/+0
| * | | | | | | | fs: change d_delete semanticsNick Piggin2011-01-071-1/+1
| * | | | | | | | cgroup fs: avoid switching ->d_op on live dentryNick Piggin2011-01-071-5/+22
* | | | | | | | | 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