Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:55 +0000 (13:01 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 2 Jan 2014 13:01:55 +0000 (13:01 +0000)
commit2cde51fbd0f310c8a2c5f977e665c0ac3945b46d
treea2b6d153e535738946c9969a7c9d29392bd6263b
parent7471c5c9f58eb7ff322dfcd7a8c6dc801c010b0d
parentc097d5fdf3b51cdb2521c3cffab0a8cf03c68cc6
parent74c375cb85d7374734e6e53af41c724d9a937f8e
parent04c3a852f51ff40f32a29e14078432038b5bcdbc
parent5095f55d7cc327026daaa3fa583aa4c1388ca556
parent4f534777c130180f9338f0fb96090d43464b7ddf
parent2f54d2a1cf7e62f56b1b0bcf44bd704f65359f38
parent56d37d85438df38e150282baafe52dcd588854c7
parent192043cf608909eb5728a5fd68f5234b90d9415b
parentf467a0f513ad81998f0cad1022684a273d5743f7
parentbbe580302d33cff282129e26c44f9c3450d6a086
parent3990c516de66af940c5c366a81531787aefe81ae
parentd754fa9ad18d16209c276fc6241aa2d10f819ede
parent516ea4b584332f511d3bf1b98ceabd974b1a2313
parent69ae8489076fa0fa98609155434f3c286c7364a0
parent25c1a63f43ca40f1581c076b7f7618297ef1cbba
parentf52c91921553be26c7a0de13daa0d18ef46655ff
parent111bd7b18e13c66552e9a672000eeacacd414a65
parentaafa85e71a75fdea9076c5e0f7fe09e12568c9a4
parentdd407a3243234c6a17ba624d698e6824067003c9
parent71467e46414d3bab220de77d3d085be0c0aa03e1
parent0f7f3d1f17c2e4d73e449e6acb2007b13813c58e
parent8778ac6be25abf0496fc614a3e77ad2ff8300353
parent0406a40a095ca039e5f5ec63783342253c573d06
parent308a0f3f24db5e5943ef0aad722e8b3d125dbddb
parent2650bc4f6d0c36f1219d2070485cc2980a88fab3
parent8cb7a36eb3a80cd58353e351b7b4370d9a9f0c14
parent323702b4e06dfd1a4ee6cee5834a889b9663cccf
parentef749400434cefd14fe02fe3de9e9f0125b2256d
parent3cec159cfb3fc69190f3ccdc2d1329c66775529f
parent72aa62bed3ea30635156fad95f123a0b665072bf
parent328089a47112a4fc06071e2003ecd75cc6d31029
parent11db0da831b1e6ae3c1f8743599434281db294db
parente1771bcf99b0dc91f4ba645c1740fd5031702f49
parentf60e5473e6788f93849a61198bec4e02fea31e51
parenta010ff628c0953e6c914ecd09678363848617a88
parent5e8154332f48f92f37824577c88e400b5e0cd56d
parent58381da687742a3d8bbb98362152de8326a0c077
parent626bcacb89f93b2145f3a705a342067a77347a99
parent38136bde7691bdafa91c2320e014913aec6dbe6b
parent06b2bd23057f9dad149f0dda436c7426c87b986f
parent8c5178fca4ce5a57711ea14b807648e19b105d0e
parent8e6ad35a31e7ebc59543df875fc970200df2cf68
parent008ef947d0c5d14442256a37f6bf6b14015efe26
parentf58c4fc4a3bf9eb699a638634d20ef4d16069366
parent2309d6757900c4a6909fa673724976935b408a25
parent5c1537163ce716e317776565b8210ea06fa2b5de
parentb65ab73e5d624eb4a88bc6094a3627007cb92500
parent26090a834b49673945458b185be0afa03c2737fe
parent9ea6fbc66d15c83089e177b445872a9ba40f125d
parent2c4864334c4d9a23fa810638ad27e80ea0ceb9a4
parent1769267bb01303ac73b48535454461819ef1dcc2
parentf3f9a60f7947b6bd2f970d5680dd3df624405027
parentf25cf34969823ab7197ce9ff2521c33f0141075b
parent3f3002692ce8fa1e9b257183ea1a36baacfdcfcf
parentfbbf7fea8e806ccc3ce0e059ad1d9671d57b4309
parentc3e8494c001ce0bec0ebaa49c6f5eeb2aa5ab36a
parente40e0b5da87bb4256a6dc62db7663b8a0c204f1f
parent50c9697320434d1489d087cbf38f7907a9894609
parent63587116811bd23d22693b50447a2a356602e70b
parent0112b62b12e18b883e1027689acab8eaa8830bac
parenta0a05916cf67a007f4ee0071fd0fa04e45137a38
parentb888edbc68fbace3101cb092c6910476e85ae922
parentd44008b358588cf6fcc74716b50584a8e59cbe65
parent9a199b8e9933edf83585bac2c9030870e014381b
parent784cbf8ab4641c874806a938b9c863c91d70fbe5
Merge remote-tracking branches 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic/adav80x', 'asoc/topic/adsp', 'asoc/topic/ak4641', 'asoc/topic/ak4642', 'asoc/topic/arizona', 'asoc/topic/atmel', 'asoc/topic/au1x', 'asoc/topic/axi', 'asoc/topic/bcm2835', 'asoc/topic/blackfin', 'asoc/topic/cs4271', 'asoc/topic/cs42l52', 'asoc/topic/da7210', 'asoc/topic/davinci', 'asoc/topic/ep93xx', 'asoc/topic/fsl', 'asoc/topic/fsl-mxs', 'asoc/topic/generic', 'asoc/topic/hdmi', 'asoc/topic/jack', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/mxs', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/s6000', 'asoc/topic/sai', 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/spear', 'asoc/topic/ssm2518', 'asoc/topic/ssm2602', 'asoc/topic/tegra', 'asoc/topic/tlv320aic3x', 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic/uda1380', 'asoc/topic/width', 'asoc/topic/wm8510', 'asoc/topic/wm8523', 'asoc/topic/wm8580', 'asoc/topic/wm8711', 'asoc/topic/wm8728', 'asoc/topic/wm8731', 'asoc/topic/wm8741', 'asoc/topic/wm8750', 'asoc/topic/wm8753', 'asoc/topic/wm8776', 'asoc/topic/wm8804', 'asoc/topic/wm8900', 'asoc/topic/wm8901', 'asoc/topic/wm8940', 'asoc/topic/wm8962', 'asoc/topic/wm8974', 'asoc/topic/wm8985', 'asoc/topic/wm8988', 'asoc/topic/wm8990', 'asoc/topic/wm8991', 'asoc/topic/wm8994', 'asoc/topic/wm8995', 'asoc/topic/wm9081' and 'asoc/topic/x86' into asoc-next
14 files changed:
include/sound/soc.h
sound/soc/Kconfig
sound/soc/Makefile
sound/soc/atmel/sam9x5_wm8731.c
sound/soc/codecs/wm5110.c
sound/soc/codecs/wm8731.c
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm_adsp.c
sound/soc/fsl/Kconfig
sound/soc/fsl/imx-spdif.c
sound/soc/generic/simple-card.c
sound/soc/mxs/mxs-saif.c
sound/soc/sh/rcar/scu.c
sound/soc/sh/rcar/ssi.c