summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-07-227-29/+157
|\
| * PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlockRafael J. Wysocki2012-07-191-0/+7
| * Merge branch 'fixes' into pm-sleepRafael J. Wysocki2012-07-1816-204/+478
| |\
| * | PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.Bojan Smojver2012-07-011-27/+27
| * | PM / Sleep: Separate printing suspend times from initcall_debugRafael J. Wysocki2012-07-012-34/+46
| * | PM / Sleep: add knob for printing device resume timesSameer Nanda2012-07-011-0/+33
| * | ftrace: Disable function tracing during suspend/resume and hibernation, againSrivatsa S. Bhat2012-07-012-0/+9
| * | PM / Hibernate: Enable suspend to both for in-kernel hibernation.Bojan Smojver2012-07-013-0/+67
* | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-07-224-361/+432
|\ \ \
| * \ \ Merge branch 'linus' into timers/coreIngo Molnar2012-07-181-0/+1
| |\ \ \
| * | | | time: Rework timekeeping functions to take timekeeper ptr as argumentJohn Stultz2012-07-151-105/+103Star
| * | | | time: Move xtime_nsec adjustment underflow handling timekeeping_adjustJohn Stultz2012-07-151-21/+21
| * | | | time: Move arch_gettimeoffset() usage into timekeeping_get_ns()John Stultz2012-07-151-19/+10Star
| * | | | time: Refactor accumulation of nsecs to secsJohn Stultz2012-07-151-22/+32
| * | | | time: Condense timekeeper.xtime into xtime_secJohn Stultz2012-07-151-71/+110
| * | | | time: Explicitly use u32 instead of int for shift valuesJohn Stultz2012-07-151-3/+3
| * | | | time: Whitespace cleanups per Ingo%27s requestsJohn Stultz2012-07-151-21/+18Star
| * | | | Merge branch 'timers/urgent' into timers/coreThomas Gleixner2012-07-1522-394/+1061
| |\ \ \ \
| * \ \ \ \ Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks int...Thomas Gleixner2012-06-119-167/+310
| |\ \ \ \ \
| | * | | | | nohz: Move next idle expiry time record into idle logic areaFrederic Weisbecker2012-06-111-10/+14
| | * | | | | nohz: Move ts->idle_calls incrementation into strict idle logicFrederic Weisbecker2012-06-111-39/+47
| | * | | | | nohz: Rename ts->idle_tick to ts->last_tickFrederic Weisbecker2012-06-112-4/+4
| | * | | | | nohz: Make nohz API agnostic against idle ticks cputime accountingFrederic Weisbecker2012-06-111-15/+22
| | * | | | | nohz: Separate idle sleeping time accounting from nohz logicFrederic Weisbecker2012-06-111-35/+42
| * | | | | | timers: Improve get_next_timer_interrupt()Thomas Gleixner2012-06-061-5/+8
| * | | | | | timers: Add accounting of non deferrable timersThomas Gleixner2012-06-061-8/+23
| * | | | | | timers: Consolidate base->next_timer updateThomas Gleixner2012-06-061-11/+15
| * | | | | | timers: Create detach_if_pending() and use itThomas Gleixner2012-06-061-33/+23Star
* | | | | | | Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2012-07-222-22/+0Star
|\ \ \ \ \ \ \
| * | | | | | | smpboot: Remove leftover declarationThomas Gleixner2012-06-111-2/+0Star
| * | | | | | | smp: Remove ipi_call_lock[_irq]()/ipi_call_unlock[_irq]()Yong Zhang2012-06-051-20/+0Star
* | | | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-07-228-254/+313
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2012-07-181-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | tracing: Check for allocation failure in __tracing_open()Dan Carpenter2012-07-121-0/+4
| * | | | | | | | | Merge branch 'linus' into perf/coreIngo Molnar2012-07-1814-200/+472
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2012-07-064-10/+33
| |\ \ \ \ \ \ \ \
| | * | | | | | | | ring-buffer: Fix uninitialized read_stampSteven Rostedt2012-06-281-0/+4
| | * | | | | | | | tracing: Remove NR_CPUS array from trace_iteratorSteven Rostedt2012-06-283-10/+27
| | * | | | | | | | tracing/selftest: Add a WARN_ON() if a tracer test failsSteven Rostedt2012-06-281-0/+2
| * | | | | | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-07-0512-218/+591
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | perf: Introduce perf_pmu_migrate_context()Yan, Zheng2012-06-181-0/+36
| * | | | | | | | | perf: Allow the PMU driver to choose the CPU on which to install eventsYan, Zheng2012-06-181-4/+4
| * | | | | | | | | perf: Avoid race between cpu hotplug and installing eventYan, Zheng2012-06-181-0/+5
| * | | | | | | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-06-183-5/+26
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2012-06-182-7/+3Star
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tracing: Register the ftrace internal events during early bootSteven Rostedt2012-06-141-1/+1
| | * | | | | | | | | | ftrace: Remove a superfluous checkBorislav Petkov2012-06-141-6/+2Star
| * | | | | | | | | | | uprobes: Remove the unnecessary initialization in add_utask()Oleg Nesterov2012-06-161-1/+0Star
| * | | | | | | | | | | uprobes: __copy_insn() needs "loff_t offset"Oleg Nesterov2012-06-161-6/+6
| * | | | | | | | | | | uprobes: Don't use loff_t for the valid virtual addressOleg Nesterov2012-06-161-17/+9Star