Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:15 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:15 +0000 (17:20 +0100)
commit06b753d6fd139acf37f4f99c2cfffc2e74841a7c
tree5e336c12eb4f3005a6b517d972fae7fe58038420
parent9912b30f95e22d5722abc225c1c3784a51643aef
parent6f0d94790efe9f4481bbd7c174ef0e9b5e5db7c4
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
drivers/misc/atmel-ssc.c