Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
Li Zefan [Wed, 11 Jan 2012 01:54:49 +0000 (09:54 +0800)]
1  2 
fs/btrfs/xattr.c

Simple merge