From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 May 2011 15:47:35 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
X-Git-Tag: v3.12-rc1~6242
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96f3ee280549ebf62818ef71603061a3b3230eb9;p=kernel%2Fkernel-generic.git

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
---

96f3ee280549ebf62818ef71603061a3b3230eb9