Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sat, 28 Aug 2010 19:44:15 +0000 (21:44 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 28 Aug 2010 19:44:15 +0000 (21:44 +0200)
commit9dde3f92a7342e690f6f4a7ee8746d9b43d4c723
treeca60b194cc75f6f5a06bbe60fa60bf67bac9da84
parent6a366725029c74827ca8d74361e02bca1804102e
parent708fafb3c54039caa5dadc8e9d2dfd999f88f190
Merge branch 'fix/asoc' into for-linus