Merge branch 'linus' into core/iommu

Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
              to resync with the latest upstream fixes and make sure
              the combination works fine.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 8f9372921f82..9987ab880835 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -147,7 +147,7 @@ static ssize_t status_show(struct device *device,
         enum drm_connector_status status;
 
         status = connector->funcs->detect(connector);
-        return snprintf(buf, PAGE_SIZE, "%s",
+        return snprintf(buf, PAGE_SIZE, "%s\n",
                         drm_get_connector_status_name(status));
 }
 
@@ -166,7 +166,7 @@ static ssize_t dpms_show(struct device *device,
         if (ret)
                 return 0;
 
-        return snprintf(buf, PAGE_SIZE, "%s",
+        return snprintf(buf, PAGE_SIZE, "%s\n",
                         drm_get_dpms_name((int)dpms_status));
 }
 
@@ -176,7 +176,7 @@ static ssize_t enabled_show(struct device *device,
 {
         struct drm_connector *connector = to_drm_connector(device);
 
-        return snprintf(buf, PAGE_SIZE, connector->encoder ? "enabled" :
+        return snprintf(buf, PAGE_SIZE, "%s\n", connector->encoder ? "enabled" :
                         "disabled");
 }
 
@@ -317,6 +317,7 @@ static struct device_attribute connector_attrs_opt1[] = {
 
 static struct bin_attribute edid_attr = {
         .attr.name = "edid",
+        .attr.mode = 0444,
         .size = 128,
         .read = edid_show,
 };