projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fa51588 a985183)
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2011 15:47:35 +0000 (08:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 2 May 2011 15:47:35 +0000 (08:47 -0700)
* '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


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules