| commit | 96f3ee280549ebf62818ef71603061a3b3230eb9 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 2 May 2011 15:47:35 +0000 (2 08:47 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 2 May 2011 15:47:35 +0000 (2 08:47 -0700) | ||
| tree | 42576f17169c6c9a2d334cf70ae313a02580f26c | treesnapshot (tar.gz zip) |
| parent | fa515888821d307a79cb8d1e8e052b7aff39d844 | commitdiff |
| parent | a9851832857dc1e4efefca1713f5cff3e168a25c | commitdiff |
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] irqstats: fix counting of pfault, dasd diag and virtio irqs
[S390] prng: fix pointer arithmetic
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] irqstats: fix counting of pfault, dasd diag and virtio irqs
[S390] prng: fix pointer arithmetic