Merge branch 'akpm'

* akpm:
  kernel/smp.c: consolidate writes in smp_call_function_interrupt()
  kernel/smp.c: fix smp_call_function_many() SMP race
  memcg: correctly order reading PCG_USED and pc->mem_cgroup
  backlight: fix 88pm860x_bl macro collision
  drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
  MAINTAINERS: update Atmel AT91 entry
  mm: fix truncate_setsize() comment
  memcg: fix rmdir, force_empty with THP
  memcg: fix LRU accounting with THP
  memcg: fix USED bit handling at uncharge in THP
  memcg: modify accounting function for supporting THP better
  fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
  mm: compaction: prevent division-by-zero during user-requested compaction
  mm/vmscan.c: remove duplicate include of compaction.h
  memblock: fix memblock_is_region_memory()
  thp: keep highpte mapped until it is no longer needed
  kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT

diff --combined MAINTAINERS
index 2e14fd74d48c066bba8a39cbc8a444f3deca7197,09ea4de09e79ac9bdb3de44c29e8a1fdac19c97b..2261749c0aed1e2a875c07815760575b6d2d72bb
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -162,7 -162,7 +162,7 @@@ L: linux-serial@vger.kernel.or
  W:    http://serial.sourceforge.net
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 -F:    drivers/serial/8250*
 +F:    drivers/tty/serial/8250*
  F:    include/linux/serial_8250.h
  
  8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
@@@ -624,11 -624,15 +624,15 @@@ M:      Lennert Buytenhek <kernel@wantstofly
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
- ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
+ ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <linux@maxim.org.za>
+ M:    Nicolas Ferre <nicolas.ferre@atmel.com>
+ M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://maxim.org.za/at91_26.html
- S:    Maintained
+ W:    http://www.linux4sam.org
+ S:    Supported
+ F:    arch/arm/mach-at91/
  
  ARM/BCMRING ARM ARCHITECTURE
  M:    Jiandong Zheng <jdzheng@broadcom.com>
@@@ -888,8 -892,8 +892,8 @@@ F: arch/arm/mach-msm
  F:    drivers/video/msm/
  F:    drivers/mmc/host/msm_sdcc.c
  F:    drivers/mmc/host/msm_sdcc.h
 -F:    drivers/serial/msm_serial.h
 -F:    drivers/serial/msm_serial.c
 +F:    drivers/tty/serial/msm_serial.h
 +F:    drivers/tty/serial/msm_serial.c
  T:    git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
  S:    Maintained
  
@@@ -1256,7 -1260,7 +1260,7 @@@ F:      drivers/mmc/host/atmel-mci-regs.
  ATMEL AT91 / AT32 SERIAL DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
  S:    Supported
 -F:    drivers/serial/atmel_serial.c
 +F:    drivers/tty/serial/atmel_serial.c
  
  ATMEL LCDFB DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
@@@ -1412,7 -1416,7 +1416,7 @@@ M:      Sonic Zhang <sonic.zhang@analog.com
  L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
 -F:    drivers/serial/bfin_5xx.c
 +F:    drivers/tty/serial/bfin_5xx.c
  
  BLACKFIN WATCHDOG DRIVER
  M:    Mike Frysinger <vapier.adi@gmail.com>
@@@ -1877,7 -1881,7 +1881,7 @@@ L:      linux-cris-kernel@axis.co
  W:    http://developer.axis.com
  S:    Maintained
  F:    arch/cris/
 -F:    drivers/serial/crisv10.*
 +F:    drivers/tty/serial/crisv10.*
  
  CRYPTO API
  M:    Herbert Xu <herbert@gondor.apana.org.au>
@@@ -2216,7 -2220,7 +2220,7 @@@ F:      drivers/net/wan/dscc4.
  DZ DECSTATION DZ11 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
 -F:    drivers/serial/dz.*
 +F:    drivers/tty/serial/dz.*
  
  EATA-DMA SCSI DRIVER
  M:    Michael Neuffer <mike@i-Connect.Net>
@@@ -2643,7 -2647,7 +2647,7 @@@ FREESCALE QUICC ENGINE UCC UART DRIVE
  M:    Timur Tabi <timur@freescale.com>
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Supported
 -F:    drivers/serial/ucc_uart.c
 +F:    drivers/tty/serial/ucc_uart.c
  
  FREESCALE SOC SOUND DRIVERS
  M:    Timur Tabi <timur@freescale.com>
@@@ -3350,7 -3354,7 +3354,7 @@@ IOC3 SERIAL DRIVE
  M:    Pat Gefre <pfg@sgi.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
 -F:    drivers/serial/ioc3_serial.c
 +F:    drivers/tty/serial/ioc3_serial.c
  
  IP MASQUERADING
  M:    Juanjo Ciarlante <jjciarla@raiz.uncu.edu.ar>
@@@ -3527,7 -3531,7 +3531,7 @@@ JSM Neo PCI based serial car
  M:    Breno Leitao <leitao@linux.vnet.ibm.com>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
 -F:    drivers/serial/jsm/
 +F:    drivers/tty/serial/jsm/
  
  K10TEMP HARDWARE MONITORING DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
@@@ -3677,7 -3681,7 +3681,7 @@@ L:      kgdb-bugreport@lists.sourceforge.ne
  S:    Maintained
  F:    Documentation/DocBook/kgdb.tmpl
  F:    drivers/misc/kgdbts.c
 -F:    drivers/serial/kgdboc.c
 +F:    drivers/tty/serial/kgdboc.c
  F:    include/linux/kdb.h
  F:    include/linux/kgdb.h
  F:    kernel/debug/
@@@ -5545,7 -5549,7 +5549,7 @@@ M:      Pat Gefre <pfg@sgi.com
  L:    linux-ia64@vger.kernel.org
  S:    Supported
  F:    Documentation/ia64/serial.txt
 -F:    drivers/serial/ioc?_serial.c
 +F:    drivers/tty/serial/ioc?_serial.c
  F:    include/linux/ioc?.h
  
  SGI VISUAL WORKSTATION 320 AND 540
@@@ -5567,7 -5571,7 +5571,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen
  F:    arch/arm/mach-lh7a40x/
 -F:    drivers/serial/serial_lh7a40x.c
 +F:    drivers/tty/serial/serial_lh7a40x.c
  F:    drivers/usb/gadget/lh7a40*
  F:    drivers/usb/host/ohci-lh7a40*
  
@@@ -5787,14 -5791,14 +5791,14 @@@ L:   sparclinux@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
 -F:    drivers/serial/suncore.c
 -F:    drivers/serial/suncore.h
 -F:    drivers/serial/sunhv.c
 -F:    drivers/serial/sunsab.c
 -F:    drivers/serial/sunsab.h
 -F:    drivers/serial/sunsu.c
 -F:    drivers/serial/sunzilog.c
 -F:    drivers/serial/sunzilog.h
 +F:    drivers/tty/serial/suncore.c
 +F:    drivers/tty/serial/suncore.h
 +F:    drivers/tty/serial/sunhv.c
 +F:    drivers/tty/serial/sunsab.c
 +F:    drivers/tty/serial/sunsab.h
 +F:    drivers/tty/serial/sunsu.c
 +F:    drivers/tty/serial/sunzilog.c
 +F:    drivers/tty/serial/sunzilog.h
  
  SPEAR PLATFORM SUPPORT
  M:    Viresh Kumar <viresh.kumar@st.com>
@@@ -6124,8 -6128,8 +6128,8 @@@ TTY LAYE
  M:    Greg Kroah-Hartman <gregkh@suse.de>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git
 -F:    drivers/char/tty_*
 -F:    drivers/serial/serial_core.c
 +F:    drivers/tty/*
 +F:    drivers/tty/serial/serial_core.c
  F:    include/linux/serial_core.h
  F:    include/linux/serial.h
  F:    include/linux/tty.h
@@@ -6870,7 -6874,7 +6874,7 @@@ XILINX UARTLITE SERIAL DRIVE
  M:    Peter Korsgaard <jacmet@sunsite.dk>
  L:    linux-serial@vger.kernel.org
  S:    Maintained
 -F:    drivers/serial/uartlite.c
 +F:    drivers/tty/serial/uartlite.c
  
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <jpr@f6fbb.org>
@@@ -6916,7 -6920,7 +6920,7 @@@ F:      drivers/media/video/zoran
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <macro@linux-mips.org>
  S:    Maintained
 -F:    drivers/serial/zs.*
 +F:    drivers/tty/serial/zs.*
  
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <xeb@mail.ru>

diff --combined drivers/char/Kconfig
index ccac7d09072775afc2254ab40ea80526a56033db,4237602fd4cdb7633cb73167b56937253a1ed4ae..b7980a83ce2dddae54cf9ca4f866baf9228a0f35
--- 1/drivers/char/Kconfig
--- 2/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -5,7 -5,7 +5,7 @@@
  menu "Character devices"
  
  config VT
-       bool "Virtual terminal" if EMBEDDED
+       bool "Virtual terminal" if EXPERT
        depends on !S390
        select INPUT
        default y
@@@ -39,13 -39,13 +39,13 @@@
  config CONSOLE_TRANSLATIONS
        depends on VT
        default y
-       bool "Enable character translations in console" if EMBEDDED
+       bool "Enable character translations in console" if EXPERT
        ---help---
          This enables support for font mapping and Unicode translation
          on virtual consoles.
  
  config VT_CONSOLE
-       bool "Support for console on virtual terminal" if EMBEDDED
+       bool "Support for console on virtual terminal" if EXPERT
        depends on VT
        default y
        ---help---
@@@ -426,10 -426,10 +426,10 @@@ config SGI_MBC
           If you have an SGI Altix with an attached SABrick
           say Y or M here, otherwise say N.
  
 -source "drivers/serial/Kconfig"
 +source "drivers/tty/serial/Kconfig"
  
  config UNIX98_PTYS
-       bool "Unix98 PTY support" if EMBEDDED
+       bool "Unix98 PTY support" if EXPERT
        default y
        ---help---
          A pseudo terminal (PTY) is a software device consisting of two
@@@ -495,7 -495,7 +495,7 @@@ config LEGACY_PTY_COUN
  
  config TTY_PRINTK
        bool "TTY driver to output user messages via printk"
-       depends on EMBEDDED
+       depends on EXPERT
        default n
        ---help---
          If you say Y here, the support for writing user messages (i.e.

diff --combined drivers/tty/serial/Kconfig
index c1df7676a73d6f04cf6357e2d01a044556164fca,b1682d7f1d8a2492ad59aea18622cb4294b71813..b1682d7f1d8a2492ad59aea18622cb4294b71813
--- 1/drivers/tty/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@@ -81,7 -81,7 +81,7 @@@ config SERIAL_8250_GS
        default SERIAL_8250
  
  config SERIAL_8250_PCI
-       tristate "8250/16550 PCI device support" if EMBEDDED
+       tristate "8250/16550 PCI device support" if EXPERT
        depends on SERIAL_8250 && PCI
        default SERIAL_8250
        help
@@@ -90,7 -90,7 +90,7 @@@
          Saves about 9K.
  
  config SERIAL_8250_PNP
-       tristate "8250/16550 PNP device support" if EMBEDDED
+       tristate "8250/16550 PNP device support" if EXPERT
        depends on SERIAL_8250 && PNP
        default SERIAL_8250
        help