Minor sysfs fixes for 2.6.32 block/fs merge
Initial 2.6.32 kernel/init/net merge (non-compiling)