diff options
Diffstat (limited to 'drivers/usb/chipidea/Makefile')
| tree | 8aa8afa56af93cb9f72997a57ee4db6330431f14 /sound/isa/msnd/msnd_classic.c | |
|---|---|---|
| parent | 98473f9f3f9bd404873cd1178c8be7d6d619f0d1 (diff) | |
| parent | 02608e02fbec04fccf2eb0cc8d8082f65c0a4286 (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a boot failure on some platforms when crypto self test is
enabled along with the new acomp interface"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: testmgr - Use heap buffer for acomp test input
Diffstat (limited to 'sound/isa/msnd/msnd_classic.c')