diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:53:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 14:53:42 -0800 |
| commit | 442d1ba237c81304ccfa33887094e843183645f7 (patch) | |
| tree | 55d516e121f3bc558e808d05ae6407f845456db3 /block/Makefile | |
| parent | fb5131e1880ea1ba3ba7197cd5cc66c9c288f715 (diff) | |
| parent | a135cef79a2927ecff800492a26cd314e9cba996 (diff) | |
Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Disable DRAM ECC injection on K8
EDAC: Fixup scrubrate manipulation
amd64_edac: Remove two-stage initialization
amd64_edac: Check ECC capabilities initially
amd64_edac: Carve out ECC-related hw settings
amd64_edac: Remove PCI ECS enabling functions
amd64_edac: Remove explicit Kconfig PCI dependency
amd64_edac: Allocate driver instances dynamically
amd64_edac: Rework printk macros
amd64_edac: Rename CPU PCI devices
amd64_edac: Concentrate per-family init even more
amd64_edac: Cleanup the CPU PCI device reservation
amd64_edac: Simplify CPU family detection
amd64_edac: Add per-family init function
amd64_edac: Use cached extended CPU model
amd64_edac: Remove F11h support
Diffstat (limited to 'block/Makefile')
0 files changed, 0 insertions, 0 deletions