summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-25 15:28:14 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-25 15:28:14 +0200
commit10121a12e2380fb34b6e646a8e367add06d036c3 (patch)
treed500294174e67cbb208eaf5d7f9741be48eca8a6 /sound
parent28d0325ce6e0a52f53d8af687e6427fee59004d3 (diff)
parentdd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff)
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
Conflicts: MAINTAINERS
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions