include/asm-s390/Kbuild · e6e5fee1426bef07f4e6c3c76f48343c14207938 · Kirill Smelkov / linux

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

Linus Torvalds authored Sep 22, 2006

* 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

e6e5fee1

Kbuild 230 Bytes

Replace Kbuild