diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:05:45 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-02-20 14:05:45 -0500 |
| commit | b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b (patch) | |
| tree | de7cf0825605aa6acf33a8d107003efd7aedbe72 /include/linux/btrfs.h | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
| parent | 272d26d0ad8c0e326689f2fa3cdc6a5fcc8e74e0 (diff) | |
| download | op-kernel-dev-b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b.zip op-kernel-dev-b2c6b3e0611c58fbeb6b9c0892b6249f7bdfaf6b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-linus-3.9
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'include/linux/btrfs.h')
| -rw-r--r-- | include/linux/btrfs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/btrfs.h b/include/linux/btrfs.h new file mode 100644 index 0000000..22d7991 --- /dev/null +++ b/include/linux/btrfs.h @@ -0,0 +1,6 @@ +#ifndef _LINUX_BTRFS_H +#define _LINUX_BTRFS_H + +#include <uapi/linux/btrfs.h> + +#endif /* _LINUX_BTRFS_H */ |
