diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 19:47:35 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 19:47:35 +0400 |
commit | 96f3ee280549ebf62818ef71603061a3b3230eb9 (patch) | |
tree | 42576f17169c6c9a2d334cf70ae313a02580f26c /sound/usb/format.c | |
parent | fa515888821d307a79cb8d1e8e052b7aff39d844 (diff) | |
parent | a9851832857dc1e4efefca1713f5cff3e168a25c (diff) | |
download | linux-96f3ee280549ebf62818ef71603061a3b3230eb9.tar.xz |
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] irqstats: fix counting of pfault, dasd diag and virtio irqs
[S390] prng: fix pointer arithmetic
Diffstat (limited to 'sound/usb/format.c')
0 files changed, 0 insertions, 0 deletions