aboutsummaryrefslogtreecommitdiff
path: root/sound/aoa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-03 16:28:24 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-03 16:28:24 +0100
commit7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d (patch)
treeccd8a592108c84c6ce3a039ce307d18510def927 /sound/aoa
parent71c21b4cf62177a9d1ea46ff4c6073c907122226 (diff)
parent55e03a68d2489d116a5c5e8111ecef3f69831ed6 (diff)
parent6b3ab21ef1ac15db4b053ce0ba8eae0ef9361c8a (diff)
downloadlinux-linaro-stable-7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d.tar.gz
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus