diff options
author | Linus Torvalds | 2010-02-11 14:07:13 -0800 |
---|---|---|
committer | Linus Torvalds | 2010-02-11 14:07:13 -0800 |
commit | 676ad585531e965416fd958747894541dabcec96 (patch) | |
tree | 26dc3c73bc518f13cc3e31c56828fece8d52fa4f /include/linux/ipx.h | |
parent | ffaa60d5fe1d30b618b0feb22c79486c26a16ea0 (diff) | |
parent | cab4d27764d5a8654212b3e96eb0ae793aec5b94 (diff) |
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: Do not falsely trigger kerneloops
Diffstat (limited to 'include/linux/ipx.h')
0 files changed, 0 insertions, 0 deletions