Merge by hand (conflicts in sd.c)
[pandora-kernel.git] / include / asm-sh / hs7751rvoip /
drwxr-xr-x   ..
-rw-r--r-- 1786 hs7751rvoip.h
-rw-r--r-- 182 ide.h
-rw-r--r-- 1641 io.h