Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / sound / parisc / 
treee793072b88d978b8d2d1125f025782ff136e02b2
drwxr-xr-x   ..
-rw-r--r-- 362 Kconfig
-rw-r--r-- 128 Makefile
-rw-r--r-- 25924 harmony.c
-rw-r--r-- 4913 harmony.h