summaryrefslogtreecommitdiffstats
path: root/net/batman-adv
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-21 22:19:27 -0700
committerOlof Johansson <olof@lixom.net>2014-05-21 22:19:27 -0700
commit767bf9f00ec753a3bba653844d7b858b8720707f (patch)
treed608fe4eccea8de5662389872599bc6c0930ebfb /net/batman-adv
parentd1d70e5dc2cfa9047bb935c41ba808ebb8135696 (diff)
parent4b353a706a86598ba47307c47301c3c428b79e09 (diff)
Merge tag 'omap-for-v3.15/fixes-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Pull "omap fixes for v3.15-rc cycle" from Tony Lindgren: Regression fixes for omaps for NAND, DMA, cpu_idle and audio. Also a minor one line fix for audio clock on 54xx. * tag 'omap-for-v3.15/fixes-v3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP4: Fix the boot regression with CPU_IDLE enabled ARM: OMAP2+: Fix DMA hang after off-idle ARM: OMAP2+: nand: Fix NAND on OMAP2 and OMAP3 boards ARM: omap5: hwmod_data: Correct IDLEMODE for McPDM ARM: OMAP3: clock: Back-propagate rate change from cam_mclk to dpll4_m5 on all OMAP3 platforms Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/batman-adv')
0 files changed, 0 insertions, 0 deletions