Merge branch 'master' into export-slabh

diff --cc arch/arm/kernel/kprobes.c
Simple merge

diff --cc arch/microblaze/kernel/dma.c
Simple merge

diff --cc arch/microblaze/mm/init.c
Simple merge

diff --cc arch/sparc/mm/init_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc arch/x86/mm/init.c
Simple merge

diff --cc drivers/gpu/drm/drm_edid.c
Simple merge

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/drm_fops.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_bo.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_state.c
Simple merge

diff --cc drivers/gpu/drm/radeon/atom.c
Simple merge

diff --cc drivers/gpu/drm/radeon/evergreen.c
index 438226a2290a963cb47cb40d0084c47a289a640f,647a0efdc353a94efcc3d054ac607d586d24111f..e8f447e20507313ed0367748b8fa585fdeec2bbf
--- 1/drivers/gpu/drm/radeon/evergreen.c
--- 2/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@@ -23,9 -23,9 +23,10 @@@
   */
  #include <linux/firmware.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include "drmP.h"
  #include "radeon.h"
+ #include "radeon_asic.h"
  #include "radeon_drm.h"
  #include "rv770d.h"
  #include "atom.h"

diff --cc drivers/gpu/drm/radeon/r100.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r300.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r420.c
Simple merge

diff --cc drivers/gpu/drm/radeon/r600.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_device.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_object.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rs400.c
index 273c7dcd454c475153dfde2775952a9438dad850,626aaf082b1a9d1c6974afbc354318dcde0b2805..1a41cb268b72c7ac6594f74ee80ccc47325b4ce7
--- 1/drivers/gpu/drm/radeon/rs400.c
--- 2/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@@ -26,9 -26,9 +26,10 @@@
   *          Jerome Glisse
   */
  #include <linux/seq_file.h>
 +#include <linux/slab.h>
  #include <drm/drmP.h>
  #include "radeon.h"
+ #include "radeon_asic.h"
  #include "rs400d.h"
  
  /* This files gather functions specifics to : rs400,rs480 */

diff --cc drivers/gpu/drm/radeon/rv515.c
Simple merge

diff --cc drivers/gpu/drm/radeon/rv770.c
index 188e62d10f8f8311336a4d713d4bdc2ab23ac2ef,9f37d2efb0a99a1639c07784f621e018da8b441f..97958a64df1a5c7e438939d854ef95bcf47d2750
--- 1/drivers/gpu/drm/radeon/rv770.c
--- 2/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@@ -27,9 -27,9 +27,10 @@@
   */
  #include <linux/firmware.h>
  #include <linux/platform_device.h>
 +#include <linux/slab.h>
  #include "drmP.h"
  #include "radeon.h"
+ #include "radeon_asic.h"
  #include "radeon_drm.h"
  #include "rv770d.h"
  #include "atom.h"

diff --cc drivers/gpu/drm/ttm/ttm_memory.c
Simple merge

diff --cc drivers/gpu/drm/ttm/ttm_tt.c
index 0ef7f73ea56c77730a5b0b5a19d73b6304ed1bda,bab6cd8d8a1e98aad0296b0014c15ac7f6d12717..d5fd5b8faeb3559ed46c2ef53a78800ecc4fc129
--- 1/drivers/gpu/drm/ttm/ttm_tt.c
--- 2/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@@ -34,8 -33,8 +33,9 @@@
  #include <linux/pagemap.h>
  #include <linux/file.h>
  #include <linux/swap.h>
 +#include <linux/slab.h>
  #include "drm_cache.h"
+ #include "drm_mem_util.h"
  #include "ttm/ttm_module.h"
  #include "ttm/ttm_bo_driver.h"
  #include "ttm/ttm_placement.h"

diff --cc drivers/hid/usbhid/hid-quirks.c
Simple merge

diff --cc drivers/platform/x86/asus-laptop.c
Simple merge

diff --cc drivers/serial/sunsu.c
Simple merge

diff --cc drivers/usb/gadget/r8a66597-udc.c
Simple merge

diff --cc drivers/video/sunxvr500.c
Simple merge

diff --cc fs/logfs/dev_bdev.c
Simple merge

diff --cc fs/logfs/dir.c
Simple merge

diff --cc fs/logfs/journal.c
Simple merge

diff --cc fs/logfs/readwrite.c
Simple merge

diff --cc fs/logfs/segment.c
Simple merge

diff --cc fs/logfs/super.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/task_mmu.c
Simple merge

diff --cc fs/reiserfs/super.c
Simple merge

diff --cc include/drm/drmP.h
Simple merge

diff --cc kernel/cgroup_freezer.c
Simple merge

diff --cc kernel/cred.c
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge