Merge branch 'for-linus' from kernel.org:/.../shaggy/jfs-2.6 manually