From: Tejun Heo <tj@kernel.org>
Date: Mon, 5 Apr 2010 02:37:28 +0000 (+0900)
Subject: Merge branch 'master' into export-slabh
X-Git-Tag: v2.6.34-rc4~71^2~1
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=336f5899d287f06d8329e208fc14ce50f7ec9698;p=net-next-2.6.git

Merge branch 'master' into export-slabh
---

336f5899d287f06d8329e208fc14ce50f7ec9698
diff --cc drivers/gpu/drm/radeon/evergreen.c
index 438226a2290,647a0efdc35..e8f447e2050
--- a/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/rs400.c
index 273c7dcd454,626aaf082b1..1a41cb268b7
--- a/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/rv770.c
index 188e62d10f8,9f37d2efb0a..97958a64df1
--- a/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_tt.c
index 0ef7f73ea56,bab6cd8d8a1..d5fd5b8faeb
--- a/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"