Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6

8ed57590 · Linus Torvalds · 27d1097d · 210cc679 · 8ed57590 · 8ed57590
Commit 8ed57590 authored 19 years ago by Linus Torvalds
Showing with 409 additions and 25 deletions

include/linux/hp_sdc.h include/linux/hp_sdc.h +300 -0

include/linux/input.h include/linux/input.h +1 -0

sound/parisc/harmony.c sound/parisc/harmony.c +98 -18

sound/parisc/harmony.h sound/parisc/harmony.h +10 -7

No files found.
--- a/include/linux/hp_sdc.h
+++ b/include/linux/hp_sdc.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/sound/parisc/harmony.c
+++ b/sound/parisc/harmony.c
--- a/sound/parisc/harmony.h
+++ b/sound/parisc/harmony.h