Merge tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull driver core updates from Greg Kroah-Hartman:
 "Here's the driver core, and other driver subsystems, pull request for
  the 3.5-rc1 merge window.

  Outside of a few minor driver core changes, we ended up with the
  following different subsystem and core changes as well, due to
  interdependancies on the driver core:
   - hyperv driver updates
   - drivers/memory being created and some drivers moved into it
   - extcon driver subsystem created out of the old Android staging
     switch driver code
   - dynamic debug updates
   - printk rework, and /dev/kmsg changes

  All of this has been tested in the linux-next releases for a few weeks
  with no reported problems.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up conflicts in drivers/extcon/extcon-max8997.c where git noticed
that a patch to the deleted drivers/misc/max8997-muic.c driver needs to
be applied to this one.

* tag 'driver-core-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (90 commits)
  uio_pdrv_genirq: get irq through platform resource if not set otherwise
  memory: tegra{20,30}-mc: Remove empty *_remove()
  printk() - isolate KERN_CONT users from ordinary complete lines
  sysfs: get rid of some lockdep false positives
  Drivers: hv: util: Properly handle version negotiations.
  Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()
  memory: tegra{20,30}-mc: Use dev_err_ratelimited()
  driver core: Add dev_*_ratelimited() family
  Driver Core: don't oops with unregistered driver in driver_find_device()
  printk() - restore prefix/timestamp printing for multi-newline strings
  printk: add stub for prepend_timestamp()
  ARM: tegra30: Make MC optional in Kconfig
  ARM: tegra20: Make MC optional in Kconfig
  ARM: tegra30: MC: Remove unnecessary BUG*()
  ARM: tegra20: MC: Remove unnecessary BUG*()
  printk: correctly align __log_buf
  ARM: tegra30: Add Tegra Memory Controller(MC) driver
  ARM: tegra20: Add Tegra Memory Controller(MC) driver
  printk() - restore timestamp printing at console output
  printk() - do not merge continuation lines of different threads
  ...

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc drivers/extcon/extcon-max8997.c
index 2e7df9c56491b6b8452b5e33ce17524a3716ec0d,2b1aa04a27ddf39e51de8f0d68730220dd03af76..23416e443765ec0d1da62405518866a9e7851370
--- 1/drivers/misc/max8997-muic.c
--- 2/drivers/extcon/extcon-max8997.c
+++ b/drivers/extcon/extcon-max8997.c
@@@ -452,10 -496,9 +492,11 @@@ static int __devinit max8997_muic_probe
  
        return ret;
  
+ err_extcon:
+       kfree(info->edev);
  err_irq:
- err_pdata:
 +      while (--i >= 0)
 +              free_irq(pdata->irq_base + muic_irqs[i].irq, info);
        kfree(info);
  err_kfree:
        return ret;

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge

diff --cc drivers/parport/parport_pc.c
Simple merge

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

diff --cc init/main.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge