Merge branch 'topic/bkl' into topic/core-cleanup
authorTakashi Iwai <tiwai@suse.de>
Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 13 Apr 2010 09:24:34 +0000 (11:24 +0200)
commit067e4a5d23422c9e9a0787b7e18fa2457226d999
tree550ab9dc96efe513b2ffeafbff6662f8caaa68ef
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099
parent4cf19b848f92641eeb2585949a09eedec57fb53a
Merge branch 'topic/bkl' into topic/core-cleanup
sound/core/info.c
sound/usb/caiaq/device.c