Merge git://git.infradead.org/battery-2.6
[linux-2.6] / fs / gfs2 / locking /
drwxr-xr-x   ..
drwxr-xr-x - dlm
drwxr-xr-x - nolock