From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 22 Sep 2006 19:56:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/hdroneline
X-Git-Tag: v2.6.19-rc1~1295
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e6e5fee1426bef07f4e6c3c76f48343c14207938;p=~emulex%2Finfiniband.git

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
---

e6e5fee1426bef07f4e6c3c76f48343c14207938
diff --cc include/asm-s390/Kbuild
index 979145026a2,14158a4a9c8..088969d55e7
--- a/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