Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ed156a13aa40..4fa954b07ac4 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -521,11 +521,15 @@ int __init_or_module platform_driver_probe(struct platform_driver *drv,
 {
         int retval, code;
 
+        /* make sure driver won't have bind/unbind attributes */
+        drv->driver.suppress_bind_attrs = true;
+
         /* temporary section violation during probe() */
         drv->probe = probe;
         retval = code = platform_driver_register(drv);
 
-        /* Fixup that section violation, being paranoid about code scanning
+        /*
+         * Fixup that section violation, being paranoid about code scanning
          * the list of drivers in order to probe new devices.  Check to see
          * if the probe was successful, and make sure any forced probes of
          * new devices fail.