diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 10:57:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-03 10:57:20 -0700 |
| commit | bd463a06064c4bc8497f6aa6dfb4437be8f07a3b (patch) | |
| tree | 3499f105c565d977d0ae9486f0a4572cd5fcbd2e /drivers/video/ps3fb.c | |
| parent | 148311d2ade909a79afb85a853c7979eb499563f (diff) | |
| parent | e6dab5ffab59e910ec0e3355f4a6f29f7a7be474 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Fix merge window fallout and fix sleep profiling (this was always
broken, so it's not a fix for the merge window - we can skip this one
from the head of the tree)."
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/trace: Add ability to set a target task for events
perf/x86: Fix USER/KERNEL tagging of samples properly
perf/x86/intel/uncore: Make UNCORE_PMU_HRTIMER_INTERVAL 64-bit
Diffstat (limited to 'drivers/video/ps3fb.c')
0 files changed, 0 insertions, 0 deletions