Can you merge the following branch into the media tree please. This is to complete part of the Userspace API (UAPI) disintegration for which the preparatory patches were pulled recently. After these patches, userspace headers will be segregated into: include/uapi/linux/.../foo.h for the userspace interface stuff, and: include/linux/.../foo.h for the strictly kernel internal stuff. --- The following changes since commit 9e2d8656f5e8aa214e66b462680cf86b210b74a8: Merge branch 'akpm' (Andrew's patch-bomb) (2012-10-09 16:23:15 +0900) are available in the git repository at: git://git.infradead.org/users/dhowells/linux-headers.git tags/disintegrate-media-20121009 for you to fetch changes up to 1c436decd49665be131887b08d172a7989cdceee: UAPI: (Scripted) Disintegrate include/linux/dvb (2012-10-09 09:48:42 +0100) ---------------------------------------------------------------- UAPI Disintegration 2012-10-09 ---------------------------------------------------------------- David Howells (1): UAPI: (Scripted) Disintegrate include/linux/dvb include/linux/dvb/Kbuild | 8 - include/linux/dvb/dmx.h | 130 +-------------- include/linux/dvb/video.h | 249 +---------------------------- include/uapi/linux/dvb/Kbuild | 8 + include/{ => uapi}/linux/dvb/audio.h | 0 include/{ => uapi}/linux/dvb/ca.h | 0 include/uapi/linux/dvb/dmx.h | 155 ++++++++++++++++++ include/{ => uapi}/linux/dvb/frontend.h | 0 include/{ => uapi}/linux/dvb/net.h | 0 include/{ => uapi}/linux/dvb/osd.h | 0 include/{ => uapi}/linux/dvb/version.h | 0 include/uapi/linux/dvb/video.h | 274 ++++++++++++++++++++++++++++++++ 12 files changed, 439 insertions(+), 385 deletions(-) rename include/{ => uapi}/linux/dvb/audio.h (100%) rename include/{ => uapi}/linux/dvb/ca.h (100%) create mode 100644 include/uapi/linux/dvb/dmx.h rename include/{ => uapi}/linux/dvb/frontend.h (100%) rename include/{ => uapi}/linux/dvb/net.h (100%) rename include/{ => uapi}/linux/dvb/osd.h (100%) rename include/{ => uapi}/linux/dvb/version.h (100%) create mode 100644 include/uapi/linux/dvb/video.h . -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html