Merge ../linus

Conflicts:

	drivers/cpufreq/cpufreq.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c
index 933cd864a5c9..b005602d6b53 100644
--- a/drivers/pcmcia/socket_sysfs.c
+++ b/drivers/pcmcia/socket_sysfs.c
@@ -188,7 +188,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf,
             (s->state & SOCKET_PRESENT) &&
             !(s->state & SOCKET_CARDBUS)) {
                 if (try_module_get(s->callback->owner)) {
-                        s->callback->requery(s);
+                        s->callback->requery(s, 0);
                         module_put(s->callback->owner);
                 }
         }
@@ -325,7 +325,7 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz
         if ((s->callback) && (s->state & SOCKET_PRESENT) &&
             !(s->state & SOCKET_CARDBUS)) {
                 if (try_module_get(s->callback->owner)) {
-                        s->callback->requery(s);
+                        s->callback->requery(s, 1);
                         module_put(s->callback->owner);
                 }
         }