commit | b76a1e4f2a2f95354f4567c8eb420fd4cb68fc26 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 27 07:26:48 2010 +0900 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 27 07:26:48 2010 +0900 |
tree | 3231168f2e67d8351e8b9bf4161d9df89251f5fd | |
parent | 78daa87b1d332e4ac963c793a4157533d57501c7 [diff] | |
parent | 4814a2b3c603438ed8c330c74b49aa662b1ede43 [diff] |
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