diff --git a/[refs] b/[refs]
index 957d41c83646..25e46eb00d5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: 6406e311c61997b8e19aff6ac2c7179d10aed472
+refs/heads/master: fdeae29005aae41837e70c395c8290a8297ca677
diff --git a/trunk/Documentation/DocBook/media/dvb/ca.xml b/trunk/Documentation/DocBook/media/dvb/ca.xml
index 5c4adb44b1c1..85eaf4fe2931 100644
--- a/trunk/Documentation/DocBook/media/dvb/ca.xml
+++ b/trunk/Documentation/DocBook/media/dvb/ca.xml
@@ -226,4 +226,357 @@ typedef struct ca_pid {
+
+CA_RESET
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_RESET);
+
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_RESET for this command.
+
+
+&return-value-dvb;
+
+
+CA_GET_CAP
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_GET_CAP,
+ ca_caps_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_GET_CAP for this command.
+
+
+ca_caps_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+
+CA_GET_SLOT_INFO
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_GET_SLOT_INFO,
+ ca_slot_info_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_GET_SLOT_INFO for this command.
+
+
+ca_slot_info_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+
+CA_GET_DESCR_INFO
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_GET_DESCR_INFO,
+ ca_descr_info_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_GET_DESCR_INFO for this command.
+
+
+ca_descr_info_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+
+CA_GET_MSG
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_GET_MSG,
+ ca_msg_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_GET_MSG for this command.
+
+
+ca_msg_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+
+CA_SEND_MSG
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_SEND_MSG,
+ ca_msg_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_SEND_MSG for this command.
+
+
+ca_msg_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+
+CA_SET_DESCR
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_SET_DESCR,
+ ca_descr_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_SET_DESCR for this command.
+
+
+ca_descr_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+
+CA_SET_PID
+DESCRIPTION
+
+
+This ioctl is undocumented. Documentation is welcome.
+
+
+SYNOPSIS
+
+
+int ioctl(fd, int request = CA_SET_PID,
+ ca_pid_t *);
+
+
+PARAMETERS
+
+
+int fd
+
+File descriptor returned by a previous call to open().
+
+
+int request
+
+Equals CA_SET_PID for this command.
+
+
+ca_pid_t *
+
+
+Undocumented.
+
+
+&return-value-dvb;
+
+