Merge 3.3-rc6 into driver-core-next

This was done to resolve a conflict in the drivers/base/cpu.c file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 249b8895807d..079629bff957 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1272,10 +1272,8 @@ static int pcmcia_bus_add(struct pcmcia_socket *skt)
 
 static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
 {
-        if (!verify_cis_cache(skt)) {
-                pcmcia_put_socket(skt);
+        if (!verify_cis_cache(skt))
                 return 0;
-        }
 
         dev_dbg(&skt->dev, "cis mismatch - different card\n");