Merge branch 'hwpoison-fixes-2.6.37' into hwpoison