Merge

diff --cc drivers/base/platform.c
index b79c1d345192439e7fb390cf03b809b3d2c04960,f05582c65d09a3a23666d70c713270ea9e70d297..4f76511d902eb84b773a6418700d7df40a9ae4b5
--- 1/drivers/base/platform.c
--- 2/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@@ -75,6 -75,6 +75,7 @@@ int __init platform_bus_init(void
        return bus_register(&platform_bus_type);
  }
  
 +EXPORT_SYMBOL(legacy_bus);
+ EXPORT_SYMBOL(platform_bus_type);
  EXPORT_SYMBOL(platform_device_register);
  EXPORT_SYMBOL(platform_device_unregister);

diff --cc drivers/i2c/i2c-core.c
Simple merge