summaryrefslogtreecommitdiff
path: root/include/linux/ata_platform.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 17:58:36 +0300
committerMark Brown <broonie@kernel.org>2015-08-30 17:58:36 +0300
commit384ea7936cc987ee771690f624593f6dd8ca15a2 (patch)
tree5a57fb94b297ce333d1d773f58113a1fc67a97cd /include/linux/ata_platform.h
parentc009d370dd35eb29a8c14f6eb50a4da4276db3f1 (diff)
parent030e6ee241f0586308622bcdd273a317976b3169 (diff)
parentefc04ca22303dee1f34d038af3addc13621bed58 (diff)
parentdc606e05468fc5e3b125bffdd54253f853bfbb8e (diff)
parentc8a6b92be8516c92cf46bc127fa0adf53a05d31c (diff)
parentf611cdd8eb33ac6ca1196319b27b7f7f24ef98a9 (diff)
downloadlinux-384ea7936cc987ee771690f624593f6dd8ca15a2.tar.xz
Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm5100', 'asoc/topic/wm5110', 'asoc/topic/wm8004' and 'asoc/topic/wm8731' into asoc-next