Linus Torvalds e6e5fee142 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

2006-09-22 12:56:22 -07:00

..

inftl-user.h

…

jffs2-user.h

…

Kbuild

…

mtd-abi.h

[MTD] Unlock NOR flash automatically where necessary

2006-09-22 10:07:08 +01:00

mtd-user.h

…

nftl-user.h

…