diff for duplicates of <20141029154707.GA5290@mwanda>

diff --git a/a/1.txt b/N1/1.txt
index cd33471..d25d434 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -18,10 +18,15 @@ index a31f1ca..f37d39d 100644
  	switch (rdev->family) {
  	case CHIP_CYPRESS:
 @@ -3303,8 +3303,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev)
- 	rdev->config.evergreen.tile_config | 		((gb_addr_config & 0x30000000) >> 28) << 12;
+ 	rdev->config.evergreen.tile_config |=
+ 		((gb_addr_config & 0x30000000) >> 28) << 12;
  
 -	num_shader_engines = (gb_addr_config & NUM_SHADER_ENGINES(3) >> 12) + 1;
 -
  	if ((rdev->family >= CHIP_CEDAR) && (rdev->family <= CHIP_HEMLOCK)) {
  		u32 efuse_straps_4;
  		u32 efuse_straps_3;
+_______________________________________________
+dri-devel mailing list
+dri-devel@lists.freedesktop.org
+http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 8a5a428..4c87f27 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,6 +1,6 @@
  "From\0Dan Carpenter <dan.carpenter@oracle.com>\0"
  "Subject\0[patch] drm/radeon: remove some buggy dead code\0"
- "Date\0Wed, 29 Oct 2014 15:47:07 +0000\0"
+ "Date\0Wed, 29 Oct 2014 18:47:07 +0300\0"
  "To\0Alex Deucher <alexander.deucher@amd.com>\0"
  "Cc\0kernel-janitors@vger.kernel.org"
  " Christian K\303\266nig <christian.koenig@amd.com>"
@@ -27,12 +27,17 @@
  " \tswitch (rdev->family) {\n"
  " \tcase CHIP_CYPRESS:\n"
  "@@ -3303,8 +3303,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev)\n"
- " \trdev->config.evergreen.tile_config | \t\t((gb_addr_config & 0x30000000) >> 28) << 12;\n"
+ " \trdev->config.evergreen.tile_config |=\n"
+ " \t\t((gb_addr_config & 0x30000000) >> 28) << 12;\n"
  " \n"
  "-\tnum_shader_engines = (gb_addr_config & NUM_SHADER_ENGINES(3) >> 12) + 1;\n"
  "-\n"
  " \tif ((rdev->family >= CHIP_CEDAR) && (rdev->family <= CHIP_HEMLOCK)) {\n"
  " \t\tu32 efuse_straps_4;\n"
- " \t\tu32 efuse_straps_3;"
+ " \t\tu32 efuse_straps_3;\n"
+ "_______________________________________________\n"
+ "dri-devel mailing list\n"
+ "dri-devel@lists.freedesktop.org\n"
+ http://lists.freedesktop.org/mailman/listinfo/dri-devel
 
-0706e10d9779bf3338258050f5364fa78e6d705a772bcfb41516ac28bb043f4f
+31465ca9ea51e8a8c89a8d8652d723962f90157c7b27d3f2aa13269e39e8430f
