Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Dec 2009 21:01:13 +0000 (13:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Dec 2009 21:01:13 +0000 (13:01 -0800)
commit6067d7e4f05e5c08617cf95032867d892035e581
treeca8205a2514936bce2cd0942e0806dc43b0436dc
parent71492fd1bdd4734d8efd20fe00ebf31027d86d3c
parent27df5068e24f2f88de98e95eb6e8dbc9800bf80e
Merge branch 'hwpoison' of git://git./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