Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git] / mm / hwpoison-inject.c
Simple merge