]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71d5158 ee61648)
Merge git://git.infradead.org/~dwmw2/hdroneline
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 22 Sep 2006 19:56:22 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 22 Sep 2006 19:56:22 +0000 (12:56 -0700)
commit4368dccbcb00ddb8b79516b3c18499537395171d
tree28f4ca26cf85e0971e9bb4927c439b36c2b93f51tree | snapshot
parent71d5158d3c211414a27f573344cd81661020669ccommit | diff
parentee616489873f1fe366cd2edb81eec6be6c0e43a5commit | diff
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
include/asm-s390/Kbuild diff1 | diff2 | blob | history
Linux Kernel Source Tree.