Merge branch 'linus' into tracing/core

Merge reason: merge latest tracing fixes to avoid conflicts in
              kernel/trace/trace_events_filter.c with upcoming change

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

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b6f3a0de6ca2..85e2e919d1cd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -716,8 +716,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 
         /* new style driver methods can't mix with legacy ones */
         if (is_newstyle_driver(driver)) {
-                if (driver->attach_adapter || driver->detach_adapter
-                                || driver->detach_client) {
+                if (driver->detach_adapter || driver->detach_client) {
                         printk(KERN_WARNING
                                         "i2c-core: driver [%s] is confused\n",
                                         driver->driver.name);