Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

Browse source

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

...

This commit is contained in:

Linus Torvalds 2011-05-02 08:47:35 -07:00

parent fa51588882 a985183285

commit 96f3ee2805

4 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/s390/crypto/prng.c

View file

2

arch/s390/mm/fault.c

View file

2

drivers/s390/block/dasd_diag.c

View file

2

drivers/s390/kvm/kvm_virtio.c

View file