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/sunrpc | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 (diff) | |
parent | [HEADERS] One line per header in Kbuild files to reduce conflicts (diff) | |
download | linux-dev-e6e5fee1426bef07f4e6c3c76f48343c14207938.tar.xz linux-dev-e6e5fee1426bef07f4e6c3c76f48343c14207938.zip |
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/sunrpc')
-rw-r--r-- | include/linux/sunrpc/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild index 0d1d768a27bf..fb438f158eee 100644 --- a/include/linux/sunrpc/Kbuild +++ b/include/linux/sunrpc/Kbuild @@ -1 +1 @@ -unifdef-y := debug.h +unifdef-y += debug.h |