]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e59ddf fadcfa3)
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)
commite6e5fee1426bef07f4e6c3c76f48343c14207938
tree28f4ca26cf85e0971e9bb4927c439b36c2b93f51tree | snapshot
parent3e59ddff2b8dfe42b15520c4f8f2486bd9f9708ecommit | diff
parentfadcfa33b6319a5faf8af2287f08bf93a7f926b6commit | 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
Unnamed repository; edit this file 'description' to name the repository.