Merge branch 'akpm'

* akpm: (182 commits)
  fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
  fbdev: *bfin*: fix __dev{init,exit} markings
  fbdev: *bfin*: drop unnecessary calls to memset
  fbdev: bfin-t350mcqb-fb: drop unused local variables
  fbdev: blackfin has __raw I/O accessors, so use them in fb.h
  fbdev: s1d13xxxfb: add accelerated bitblt functions
  tcx: use standard fields for framebuffer physical address and length
  fbdev: add support for handoff from firmware to hw framebuffers
  intelfb: fix a bug when changing video timing
  fbdev: use framebuffer_release() for freeing fb_info structures
  radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
  s3c-fb: CPUFREQ frequency scaling support
  s3c-fb: fix resource releasing on error during probing
  carminefb: fix possible access beyond end of carmine_modedb[]
  acornfb: remove fb_mmap function
  mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
  mb862xxfb: restrict compliation of platform driver to PPC
  Samsung SoC Framebuffer driver: add Alpha Channel support
  atmel-lcdc: fix pixclock upper bound detection
  offb: use framebuffer_alloc() to allocate fb_info struct
  ...

Manually fix up conflicts due to kmemcheck in mm/slab.c

1 files changed, 1 insertions, 13 deletions

diff --git a/mm/Kconfig b/mm/Kconfig
index 6f4610a9ce55..c948d4ca8bde 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -203,25 +203,13 @@ config VIRT_TO_BUS
         def_bool y
         depends on !ARCH_NO_VIRT_TO_BUS
 
-config UNEVICTABLE_LRU
-        bool "Add LRU list to track non-evictable pages"
-        default y
-        help
-          Keeps unevictable pages off of the active and inactive pageout
-          lists, so kswapd will not waste CPU time or have its balancing
-          algorithms thrown off by scanning these pages.  Selecting this
-          will use one page flag and increase the code size a little,
-          say Y unless you know what you are doing.
-
-          See Documentation/vm/unevictable-lru.txt for more information.
-
 config HAVE_MLOCK
         bool
         default y if MMU=y
 
 config HAVE_MLOCKED_PAGE_BIT
         bool
-        default y if HAVE_MLOCK=y && UNEVICTABLE_LRU=y
+        default y if HAVE_MLOCK=y
 
 config MMU_NOTIFIER
         bool