summaryrefslogtreecommitdiff
path: root/drivers/ide/sis5513.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:54:15 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:54:15 +0100
commit246647ee3e7533362e2c291eebaa7409b8565376 (patch)
treebde4b6ba2789a9eafe49be92d2c7c266c5a5a160 /drivers/ide/sis5513.c
parentbb85d37358bbca1bbd0fffda87bb38e7c9b69364 (diff)
parent89e0e250f92b0b0233337043ddf76f261916036c (diff)
parentdce0332c85c4d9eb5d96182c56f63cd20566f073 (diff)
parent2002e90412df17ef7f714be62ed96a3c80b2f907 (diff)
parentb37bfdaac914f4886b8be803703b12177eb873f6 (diff)
parentbf08f39e6088c52c6fc7cce2ef7fbbd7bf4692b9 (diff)
Merge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/fsl-ssi', 'asoc/topic/gtm601', 'asoc/topic/ics43432' and 'asoc/topic/ids' into asoc-next