summaryrefslogtreecommitdiffstats
path: root/include/linux
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-05-198-171/+157
|\
| * Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-05-192-7/+27
| |\
| | * ftrace: Modify ftrace_set_filter/notrace to take opsSteven Rostedt2011-05-181-1/+6
| | * ftrace: Allow dynamically allocated function tracersSteven Rostedt2011-05-182-0/+2
| | * ftrace: Implement separate user function filteringSteven Rostedt2011-05-181-1/+6
| | * ftrace: Use counters to enable functions to traceSteven Rostedt2011-05-181-2/+6
| | * ftrace: Create a global_ops to hold the filter and notrace hashesSteven Rostedt2011-05-181-2/+8
| | * ftrace: Use hash instead for FTRACE_FL_FILTERSteven Rostedt2011-05-181-2/+1
| | * ftrace: Replace FTRACE_FL_NOTRACE flag with a hash of ignored functionsSteven Rostedt2011-05-181-1/+0
| * | ftrace: Avoid recording mcount on .init sections directlySteven Rostedt2011-05-161-7/+7
| |/
| * Merge commit 'v2.6.39-rc7' into perf/coreIngo Molnar2011-05-1016-14/+60
| |\
| * \ Merge branch 'perf/stat' into perf/coreIngo Molnar2011-05-061-0/+2
| |\ \
| | * | perf events: Add generic front-end and back-end stalled cycle event definitionsIngo Molnar2011-04-291-1/+2
| | * | perf events: Add stalled cycles generic event - PERF_COUNT_HW_STALLED_CYCLESIngo Molnar2011-04-261-0/+1
| * | | perf events: Clean up definitions and initializers, update copyrightsIngo Molnar2011-05-041-52/+44
| * | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-05-011-5/+3
| |\ \ \
| | * | | ftrace: Remove FTRACE_FL_CONVERTED flagSteven Rostedt2011-04-291-1/+0
| | * | | ftrace: Remove FTRACE_FL_FAILED flagSteven Rostedt2011-04-291-5/+4
| * | | | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g...Ingo Molnar2011-05-015-9/+19
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2011-04-275-103/+77
| |\ \ \
| | * | | jump label: Introduce static_branch() interfaceJason Baron2011-04-045-104/+79
* | | | | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...Linus Torvalds2011-05-192-25/+165
|\ \ \ \ \
| * | | | | genirq: Uninline and sanity check generic_handle_irq()Thomas Gleixner2011-05-181-4/+1
| * | | | | genirq: Add chip suspend and resume callbacksThomas Gleixner2011-04-231-0/+11
| * | | | | genirq: Implement a generic interrupt chipThomas Gleixner2011-04-231-0/+135
| * | | | | genirq: Support per-IRQ thread disabling.Paul Mundt2011-04-231-1/+13
| * | | | | genirq: irq_desc: Document preflow_handler and affinity_hintGeert Uytterhoeven2011-04-231-1/+3
| * | | | | genirq: Forgotten updates/deletions after removal of compat codeGeert Uytterhoeven2011-04-232-19/+2
* | | | | | Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2011-05-191-2/+2
|\ \ \ \ \ \
| * | | | | | seqlock: Don't smp_rmb in seqlock reader spin loopMilton Miller2011-05-121-2/+2
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2011-05-191-0/+52
|\ \ \ \ \ \
| | \ \ \ \ \
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats...Joerg Roedel2011-05-101-0/+52
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | | * | | | | PCI: Move ATS declarations in seperate header fileJoerg Roedel2011-04-111-0/+52
| | |/ / / / /
* | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds2011-05-196-36/+127
|\ \ \ \ \ \ \
| * | | | | | | PM: Introduce generic prepare and complete callbacks for subsystemsRafael J. Wysocki2011-05-171-7/+19
| * | | | | | | PM: Allow drivers to allocate memory from .prepare() callbacks safelyRafael J. Wysocki2011-05-171-0/+4
| * | | | | | | Merge branch 'power-domains' into for-linusRafael J. Wysocki2011-05-173-3/+103
| |\ \ \ \ \ \ \
| | * | | | | | | PM: Revert "driver core: platform_bus: allow runtime override of dev_pm_ops"Kevin Hilman2011-05-161-3/+0
| | * | | | | | | PM / Runtime: Generic clock manipulation rountines for runtime PM (v6)Rafael J. Wysocki2011-04-301-0/+42
| | * | | | | | | PM / Runtime: Add subsystem data field to struct dev_pm_infoRafael J. Wysocki2011-04-291-0/+1
| | * | | | | | | PM: Export platform bus type's default PM callbacksRafael J. Wysocki2011-04-291-0/+60
| * | | | | | | | Merge branch 'syscore' into for-linusRafael J. Wysocki2011-05-173-26/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | PM: Remove sysdev suspend, resume and shutdown operationsRafael J. Wysocki2011-05-113-26/+0
| * | | | | | | | | kmod: always provide usermodehelper_disable()Kay Sievers2011-05-171-4/+0
| * | | | | | | | | PM: Print a warning if firmware is requested when tasks are frozenRafael J. Wysocki2011-05-171-0/+5
* | | | | | | | | | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linusLinus Torvalds2011-05-191-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SSB: Change fallback sprom to callback mechanism.Hauke Mehrtens2011-05-191-1/+3
* | | | | | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cp...Linus Torvalds2011-05-191-34/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [CPUFREQ] cpufreq.h: Fix some checkpatch.pl coding style issues.Thiago Farina2011-05-041-15/+18
| * | | | | | | | | | | [CPUFREQ] use dynamic debug instead of custom infrastructureDominik Brodowski2011-05-041-19/+0
| | |_|/ / / / / / / / | |/| | | | | | | | |
OpenPOWER on IntegriCloud