diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:44:23 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:44:23 -0400 |
| commit | 03b883840c630c7b571690577809754739ac773f (patch) | |
| tree | aeec0581accf5e19360205e21dd25a220b4a0e54 /include/linux/Kbuild | |
| parent | 0d07a15bdb5a4ea6271b6e874d307c48151ef546 (diff) | |
| parent | c1c76743e98346eb052b707f0e054377a09441d1 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
dlm: linux/{dlm,dlm_device}.h: cleanup for userspace
dlm: common max length definitions
dlm: move plock code from gfs2
dlm: recover nodes that are removed and re-added
dlm: save master info after failed no-queue request
dlm: make dlm_print_rsb() static
dlm: match signedness between dlm_config_info and cluster_set
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 97a88b2b0c8..cbb5ccb27de 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -100,7 +100,7 @@ header-y += ixjuser.h | |||
| 100 | header-y += jffs2.h | 100 | header-y += jffs2.h |
| 101 | header-y += keyctl.h | 101 | header-y += keyctl.h |
| 102 | header-y += limits.h | 102 | header-y += limits.h |
| 103 | header-y += lock_dlm_plock.h | 103 | header-y += dlm_plock.h |
| 104 | header-y += magic.h | 104 | header-y += magic.h |
| 105 | header-y += major.h | 105 | header-y += major.h |
| 106 | header-y += matroxfb.h | 106 | header-y += matroxfb.h |