summaryrefslogtreecommitdiffstats
path: root/drivers/video/fbdev/aty
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 11:39:44 +0200
committerMark Brown <broonie@linaro.org>2014-06-03 11:39:44 +0200
commitdd7a7bb50cb5b5166a562a883f149ee4721c9c63 (patch)
tree3df8d4ceb7487820621dccf194d4c6cc6ae46d66 /drivers/video/fbdev/aty
parentMerge remote-tracking branch 'asoc/topic/core' into asoc-next (diff)
parentASoC: Blackfin: ADAU1X81 eval board support (diff)
parentASoC: wm_adsp: Use adsp_err/warn instead of dev_err/warn (diff)
downloadlinux-dd7a7bb50cb5b5166a562a883f149ee4721c9c63.tar.xz
linux-dd7a7bb50cb5b5166a562a883f149ee4721c9c63.zip
Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc-next