diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 10:00:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 10:00:49 -0700 |
| commit | e2823299cdc140cccd40484d690ab1d90d75b099 (patch) | |
| tree | a93a1a277619df4b2dc9e4e0b26752864463d240 /arch/mips/kernel/ftrace.c | |
| parent | 240c3c3424366c8109babd2a0fe80855de511b35 (diff) | |
| parent | de4772c621487fd4cadb4138f2481297c8e0cb0d (diff) | |
| download | linux-e2823299cdc140cccd40484d690ab1d90d75b099.tar.bz2 | |
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
Pull edac fixes from Mauro Carvalho Chehab:
"Two edac fixes:
- i7300_edac currently reports a wrong number of DIMMs when the
memory controller is in single channel mode
- on some Sandy Bridge machines, the EDAC driver bails out as one of
the PCI IDs used by the driver is hidden by BIOS. As the driver
uses it only to detect the type of memory, make it optional at the
driver"
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac:
edac: sb_edac.c should not require prescence of IMC_DDRIO device
i7300_edac: Fix memory detection in single mode
Diffstat (limited to 'arch/mips/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions