Merge git://git.infradead.org/~dwmw2/hdroneline

* git://git.infradead.org/~dwmw2/hdroneline:
  [HEADERS] One line per header in Kbuild files to reduce conflicts

Manual (trivial) conflict resolution in include/asm-s390/Kbuild

diff --cc include/asm-s390/Kbuild
index 979145026a2933421f830da8a0e262d69edc230d,14158a4a9c87d2f6d835bc904be51af57a8d58e6..088969d55e72ef04947d62391c4198a6f3e95936
--- 1/include/asm-s390/Kbuild
--- 2/include/asm-s390/Kbuild
+++ b/include/asm-s390/Kbuild
@@@ -1,4 -1,11 +1,12 @@@
  include include/asm-generic/Kbuild.asm
  
- unifdef-y += cmb.h debug.h
- header-y += dasd.h monwriter.h qeth.h tape390.h ucontext.h vtoc.h z90crypt.h
+ header-y += dasd.h
++header-y += monwriter.h
+ header-y += qeth.h
+ header-y += tape390.h
+ header-y += ucontext.h
+ header-y += vtoc.h
+ header-y += z90crypt.h
+ 
+ unifdef-y += cmb.h
+ unifdef-y += debug.h