Merge branch 'master' into export-slabh
Tejun Heo [Mon, 5 Apr 2010 02:37:28 +0000 (11:37 +0900)]
46 files changed:
1  2 
arch/arm/kernel/kprobes.c
arch/microblaze/kernel/dma.c
arch/microblaze/mm/init.c
arch/sparc/mm/init_64.c
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/mm/init.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_fops.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/radeon/atom.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r420.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_object.c
drivers/gpu/drm/radeon/rs400.c
drivers/gpu/drm/radeon/rv515.c
drivers/gpu/drm/radeon/rv770.c
drivers/gpu/drm/ttm/ttm_memory.c
drivers/gpu/drm/ttm/ttm_tt.c
drivers/hid/usbhid/hid-quirks.c
drivers/platform/x86/asus-laptop.c
drivers/serial/sunsu.c
drivers/usb/gadget/r8a66597-udc.c
drivers/video/sunxvr500.c
fs/logfs/dev_bdev.c
fs/logfs/dir.c
fs/logfs/journal.c
fs/logfs/readwrite.c
fs/logfs/segment.c
fs/logfs/super.c
fs/proc/base.c
fs/proc/task_mmu.c
fs/reiserfs/super.c
include/drm/drmP.h
kernel/cgroup_freezer.c
kernel/cred.c
kernel/perf_event.c
kernel/sched.c
kernel/trace/ring_buffer.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
   */
  #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"
Simple merge
Simple merge
Simple merge
Simple merge
   *          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 */
Simple merge
   */
  #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"
Simple merge
@@@ -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"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/logfs/dir.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cred.c
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge