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:
@@ -1 +1 @@
|
||||
unifdef-y := debug.h
|
||||
unifdef-y += debug.h
|
||||
|
Reference in New Issue
Block a user