Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Mar 2013 21:13:20 +0000 (13:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 Mar 2013 21:13:20 +0000 (13:13 -0800)
Pull btrfs fixup from Chris Mason:
 "Geert and James both sent this one in, sorry guys"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs/raid56: Add missing #include <linux/vmalloc.h>

fs/btrfs/raid56.c

index 0722205..9a79fb7 100644 (file)
@@ -31,6 +31,7 @@
 #include <linux/hash.h>
 #include <linux/list_sort.h>
 #include <linux/raid/xor.h>
+#include <linux/vmalloc.h>
 #include <asm/div64.h>
 #include "compat.h"
 #include "ctree.h"