tree 904770abe925abf1e37bad1a6d7d7f576257b194
parent 530ede14cf63ef4a207b0003e14af2f750484180
parent d7011f5b9dd3c88feb5cebad7d0b719ed6816ebd
author Linus Torvalds <torvalds@linux-foundation.org> 1362345200 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1362345200 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

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>