summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_esai.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-11 06:07:55 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-11 06:07:55 +0400
commitbf65dea87e87c53ba4f97c6432761498bc977efd (patch)
tree965920af213277ccd76e76d5296d7841569ba3b3 /sound/soc/fsl/fsl_esai.h
parent4d9708ea5e5a45973df7cf965805fdfb185dd5bf (diff)
parentd0585cd815faef50ce3d12cbe173438eb4d81eb8 (diff)
downloadlinux-bf65dea87e87c53ba4f97c6432761498bc977efd.tar.xz
Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull edac updates from Mauro Carvalho Chehab: "Nothing really exiting here: just one bug fix at sb_edac, and some changes to allow other drivers to use some shared PCI addresses" * tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: sb_edac: Claim a different PCI device Move Intel SNB device ids from sb_edac to pci_ids.h sb_edac: avoid INTERNAL ERROR message in EDAC with unspecified channel
Diffstat (limited to 'sound/soc/fsl/fsl_esai.h')
0 files changed, 0 insertions, 0 deletions