git » linux-kernel » commit 0d9ccfe

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

author Linus Torvalds
2009-12-01 16:26:44 UTC
committer Linus Torvalds
2009-12-01 16:26:44 UTC
parent f133f22dd6f413bdf71ebf7e00ce441d98ac7c87
parent f13a48bd798a159291ca583b95453171b88b7448
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/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.