Merge branches 'fixes' and 'ioremap' into for-linus
[pandora-kernel.git] / mm / page_io.c
diff --cc mm/page_io.c
Simple merge