summaryrefslogtreecommitdiff
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-09 21:06:10 (GMT)
committerOlof Johansson <olof@lixom.net>2012-10-09 22:00:58 (GMT)
commit6bd5dbda2adeabba69c969886511e501a65b6e3c (patch)
tree354ccf775d95796aa3b8b773475484e36d652973 /kernel/trace/trace.c
parent1e574e3a7dbef1c0365494687d7a0b6dca7eac93 (diff)
parent8bbacc55ba72368d7fdbad06b63d66bd763a428a (diff)
downloadlinux-6bd5dbda2adeabba69c969886511e501a65b6e3c.tar.xz
Merge tag 'omap-for-v3.7-rc1/fixes-asoc-regression-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
From Tony Lindgren: This branch contains regression fixes for omap4/5 ASoC audio that were caused by the fact that u-boot stopped muxing non essential pins. As omap audio and dmaengine development happens on these platforms, let's make sure they are usable. Of course this should have been fixed earlier and not during the -rc cycle. * tag 'omap-for-v3.7-rc1/fixes-asoc-regression-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM/dts: omap5-evm: pinmux configuration for audio ARM/dts: Add pinctrl driver entries for omap5 ARM/dts: omap4-panda: pinmux configuration for audio ARM/dts: omap4-sdp: pinmux configuration for audio ARM/dts: omap5-evm: Disable unused McBSP3 ARM/dts: omap4-sdp: Disable unused McBSP3 ARM/dts: omap4-panda: Disable unused audio IPs ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs ARM: OMAP: board-4430-sdp: Pin mux configuration for audio needs
Diffstat (limited to 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions