summaryrefslogtreecommitdiffstats
path: root/include/asm-i386/edac.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 20:15:25 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 20:15:25 +0100
commit79051db9aedf7d169458a879accd1beda8f0cf8b (patch)
tree5fc7d94ed307dc5d31babc1cc802ccf3fb04507c /include/asm-i386/edac.h
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentat91: at91sam9g45 family: identify several chip versions (diff)
downloadlinux-79051db9aedf7d169458a879accd1beda8f0cf8b.tar.xz
linux-79051db9aedf7d169458a879accd1beda8f0cf8b.zip
Merge branch 'for-linus' of git://github.com/at91linux/linux-2.6-at91
* 'for-linus' of git://github.com/at91linux/linux-2.6-at91: at91: at91sam9g45 family: identify several chip versions avr32: add two new at91 to cpu.h definition
Diffstat (limited to 'include/asm-i386/edac.h')
0 files changed, 0 insertions, 0 deletions