Merge remote-tracking branch 'asoc/topic/ssm2602' into tmp
authorMark Brown <[email protected]>
Sun, 1 Sep 2013 20:15:59 +0000 (21:15 +0100)
committerMark Brown <[email protected]>
Sun, 1 Sep 2013 20:15:59 +0000 (21:15 +0100)

Trivial merge