diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
| commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
| tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /include/uapi/linux/magic.h | |
| parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'include/uapi/linux/magic.h')
| -rw-r--r-- | include/uapi/linux/magic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 2944278a8ba7..77c60311a6c6 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h | |||
| @@ -71,6 +71,6 @@ | |||
| 71 | #define USBDEVICE_SUPER_MAGIC 0x9fa2 | 71 | #define USBDEVICE_SUPER_MAGIC 0x9fa2 |
| 72 | #define MTD_INODE_FS_MAGIC 0x11307854 | 72 | #define MTD_INODE_FS_MAGIC 0x11307854 |
| 73 | #define ANON_INODE_FS_MAGIC 0x09041934 | 73 | #define ANON_INODE_FS_MAGIC 0x09041934 |
| 74 | 74 | #define BTRFS_TEST_MAGIC 0x73727279 | |
| 75 | 75 | ||
| 76 | #endif /* __LINUX_MAGIC_H__ */ | 76 | #endif /* __LINUX_MAGIC_H__ */ |