From: Olof Johansson Date: Wed, 22 May 2013 20:11:45 +0000 (-0700) Subject: Merge branch 'fixes' into for-next X-Git-Tag: next-20130527~14^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9619228c95dcdac183ee2ca0cc1d9037d7826bdc;p=karo-tx-linux.git Merge branch 'fixes' into for-next * fixes: ARM: shmobile: marzen: Use error values in usb_power_* ARM: OMAP2+: hwmod: Remove sysc slave idle and auto idle apis SERIAL: OMAP: Remove the slave idle handling from the driver ARM: OMAP2+: serial: Remove the un-used slave idle hooks ARM: OMAP2+: hwmod-data: UART IP needs software control to manage sidle modes ARM: OMAP2+: hwmod: Add a new flag to handle SIDLE in SWSUP only in active ARM: OMAP2+: hwmod: Fix sidle programming in _enable_sysc()/_idle_sysc() --- 9619228c95dcdac183ee2ca0cc1d9037d7826bdc