Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc...