summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/wl1273.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-16 11:52:34 +0000
committerMark Brown <broonie@kernel.org>2014-12-16 11:52:34 +0000
commitc52e5698efef1d9999d744be001be62d9fcabf55 (patch)
tree14a265c43d96784fa34b96677340723fd2be2284 /sound/soc/codecs/wl1273.c
parent681a19560378213a193c424881b2180a783b81ae (diff)
parent15f6c5884ee939f17d8e1fec5bda044a7d995f2f (diff)
parentde5f644e3ca71afc06377d137375c56e250f8cb3 (diff)
parent75945896a2f4a7ebfc3402443f99ac32f629ee96 (diff)
parent359ff7ffafa78dd401a1ca0019ba2fe35ff377cc (diff)
parent7e5d8706dd3ee19f8626977935ab16e59b3603be (diff)
Merge remote-tracking branches 'asoc/fix/atmel', 'asoc/fix/intel', 'asoc/fix/rt5645', 'asoc/fix/rt5677' and 'asoc/fix/samsung' into asoc-linus