Merge git://git.infradead.org/battery-2.6
[linux-2.6] / arch / um / scripts /
drwxr-xr-x   ..
-rw-r--r-- 1258 Makefile.rules