diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-06 09:55:06 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-06 09:55:06 +0400 |
commit | ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05 (patch) | |
tree | c28975d7daf6d8a3aa23afe8f42837b71105b269 /drivers/block/cciss_scsi.c | |
parent | 8c6e549a447c51f4f8c0ba7f1e444469f75a354a (diff) | |
parent | e041e328c4b41e1db79bfe5ba9992c2ed771ad19 (diff) | |
download | linux-ec00010972a0971b2c1da4fbe4e5c7d8ed1ecb05.tar.xz |
Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches
Conflicts:
arch/x86/kernel/traps.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/block/cciss_scsi.c')
0 files changed, 0 insertions, 0 deletions