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

[gitweb.enneenne.com Git - linuxpps/rss log: Linus Torvalds <>]

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.
    

  * [[D][1][H][2]] arch/mips/Kconfig
  * [[D][3][H][4]] arch/mips/include/asm/mman.h
  * [[D][5][H][6]] arch/mips/include/asm/system.h

   [1]: http://gitweb.enneenne.com/?p=linuxpps;a=blobdiff;f=arch/mips/Kconfig;fp=arch/mips/Kconfig;h=fd7620f025fab0ab25bcd9bca3e3dbf00b78161d;hp=1aad0d9f5074ec1e4dc676e39ed2803d3a256177;hb=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015;hpb=f13a48bd798a159291ca583b95453171b88b7448 (diff)
   [2]: http://gitweb.enneenne.com/?p=linuxpps;a=history;f=arch/mips/Kconfig;h=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015 (history)
   [3]: http://gitweb.enneenne.com/?p=linuxpps;a=blobdiff;f=arch/mips/include/asm/mman.h;fp=arch/mips/include/asm/mman.h;h=c892bfb3e2c1d74eca5a902194e71b46f3e87635;hp=a2250f390a292626e9fde6db8ab3edee41e9ea18;hb=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015;hpb=f13a48bd798a159291ca583b95453171b88b7448 (diff)
   [4]: http://gitweb.enneenne.com/?p=linuxpps;a=history;f=arch/mips/include/asm/mman.h;h=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015 (history)
   [5]: http://gitweb.enneenne.com/?p=linuxpps;a=blobdiff;f=arch/mips/include/asm/system.h;fp=arch/mips/include/asm/system.h;h=83b5509e09e8cf99a6bd966ee991ce0234806566;hp=fcf5f98d90ccf6227906449d24b2cfb016a6e1ae;hb=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015;hpb=f13a48bd798a159291ca583b95453171b88b7448 (diff)
   [6]: http://gitweb.enneenne.com/?p=linuxpps;a=history;f=arch/mips/include/asm/system.h;h=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015 (history)

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commitdiff;h=0d9ccfe1b5321b8d27117817b9ae4d3288c8b015