Merge tag 'omap-devel-am33xx-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel...

From Tony Lindgren:
From Paul Walmsley <paul@pwsan.com>:

AM33xx hwmod data and miscellaneous clock and hwmod fixes.  AM33xx
should now boot on mainline after this is applied, according to
Vaibhav.

(The shortlog makes no sense here since it contains mostly the dependent
cleanups that are part of the preceding branches).

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-omap2/devices.c
index 02b9478b786f0b1e42c886a7196b3b3e5fd441cb,1efa984b1a4739e5fe09dd2fbdd7d695680a0852..6f6893e38ffc5a4730d79a783b9d975d248cc1eb
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -19,13 -19,11 +19,10 @@@
  #include <linux/of.h>
  #include <linux/platform_data/omap4-keypad.h>
  
- #include <mach/hardware.h>
- #include <mach/irqs.h>
  #include <asm/mach-types.h>
  #include <asm/mach/map.h>
 -#include <asm/pmu.h>
  
  #include "iomap.h"
- #include <plat/board.h>
  #include <plat/dma.h>
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>