Merge remote-tracking branch 'pm/linux-next'

Conflicts:
	arch/arm/mach-shmobile/board-ap4evb.c

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

diff --cc Documentation/power/basic-pm-debugging.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
index b622d8d3ab7297da7bd1b3d76ec8a89a55d5f00f,d6c8ae81317597a71d68f81fe8c400c956a61a22..241f8ea220776e024356d526e30d283c23f4456f
--- 1/arch/arm/mach-shmobile/board-ap4evb.c
--- 2/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@@ -42,7 -42,7 +42,8 @@@
  #include <linux/leds.h>
  #include <linux/input/sh_keysc.h>
  #include <linux/usb/r8a66597.h>
 +#include <linux/dma-mapping.h>
+ #include <linux/pm_clock.h>
  
  #include <media/sh_mobile_ceu.h>
  #include <media/sh_mobile_csi2.h>

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/tty/Kconfig
index f462fa5f937c50e658c90c76d846f55eee630bfd,a7188a0b68eba04a63ec4847cec79de03e827462..33175504bb39da91c97d8c8b587144b16ae9e33e
--- 1/drivers/tty/Kconfig
--- 2/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@@ -60,9 -60,13 +60,13 @@@ config VT_CONSOL
  
          If unsure, say Y.
  
+ config VT_CONSOLE_SLEEP
+       def_bool y
+       depends on VT_CONSOLE && PM_SLEEP
+ 
  config HW_CONSOLE
        bool
 -      depends on VT && !S390 && !UML
 +      depends on VT && !UML
        default y
  
  config VT_HW_CONSOLE_BINDING

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

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

diff --cc include/sound/pcm.h
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/power/Kconfig
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/mac80211/scan.c
Simple merge

diff --cc sound/core/pcm_native.c
Simple merge

diff --cc sound/usb/card.c
Simple merge