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
This commit is contained in:
Linus Torvalds
2006-09-22 12:56:22 -07:00
29 changed files with 722 additions and 159 deletions

View File

@@ -1 +1 @@
unifdef-y := debug.h
unifdef-y += debug.h