diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 08:11:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 08:11:04 -0700 |
| commit | 7fa07729e439a6184bd824746d06a49cca553f15 (patch) | |
| tree | 9037f5c36d64f842a030a1284f76a354ef6f76e6 /block/blk-sysfs.c | |
| parent | 991d79b0d1255f89267a350b0048eca59f100cbb (diff) | |
| parent | a8f90e906783f1f815120eefe813b23cb396e9bd (diff) | |
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:
perf_event, powerpc: Fix compilation after big perf_counter rename
Diffstat (limited to 'block/blk-sysfs.c')
0 files changed, 0 insertions, 0 deletions