Merge branch 'fix/misc' into for-linus
commit227c4edb729790960f5f4991a703a398e925184c
authorTakashi Iwai <tiwai@suse.de>
Fri, 23 Apr 2010 15:10:48 +0000 (23 17:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 23 Apr 2010 15:10:48 +0000 (23 17:10 +0200)
tree6df1be7e7a45e83092a53e1fe0b23e6ce6101971
parent1f10cd34d9b347106cb34ef91c8ff76f12ee67a8
parent715aa675338ce6e1a3b4f77cf87ea611f93058a8
Merge branch 'fix/misc' into for-linus