projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71492fd 27df506)
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)
* '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


Trivial merge
John Crispins staging tree