]> err.no Git - linux-2.6/commitdiff
Merge http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa
authorGreg Kroah-Hartman <gregkh@suse.de>
Sat, 5 Aug 2006 17:49:32 +0000 (10:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 5 Aug 2006 17:49:32 +0000 (10:49 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge