Merge tag 'omap-devel-d-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Fri, 29 Jun 2012 13:07:08 +0000 (06:07 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 29 Jun 2012 13:07:08 +0000 (06:07 -0700)
commitf6f1f12f6d4e9e4a44587e58ec96db25673083ec
tree68f44e3d64ebbee9f89c459136702ca243bbfa61
parente0246e8ecad10b9437381b89756292ac031d4cfa
parenta77e1c4d09c88f98ac2e653382d2c1861dbb736f
Merge tag 'omap-devel-d-for-3.6' of git://git./linux/kernel/git/pjw/omap-pending into fixes-non-critical

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.
arch/arm/Kconfig
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/irq.c
arch/arm/mach-omap2/pm34xx.c
arch/arm/plat-omap/include/plat/cpu.h