diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 18:18:48 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-15 18:18:48 (GMT) |
| commit | 1cecd791f2708b621e619cf4df4636c97c9497e5 (patch) | |
| tree | 7d1cae2e3e0c02a5c187408fac36f0bae20fadf0 /block/scsi_ioctl.c | |
| parent | fef86db8feb2618430ac9e3c9b6197a7eacaf27a (diff) | |
| parent | a252852afaea8270fcb91628b298253b112fc92e (diff) | |
| download | linux-fsl-qoriq-1cecd791f2708b621e619cf4df4636c97c9497e5.tar.xz | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Fix text_poke_smp_batch() deadlock
perf tools: Fix thread_map event synthesizing in top and record
watchdog, nmi: Lower the severity of error messages
ARM: oprofile: Fix backtraces in timer mode
oprofile: Fix usage of CONFIG_HW_PERF_EVENTS for oprofile_perf_init and friends
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions