From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 Sep 2011 03:30:33 +0000 (+1000)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20110923~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b9535358c8426c4ec1144384f61bb7835558ad20;p=karo-tx-linux.git

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

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

b9535358c8426c4ec1144384f61bb7835558ad20
diff --cc arch/arm/mach-shmobile/board-ap4evb.c
index b622d8d3ab72,d6c8ae813175..241f8ea22077
--- a/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>