author | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 4 Jun 2010 22:39:54 +0000 (15:39 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 4 Jun 2010 22:39:54 +0000 (15:39 -0700) |
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core: (83 commits)
i7core_edac: Better describe the supported devices
Add support for Westmere to i7core_edac driver
i7core_edac: don't free on success
i7core_edac: Add support for X5670
Always call i7core_[ur]dimm_check_mc_ecc_err
i7core_edac: fix memory leak of i7core_dev
EDAC: add __init to i7core_xeon_pci_fixup
i7core_edac: Fix wrong device id for channel 1 devices
i7core: add support for Lynnfield alternate address
i7core_edac: Add initial support for Lynnfield
i7core_edac: do not export static functions
edac: fix i7core build
edac: i7core_edac produces undefined behaviour on 32bit
i7core_edac: Use a more generic approach for probing PCI devices
i7core_edac: PCI device is called NONCORE, instead of NOCORE
i7core_edac: Fix ringbuffer maxsize
i7core_edac: First store, then increment
i7core_edac: Better parse "any" addrmask
i7core_edac: Use a lockless ringbuffer
edac: Create an unique instance for each kobj
...
i7core_edac: Better describe the supported devices
Add support for Westmere to i7core_edac driver
i7core_edac: don't free on success
i7core_edac: Add support for X5670
Always call i7core_[ur]dimm_check_mc_ecc_err
i7core_edac: fix memory leak of i7core_dev
EDAC: add __init to i7core_xeon_pci_fixup
i7core_edac: Fix wrong device id for channel 1 devices
i7core: add support for Lynnfield alternate address
i7core_edac: Add initial support for Lynnfield
i7core_edac: do not export static functions
edac: fix i7core build
edac: i7core_edac produces undefined behaviour on 32bit
i7core_edac: Use a more generic approach for probing PCI devices
i7core_edac: PCI device is called NONCORE, instead of NOCORE
i7core_edac: Fix ringbuffer maxsize
i7core_edac: First store, then increment
i7core_edac: Better parse "any" addrmask
i7core_edac: Use a lockless ringbuffer
edac: Create an unique instance for each kobj
...
1 | 2 | |||
---|---|---|---|---|
arch/x86/include/asm/pci_x86.h | patch | | diff1 | | diff2 | | blob | history |
arch/x86/kernel/cpu/mcheck/mce.c | patch | | diff1 | | diff2 | | blob | history |
include/linux/pci.h | patch | | diff1 | | diff2 | | blob | history |
include/linux/pci_ids.h | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/x86/include/asm/pci_x86.h
Simple merge
diff --cc arch/x86/kernel/cpu/mcheck/mce.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge