Merge by hand (conflicts in sd.c)
[linux-2.6.22.y-op.git] / drivers / acpi / hardware / 
tree2b2410955954a83b3f1859a52e7801b2e4f226a7
drwxr-xr-x   ..
-rw-r--r-- 181 Makefile
-rw-r--r-- 6721 hwacpi.c
-rw-r--r-- 12375 hwgpe.c
-rw-r--r-- 24366 hwregs.c
-rw-r--r-- 16987 hwsleep.c
-rw-r--r-- 6436 hwtimer.c