From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Jan 2011 01:02:14 +0000 (-0800)
Subject: Merge branch 'akpm'
X-Git-Tag: v3.0~2013
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d99641f6c1af806cd5d9e6badce91910219a161;p=platform%2Fkernel%2Flinux-amlogic.git

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

8d99641f6c1af806cd5d9e6badce91910219a161
diff --cc drivers/char/Kconfig
index ccac7d0,4237602..b7980a83
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -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