Merge remote-tracking branch 'driver-core/driver-core-next'

Conflicts:
	arch/arm/plat-mxc/devices.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/plat-mxc/devices.c
index 5aaa8c5f3420a18cf351972cddcdef5664eec529,a34b2ae895f2954a9622ff121e862d0346c8f16b..4d55a7a26e98fd92a1bda89dd5f266864c0ed55f
--- 1/arch/arm/plat-mxc/devices.c
--- 2/arch/arm/plat-mxc/devices.c
+++ b/arch/arm/plat-mxc/devices.c
@@@ -23,59 -23,20 +23,6 @@@
  #include <linux/platform_device.h>
  #include <mach/common.h>
  
- struct platform_device *__init imx_add_platform_device_dmamask(
-               const char *name, int id,
-               const struct resource *res, unsigned int num_resources,
-               const void *data, size_t size_data, u64 dmamask)
 -int __init mxc_register_device(struct platform_device *pdev, void *data)
--{
-       int ret = -ENOMEM;
-       struct platform_device *pdev;
- 
-       pdev = platform_device_alloc(name, id);
-       if (!pdev)
-               goto err;
- 
-       if (dmamask) {
-               /*
-                * This memory isn't freed when the device is put,
-                * I don't have a nice idea for that though.  Conceptually
-                * dma_mask in struct device should not be a pointer.
-                * See http://thread.gmane.org/gmane.linux.kernel.pci/9081
-                */
-               pdev->dev.dma_mask =
-                       kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
-               if (!pdev->dev.dma_mask)
-                       /* ret is still -ENOMEM; */
-                       goto err;
- 
-               *pdev->dev.dma_mask = dmamask;
-               pdev->dev.coherent_dma_mask = dmamask;
-       }
- 
-       if (res) {
-               ret = platform_device_add_resources(pdev, res, num_resources);
-               if (ret)
-                       goto err;
-       }
 -      int ret;
--
-       if (data) {
-               ret = platform_device_add_data(pdev, data, size_data);
-               if (ret)
-                       goto err;
-       }
 -      pdev->dev.platform_data = data;
--
-       ret = platform_device_add(pdev);
-       if (ret) {
- err:
-               if (dmamask)
-                       kfree(pdev->dev.dma_mask);
-               platform_device_put(pdev);
-               return ERR_PTR(ret);
-       }
 -      ret = platform_device_register(pdev);
 -      if (ret)
 -              pr_debug("Unable to register platform device '%s': %d\n",
 -                       pdev->name, ret);
--
-       return pdev;
 -      return ret;
--}
--
  struct device mxc_aips_bus = {
        .init_name      = "mxc_aips",
        .parent         = &platform_bus,

diff --cc arch/arm/plat-mxc/include/mach/devices-common.h
Simple merge

diff --cc drivers/base/platform.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc lib/dynamic_debug.c
Simple merge

diff --cc net/core/dev.c
Simple merge