aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-04-19 00:24:00 -0400
committerOlof Johansson <olof@lixom.net>2012-04-19 00:24:00 -0400
commit1c2e1fd1ca4a342a9727c7184703e1d9b03c9720 (patch)
tree5116efa8a6c37ddfbc2b7a4d183e6bea4fe106e9 /init
parent888073d41680e8244232f3d850e0424a4e9de60f (diff)
parent6aaec67da1e41a0752a2b903b989e73b9f02e182 (diff)
Merge tag 'omap-fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Fix regression for bad uart muxing and oops when PM is not set. Revert one softreset regression and few other minor fixes. * tag 'omap-fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: DMTIMER: fix broken timer clock source selection ARM: OMAP: serial: Fix the ocp smart idlemode handling bug ARM: OMAP2+: UART: Fix incorrect population of default uart pads ARM: OMAP: sram: fix BUG in dpll code for !PM case ARM: OMAP2/3: VENC hwmods: Remove OCPIF_SWSUP_IDLE flag from VENC slave interface ARM: OMAP2+: hwmod: Revert "ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status" ARM: OMAP2+: hwmod: add softreset delay field and OMAP4 data ARM: OMAP1: mux: add missing include
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions