From: Kevin Hilman Date: Tue, 10 Dec 2013 15:46:39 +0000 (-0800) Subject: Merge branch 'fixes' into for-next X-Git-Tag: next-20131212~100^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dabc7b6952e9fc628cd981558d6cc206a1520c97;p=karo-tx-linux.git Merge branch 'fixes' into for-next * fixes: ARM: OMAP2+: hwmod: Fix usage of invalid iclk / oclk when clock node is not present ARM: OMAP3: hwmod data: Don't prevent RESET of USB Host module ARM: OMAP2+: hwmod: Fix SOFTRESET logic ARM: OMAP4+: hwmod data: Don't prevent RESET of USB Host module --- dabc7b6952e9fc628cd981558d6cc206a1520c97