diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 22:24:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-09-20 22:24:58 +0200 |
| commit | ae2249e41af5b795e7869c2995c950b48d39cc35 (patch) | |
| tree | c9192dd408be0e22ff3b664901ed3838fc2a01d3 /Documentation/ioctl/ioctl-number.txt | |
| parent | 72787aa866bfa6bcbd259e7a39b2f9a2f412794e (diff) | |
| parent | 2520123382e97271e932377c83bca010c265be55 (diff) | |
| download | talos-op-linux-ae2249e41af5b795e7869c2995c950b48d39cc35.tar.gz talos-op-linux-ae2249e41af5b795e7869c2995c950b48d39cc35.zip | |
Merge branch 'samsung/board' into next/board
Diffstat (limited to 'Documentation/ioctl/ioctl-number.txt')
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 845a191004b1..54078ed96b37 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -319,4 +319,6 @@ Code Seq#(hex) Include File Comments <mailto:thomas@winischhofer.net> 0xF4 00-1F video/mbxfb.h mbxfb <mailto:raph@8d.com> +0xF6 all LTTng Linux Trace Toolkit Next Generation + <mailto:mathieu.desnoyers@efficios.com> 0xFD all linux/dm-ioctl.h |
