From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Nov 2010 22:42:32 +0000 (+0900)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
X-Git-Tag: v2.6.37-rc4~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc;p=~shefty%2Frdma-dev.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  arch/tile: fix memchr() not to dereference memory for zero length
  arch/tile: make glibc's sysconf(_SC_NPROCESSORS_CONF) work correctly
  arch/tile: fix rwlock so would-be write lockers don't block new readers
---

c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc