diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 16:01:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 16:01:13 -0500 |
| commit | 6067d7e4f05e5c08617cf95032867d892035e581 (patch) | |
| tree | ca8205a2514936bce2cd0942e0806dc43b0436dc /block/deadline-iosched.c | |
| parent | 71492fd1bdd4734d8efd20fe00ebf31027d86d3c (diff) | |
| parent | 27df5068e24f2f88de98e95eb6e8dbc9800bf80e (diff) | |
Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6
* 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6:
HWPOISON: Add PROC_FS dependency to hwpoison injector v2
Diffstat (limited to 'block/deadline-iosched.c')
0 files changed, 0 insertions, 0 deletions