From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Sep 2010 19:49:55 +0000 (-0700)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.36-rc5~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ab22c17cd2a9840b4457a656fd377c73ec4f518d;p=karo-tx-linux.git

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>"
---

ab22c17cd2a9840b4457a656fd377c73ec4f518d