Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:26:48 +0000 (07:26 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Nov 2010 22:26:48 +0000 (07:26 +0900)
commitb76a1e4f2a2f95354f4567c8eb420fd4cb68fc26
tree3231168f2e67d8351e8b9bf4161d9df89251f5fd
parent78daa87b1d332e4ac963c793a4157533d57501c7
parent4814a2b3c603438ed8c330c74b49aa662b1ede43
Merge branch 'for-linus' of git://git390.marist.edu/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