From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2010 17:32:15 +0000 (-0800)
Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
X-Git-Tag: v2.6.33-rc4~74
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a07f523f264095759c6bb6e0e7a81c4d15bc3336;p=~emulex%2Finfiniband.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] __per_cpu_idtrs[] is a memory hog
  [IA64] sanity in #include files.  Move fnptr to types.h
  [IA64] use helpers for rlimits
  [IA64] cpumask_of_node() should handle -1 as a node
---

a07f523f264095759c6bb6e0e7a81c4d15bc3336