diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 13:32:19 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 13:32:19 -0800 |
commit | 6371e82307237dede71f884ad8e8e11faa75e8be (patch) | |
tree | 16586cbd1b2d7a749262a765465ccac0aedf8683 /net/core/net-sysfs.c | |
parent | c3606c60a91969cc42c12bae71a022ca56de83d2 (diff) | |
parent | e726f3c368e7c1919a7166ec09c5705759f1a69d (diff) | |
download | blackbird-op-linux-6371e82307237dede71f884ad8e8e11faa75e8be.tar.gz blackbird-op-linux-6371e82307237dede71f884ad8e8e11faa75e8be.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
amd64_edac: Fix interleaving check
EDAC: Correct MiB_TO_PAGES() macro
EDAC: Fix workqueue-related crashes
Diffstat (limited to 'net/core/net-sysfs.c')
0 files changed, 0 insertions, 0 deletions