From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Nov 2010 22:26:48 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v2.6.37-rc4~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] qdio: free indicator after reset is finished
  [S390] nmi: fix clock comparator revalidation
---

b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26