Merge remote-tracking branch 'char-misc/char-misc-next'

diff --cc Documentation/driver-model/devres.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/dts/omap3-beagle-xm.dts
Simple merge

diff --cc arch/arm/boot/dts/omap3-beagle.dts
Simple merge

diff --cc arch/arm/boot/dts/omap3-n900.dts
Simple merge

diff --cc drivers/char/hw_random/core.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/extcon/extcon-arizona.c
Simple merge

diff --cc drivers/hwtracing/coresight/of_coresight.c
Simple merge

diff --cc drivers/misc/mei/amthif.c
Simple merge

diff --cc drivers/misc/mei/main.c
Simple merge

diff --cc drivers/misc/mei/pci-me.c
Simple merge

diff --cc include/linux/mfd/arizona/core.h
Simple merge

diff --cc kernel/time/clockevents.c
index 25d942d1da27095e6366d720a0f8de58009cb5f3,888ecc114ddc9fe480f95986807d716851b19498..11dc22a6983b55da3c2c356cb375fa27dbad0ed8
--- 1/kernel/time/clockevents.c
--- 2/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@@ -440,39 -371,8 +440,39 @@@ int clockevents_unbind_device(struct cl
        mutex_unlock(&clockevents_mutex);
        return ret;
  }
- EXPORT_SYMBOL_GPL(clockevents_unbind);
+ EXPORT_SYMBOL_GPL(clockevents_unbind_device);
  
 +/* Sanity check of state transition callbacks */
 +static int clockevents_sanity_check(struct clock_event_device *dev)
 +{
 +      /* Legacy set_mode() callback */
 +      if (dev->set_mode) {
 +              /* We shouldn't be supporting new modes now */
 +              WARN_ON(dev->set_state_periodic || dev->set_state_oneshot ||
 +                      dev->set_state_shutdown || dev->tick_resume);
 +
 +              BUG_ON(dev->mode != CLOCK_EVT_MODE_UNUSED);
 +              return 0;
 +      }
 +
 +      if (dev->features & CLOCK_EVT_FEAT_DUMMY)
 +              return 0;
 +
 +      /* New state-specific callbacks */
 +      if (!dev->set_state_shutdown)
 +              return -EINVAL;
 +
 +      if ((dev->features & CLOCK_EVT_FEAT_PERIODIC) &&
 +          !dev->set_state_periodic)
 +              return -EINVAL;
 +
 +      if ((dev->features & CLOCK_EVT_FEAT_ONESHOT) &&
 +          !dev->set_state_oneshot)
 +              return -EINVAL;
 +
 +      return 0;
 +}
 +
  /**
   * clockevents_register_device - register a clock event device
   * @dev:      device to register

diff --cc sound/soc/codecs/arizona.c
Simple merge