Merge branch 'fix/oss' into for-linus
commitec86fe5209ef991e93b5d391e74954ea9d827c50
authorTakashi Iwai <tiwai@suse.de>
Fri, 31 Jul 2009 08:17:45 +0000 (31 10:17 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 31 Jul 2009 08:17:45 +0000 (31 10:17 +0200)
tree9d2502dfb8da0533dfd5005f78f9f21edaf378f8
parentd62e345f142ba271d9dab2b2e6cb5070cae94754
parenta987004fbcf163b100d227284999602f83044d7e
Merge branch 'fix/oss' into for-linus

* fix/oss:
  sound: mpu401.c: Buffer overflow
  sound: aedsp16: Buffer overflow