Merge commit 'v2.6.30' into for-2.6.31
[safe/jmp/linux-2.6] / sound / parisc /
drwxr-xr-x   ..
-rw-r--r-- 458 Kconfig
-rw-r--r-- 128 Makefile
-rw-r--r-- 25879 harmony.c
-rw-r--r-- 4913 harmony.h