From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 22 Sep 2006 19:56:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/hdroneline
X-Git-Tag: v2.6.19-rc1~1295
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e5fee1426bef07f4e6c3c76f48343c14207938;p=pandora-kernel.git

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
---

e6e5fee1426bef07f4e6c3c76f48343c14207938
Reading git-diff-tree failed