Merge commit 'v2.6.30' into for-2.6.31
[safe/jmp/linux-2.6] / fs / partitions / osf.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2