Commits
Merge tag 'v3.6-rc6' into for-3.7 Linux 3.6-rc6 has all our bug fixes. Conflicts (trivial overlap): sound/soc/omap/am3517evm.c
Merge tag 'v3.6-rc6' into for-3.7 Linux 3.6-rc6 has all our bug fixes. Conflicts (trivial overlap): sound/soc/omap/am3517evm.c