diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-13 12:49:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-13 12:49:55 -0700 |
commit | ab22c17cd2a9840b4457a656fd377c73ec4f518d (patch) | |
tree | fc44bbd01b8016246235ec648918ca7ff0593bed /arch/m68k/include/asm | |
parent | ed8f425f546a2242a97f61fabcbe9e50a2559a19 (diff) | |
parent | f574c843191728d9407b766a027f779dcd27b272 (diff) | |
download | op-kernel-dev-ab22c17cd2a9840b4457a656fd377c73ec4f518d.zip op-kernel-dev-ab22c17cd2a9840b4457a656fd377c73ec4f518d.tar.gz |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] fix siglock
Quoth Tony:
"I committed the fix for this last week prior to your -rc4 announcement
reminding us to give proper "Reported-by:" credit. This one should have
had:
Reported-by: Tony Ernst <tee@sgi.com>
and also
Much-useful-investigation-and-tracing-by: Hedi Berriche <hedi@sgi.com>
Much-useful-investigation-and-tracing-by: Petr Tesarik <ptesarik@novell.com>"
Diffstat (limited to 'arch/m68k/include/asm')
0 files changed, 0 insertions, 0 deletions