Can you merge the following branch into the mtd 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-mtd-20121009 for you to fetch changes up to 4a8e43feeac7996b8de2d5b2823e316917493df4: UAPI: (Scripted) Disintegrate include/mtd (2012-10-09 09:49:09 +0100) ---------------------------------------------------------------- UAPI Disintegration 2012-10-09 ---------------------------------------------------------------- David Howells (1): UAPI: (Scripted) Disintegrate include/mtd include/mtd/Kbuild | 5 ----- include/uapi/mtd/Kbuild | 5 +++++ include/{ => uapi}/mtd/inftl-user.h | 0 include/{ => uapi}/mtd/mtd-abi.h | 0 include/{ => uapi}/mtd/mtd-user.h | 0 include/{ => uapi}/mtd/nftl-user.h | 0 include/{ => uapi}/mtd/ubi-user.h | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename include/{ => uapi}/mtd/inftl-user.h (100%) rename include/{ => uapi}/mtd/mtd-abi.h (100%) rename include/{ => uapi}/mtd/mtd-user.h (100%) rename include/{ => uapi}/mtd/nftl-user.h (100%) rename include/{ => uapi}/mtd/ubi-user.h (100%) . -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/