summaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-13 03:47:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-13 03:47:55 +0200
commit5ec390e046039942d59ef2634b967b8b23fc57c2 (patch)
treec1d80246ec80ef60335f7bbcc6f5c22db901edcb /drivers/edac
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff)
parent[S390] correct address of _stext with CONFIG_SHARED_KERNEL=y (diff)
downloadlinux-5ec390e046039942d59ef2634b967b8b23fc57c2.tar.xz
linux-5ec390e046039942d59ef2634b967b8b23fc57c2.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] correct address of _stext with CONFIG_SHARED_KERNEL=y [S390] ptrace: fix return value of do_syscall_trace_enter() [S390] dasd: fix race between tasklet and dasd_sleep_on
Diffstat (limited to 'drivers/edac')
0 files changed, 0 insertions, 0 deletions