Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...

Some OMAP AM35xx fixes.

The powerdomain and clockdomain data for the AM35xx are finally fixed.
The AM35xx EMAC/MDIO Ethernet controller integration code has been
converted to use the OMAP device and hwmod framework.  Also the UART4
and HSOTGUSB warnings have been fixed.

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/irq.c
Simple merge

diff --cc arch/arm/mach-omap2/pm34xx.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/cpu.h
index e79e913d95dea95e5db1ee00ae7fb62cdca039c2,de6c0a08f4615d6fba3f07b316285f9a9b47095a..430081ac0c473d7c67560ddc042dc269519cdae2
--- 1/arch/arm/plat-omap/include/plat/cpu.h
--- 2/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@@ -273,10 -275,10 +271,8 @@@ IS_OMAP_TYPE(2422, 0x2422
  IS_OMAP_TYPE(2423, 0x2423)
  IS_OMAP_TYPE(2430, 0x2430)
  IS_OMAP_TYPE(3430, 0x3430)
- IS_OMAP_TYPE(3505, 0x3517)
- IS_OMAP_TYPE(3517, 0x3517)
  
  #define cpu_is_omap310()              0
 -#define cpu_is_omap730()              0
 -#define cpu_is_omap850()              0
  #define cpu_is_omap1510()             0
  #define cpu_is_omap1610()             0
  #define cpu_is_omap5912()             0