diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 22:07:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-10 22:07:55 -0400 |
| commit | bf65dea87e87c53ba4f97c6432761498bc977efd (patch) | |
| tree | 965920af213277ccd76e76d5296d7841569ba3b3 /include/uapi | |
| parent | 4d9708ea5e5a45973df7cf965805fdfb185dd5bf (diff) | |
| parent | d0585cd815faef50ce3d12cbe173438eb4d81eb8 (diff) | |
| download | linux-bf65dea87e87c53ba4f97c6432761498bc977efd.tar.gz linux-bf65dea87e87c53ba4f97c6432761498bc977efd.tar.bz2 linux-bf65dea87e87c53ba4f97c6432761498bc977efd.zip | |
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 'include/uapi')
0 files changed, 0 insertions, 0 deletions