Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (Linus)

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=bbd9d6f7fbb0305c9a592bf05a32e87eb364a4ff
conflicts:

3 out of 5 hunks FAILED -- saving rejects to file fs/namei.c.rej
5 out of 5 hunks FAILED -- saving rejects to file fs/btrfs/inode.c.rej
2 out of 2 hunks FAILED -- saving rejects to file fs/cifs/connect.c.rej
1 out of 6 hunks FAILED -- saving rejects to file fs/namei.c.rej
1 out of 4 hunks FAILED -- saving rejects to file fs/nfs/super.c.rej
3 out of 3 hunks FAILED -- saving rejects to file mm/vmscan.c.rej
3 out of 3 hunks FAILED -- saving rejects to file mm/vmscan.c.rej
11 out of 11 hunks FAILED -- saving rejects to file fs/inode.c.rej
1 out of 2 hunks FAILED -- saving rejects to file fs/fs-writeback.c.rej
6 out of 6 hunks FAILED -- saving rejects to file fs/inode.c.rej
4 out of 5 hunks FAILED -- saving rejects to file fs/super.c.rej
1 out of 2 hunks FAILED -- saving rejects to file include/linux/fs.h.rej
1 out of 2 hunks FAILED -- saving rejects to file fs/ext4/inode.c.rej
3 out of 3 hunks FAILED -- saving rejects to file arch/arm/mach-ux500/clock.c.rej
4 out of 4 hunks FAILED -- saving rejects to file fs/nfs/file.c.rej
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (Linus)

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=0003230e8200699860f0b10af524dc47bf8aecad
conflicts:

1 out of 1 hunk FAILED -- saving rejects to file fs/namespace.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/btrfs/acl.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/posix_acl.c.rej
1 out of 1 hunk FAILED -- saving rejects to file include/linux/posix_acl.h.rej
2 out of 2 hunks FAILED -- saving rejects to file fs/btrfs/acl.c.rej
1 out of 1 hunk FAILED -- saving rejects to file Documentation/filesystems/porting.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/btrfs/ctree.h.rej
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (Linus)

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=e371d46ae45488bcb112a99a7de462e9e3aa6764

conflicts:
fs/xfs/xfs_vnodeops.c.rej
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (Linus)

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=1b8e94993c4752d98c33903aa836acc15f7e6d5c

conflicts:
fs/namei.c.rej
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 (Linus)

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=24f0eed2668b059e847ff145848ddacb75419acc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=208f6f6068836e10d526e87fef6ca4364f4ec068
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=7758c4d6e9371efa04a1cf1b124bbf9cc43e830e
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=2db1125d51c4752ca68d1f015347b6f5b55e9fca
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=3172f8fe1ca1d432b196efad453c0ceb89302075
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=ddb360778a86bcf55d856bc15df3ebd2e77afff1
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?id=a22681fabb1564d00d54e804ec95ba9330d857ed