Merge tag 'disintegrate-tty-20121009' of...

Merge tag 'disintegrate-tty-20121009' of git://git.infradead.org/users/dhowells/linux-headers into tty-linus UAPI Disintegration 2012-10-09

Merge tag 'disintegrate-tty-20121009' of...
Merge tag 'disintegrate-tty-20121009' of git://git.infradead.org/users/dhowells/linux-headers into tty-linus UAPI Disintegration 2012-10-09
367ff459 · Greg Kroah-Hartman · 3e5bde8e · 5217c129 · 367ff459 · 367ff459
Commit 367ff459 authored Oct 17, 2012 by Greg Kroah-Hartman
Showing with 1 addition and 1 deletion

include/linux/hsi/Kbuild include/linux/hsi/Kbuild +0 -1

include/uapi/linux/hsi/Kbuild include/uapi/linux/hsi/Kbuild +1 -0

include/uapi/linux/hsi/hsi_char.h include/uapi/linux/hsi/hsi_char.h +0 -0

No files found.
--- a/include/linux/hsi/Kbuild
+++ b/include/linux/hsi/Kbuild
-header-y += hsi_char.h
--- a/include/uapi/linux/hsi/Kbuild
+++ b/include/uapi/linux/hsi/Kbuild
 # UAPI Header export list
+header-y += hsi_char.h
--- a/include/linux/hsi/hsi_char.h
+++ b/include/linux/hsi/hsi_char.h