diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-22 12:45:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-22 12:45:01 -0400 |
| commit | 90edf27fb89241917e91155bfdcc7c8e5a587222 (patch) | |
| tree | a2d1841cfe382f426a3b6ccb306b0665ad455885 /include/linux/virtio_blk.h | |
| parent | 41945f6ccf1e86f87fddf6b32db9cf431c05fb54 (diff) | |
| parent | 8b15575cae7a93a784c3005c42b069edd9ba64dd (diff) | |
Merge branch 'linus' into perf/core
Conflicts:
kernel/hw_breakpoint.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/virtio_blk.h')
0 files changed, 0 insertions, 0 deletions