Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/xfs/xfs_rename.c
Signed-off-by: NLachlan McIlroy <lachlan@sgi.com>