[PATCH] hfs: show_options support

This adds support for show_options.  It also fixes some namespace polution in
the hfsplus driver.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --cc fs/hfs/super.c
Simple merge

diff --cc fs/hfsplus/hfsplus_fs.h
Simple merge

diff --cc fs/hfsplus/options.c
Simple merge

diff --cc fs/hfsplus/super.c
Simple merge