diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 13:13:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-03 13:13:20 -0800 |
| commit | 1c82315a12144cde732636e259d39e3ee81b3c5b (patch) | |
| tree | 904770abe925abf1e37bad1a6d7d7f576257b194 /block/ioctl.c | |
| parent | 530ede14cf63ef4a207b0003e14af2f750484180 (diff) | |
| parent | d7011f5b9dd3c88feb5cebad7d0b719ed6816ebd (diff) | |
| download | linux-1c82315a12144cde732636e259d39e3ee81b3c5b.tar.gz linux-1c82315a12144cde732636e259d39e3ee81b3c5b.tar.bz2 linux-1c82315a12144cde732636e259d39e3ee81b3c5b.zip | |
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>
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions