From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Dec 2009 16:26:44 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: tegra-9.12.13.ER~492
X-Git-Url: http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git;a=commitdiff_plain;h=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015

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.
---

0d9ccfe1b5321b8d27117817b9ae4d3288c8b015