| commit | 0d9ccfe1b5321b8d27117817b9ae4d3288c8b015 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 01 08:26:44 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 01 08:26:44 2009 -0800 |
| tree | 0fb1cd938d72785e7df7a29a2025771c7784e496 | |
| parent | f13a48bd798a159291ca583b95453171b88b7448 [diff] | |
| parent | f133f22dd6f413bdf71ebf7e00ce441d98ac7c87 [diff] |
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.