[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[powerpc.git] / sound / drivers / portman2x4.c
2007-02-11 Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-09 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-09 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-09 Linus TorvaldsMerge branch 'linus' of /linux/kernel/git/perex/alsa
2007-02-09 Matthias Koenig[ALSA] Add snd-portman2x4 driver for Midiman Portman...