Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
[pandora-kernel.git] / fs / cifs / inode.c
diff --cc fs/cifs/inode.c
Simple merge