tree 237d29da78122379c861227f37cc833f966f9898
parent 88b1988ec2337f5fd8b9204a919838d0bc34b7b4
parent c62ab98584396480467a6e422ab172644862de35
author Olof Johansson <olof@lixom.net> 1328656446 -0800
committer Olof Johansson <olof@lixom.net> 1328656446 -0800

Merge branch 'mxs/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

* 'mxs/defconfig' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mx28: Let audio support be built by default