diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 12:56:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-22 12:56:22 -0700 |
commit | e6e5fee1426bef07f4e6c3c76f48343c14207938 (patch) | |
tree | 28f4ca26cf85e0971e9bb4927c439b36c2b93f51 /include/linux/raid/Kbuild | |
parent | 3e59ddff2b8dfe42b15520c4f8f2486bd9f9708e (diff) | |
parent | fadcfa33b6319a5faf8af2287f08bf93a7f926b6 (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
Diffstat (limited to 'include/linux/raid/Kbuild')
-rw-r--r-- | include/linux/raid/Kbuild | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/raid/Kbuild b/include/linux/raid/Kbuild index 73fa27a8d55..2415a64c5e5 100644 --- a/include/linux/raid/Kbuild +++ b/include/linux/raid/Kbuild @@ -1 +1,2 @@ -header-y += md_p.h md_u.h +header-y += md_p.h +header-y += md_u.h |