summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2015-04-142-3/+12
|\
| * Merge back earlier suspend/hibernate material for v4.1.Rafael J. Wysocki2015-04-102-3/+12
| |\
| | * PM / sleep: add pm-trace support for suspending phaseZhonghui Fu2015-03-181-1/+1
| | * PM / sleep: add configurable delay for pm_testBrian Norris2015-02-261-2/+11
* | | Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-04-143-98/+244
|\ \ \
| * | | kernel, cpuset: remove exception for __GFP_THISNODEDavid Rientjes2015-04-141-13/+5
| * | | watchdog: introduce the hardlockup_detector_disable() functionUlrich Obergfell2015-04-141-19/+2
| * | | watchdog: clean up some function names and argumentsUlrich Obergfell2015-04-141-8/+12
| * | | watchdog: enable the new user interface of the watchdog mechanismUlrich Obergfell2015-04-142-76/+40
| * | | watchdog: implement error handling for failure to set up hardware perf eventsUlrich Obergfell2015-04-141-0/+30
| * | | watchdog: introduce separate handlers for parameters in /proc/sys/kernelUlrich Obergfell2015-04-141-0/+59
| * | | watchdog: introduce proc_watchdog_common()Ulrich Obergfell2015-04-141-0/+65
| * | | watchdog: move definition of 'watchdog_proc_mutex' outside of proc_dowatchdog()Ulrich Obergfell2015-04-141-1/+2
| * | | watchdog: introduce the proc_watchdog_update() functionUlrich Obergfell2015-04-141-0/+23
| * | | watchdog: new definitions and variables, initializationUlrich Obergfell2015-04-141-1/+26
* | | | Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-04-142-2/+3
|\ \ \ \
| * \ \ \ Merge branch 'iocb' into for-nextAl Viro2015-04-112-2/+3
| |\ \ \ \
| | * | | | fs: move struct kiocb to fs.hChristoph Hellwig2015-03-252-1/+2
| | * | | | fs: remove ki_nbytesChristoph Hellwig2015-03-121-1/+1
* | | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2015-04-1411-180/+1226
|\ \ \ \ \ \
| * | | | | | watchdog: Add watchdog enable/disable all functionsStephane Eranian2015-04-021-0/+28
| * | | | | | Merge branch 'perf/urgent' into perf/core, before applying dependent patchesIngo Molnar2015-04-024-32/+70
| |\ \ \ \ \ \
| * | | | | | | perf: Add ITRACE_START record to indicate that tracing has startedAlexander Shishkin2015-04-021-0/+41
| * | | | | | | perf: Add wakeup watermark control to the AUX areaAlexander Shishkin2015-04-023-5/+24
| * | | | | | | perf: Support overwrite mode for the AUX areaAlexander Shishkin2015-04-022-15/+34
| * | | | | | | perf: Add API for PMUs to write to the AUX areaAlexander Shishkin2015-04-023-3/+145
| * | | | | | | perf: Add AUX recordAlexander Shishkin2015-04-022-0/+37
| * | | | | | | perf: Add a pmu capability for "exclusive" eventsAlexander Shishkin2015-04-021-2/+117
| * | | | | | | perf: Add a capability for AUX_NO_SG pmus to do software double bufferingAlexander Shishkin2015-04-021-1/+14
| * | | | | | | perf: Support high-order allocations for AUX spaceAlexander Shishkin2015-04-021-6/+50
| * | | | | | | perf: Add AUX area to ring buffer for raw data streamsPeter Zijlstra2015-04-023-29/+232
| * | | | | | | perf: Add data_{offset,size} to user_pageAlexander Shishkin2015-04-021-0/+2
| * | | | | | | bpf: Fix the build on BPF_SYSCALL=y && !CONFIG_TRACING kernels, make it more ...Ingo Molnar2015-04-022-1/+9
| * | | | | | | tracing: Allow BPF programs to call bpf_trace_printk()Alexei Starovoitov2015-04-021-0/+78
| * | | | | | | tracing: Allow BPF programs to call bpf_ktime_get_ns()Alexei Starovoitov2015-04-021-0/+14
| * | | | | | | tracing, perf: Implement BPF programs attached to kprobesAlexei Starovoitov2015-04-025-1/+204
| * | | | | | | tracing: Add kprobe flagAlexei Starovoitov2015-04-021-1/+1
| * | | | | | | perf: Add per event clockid supportPeter Zijlstra2015-03-271-3/+74
| * | | | | | | Merge branch 'perf/core' into perf/timer, before applying new changesIngo Molnar2015-03-273-141/+160
| |\ \ \ \ \ \ \
| | * | | | | | | perf: Fix racy group accessPeter Zijlstra2015-03-271-0/+11
| | * | | | | | | Merge branch 'perf/x86' into perf/core, because it's readyIngo Molnar2015-03-273-57/+34
| | |\ \ \ \ \ \ \
| | | * | | | | | | perf: Remove type specific target pointersPeter Zijlstra2015-03-233-19/+13
| | | * | | | | | | perf/x86/intel: Support task events with Intel CQMMatt Fleming2015-02-251-0/+2
| | | * | | | | | | perf: Move cgroup init before PMU ->event_init()Matt Fleming2015-02-251-12/+16
| | | * | | | | | | perf: Add ->count() function to read per-package countersMatt Fleming2015-02-251-1/+4
| | | * | | | | | | perf: Make perf_cgroup_from_task() globalMatt Fleming2015-02-251-27/+1
| | * | | | | | | | Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh th...Ingo Molnar2015-03-2713-57/+182
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Revert "perf: Remove the extra validity check on nr_pages"Kan Liang2015-03-021-1/+1
| | * | | | | | | | | Merge tag 'v4.0-rc1' into perf/core, to refresh the treeIngo Molnar2015-02-26114-1577/+2832
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/...Ingo Molnar2015-02-181-1/+1
| | |\ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud