Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Feb 2009 01:59:14 +0000 (17:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Feb 2009 01:59:14 +0000 (17:59 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: check file pointer in btrfs_sync_file


Trivial merge