From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Dec 2009 21:01:13 +0000 (-0800)
Subject: Merge branch 'hwpoison' of git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux... 
X-Git-Tag: v2.6.33-rc2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6067d7e4f05e5c08617cf95032867d892035e581;p=linux-2.6-block.git

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
---

6067d7e4f05e5c08617cf95032867d892035e581