Merge branch 'linus' into x86/cpu

Conflicts:

	arch/x86/kernel/cpu/intel_cacheinfo.c

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

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index 58b7336640ff..d397fa5f3a91 100644
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -345,7 +345,7 @@ struct rtc_device *rtc_class_open(char *name)
         struct device *dev;
         struct rtc_device *rtc = NULL;
 
-        dev = class_find_device(rtc_class, name, __rtc_match);
+        dev = class_find_device(rtc_class, NULL, name, __rtc_match);
         if (dev)
                 rtc = to_rtc_device(dev);