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

[MTD] user-abi: Clean up trailing white spaces

2005-11-07 14:43:11 +01:00

jffs2-user.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Kbuild

[HEADERS] One line per header in Kbuild files to reduce conflicts

2006-09-19 12:43:58 +01:00

mtd-abi.h

[MTD] Unlock NOR flash automatically where necessary

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

mtd-user.h

[MTD] NAND Replace oobinfo by ecclayout

2006-05-29 15:06:50 +02:00

nftl-user.h

[MTD] user-abi: Clean up trailing white spaces

2005-11-07 14:43:11 +01:00