Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 16:26:44 +0000 (08:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Dec 2009 16:26:44 +0000 (08:26 -0800)
commit0d9ccfe1b5321b8d27117817b9ae4d3288c8b015
tree0fb1cd938d72785e7df7a29a2025771c7784e496
parentf13a48bd798a159291ca583b95453171b88b7448
parentf133f22dd6f413bdf71ebf7e00ce441d98ac7c87
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Loongson: Switch from flatmem to sparsemem
  MIPS: Loongson: Disallow 4kB pages
  MIPS: Add missing definition for MADV_HWPOISON.
  MIPS: Fix build error if __xchg() is not getting inlined.
  MIPS: IP22/IP28 Disable early printk to fix boot problems on some systems.