Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / include / linux / power / 
tree7b1f14877787133c2342002741ab77e3e4b5560d
drwxr-xr-x   ..
-rw-r--r-- 745 jz4740-battery.h