diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-21 11:46:04 -0400 |
| commit | 513b046c96cc2fbce730a3474f6f7ff0c4fdd05c (patch) | |
| tree | e8006368b6f643067486f92405a404757807d6da /include/linux | |
| parent | 82810b7b6cc7a74c68881a13b0eb66c7a6370fcc (diff) | |
| parent | c7a3bd177f248d01ee18a01d22048c80e071c331 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux')
127 files changed, 5422 insertions, 1276 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index f7a52e19b4be..a1155a2beb32 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -46,6 +46,7 @@ header-y += coff.h | |||
| 46 | header-y += comstats.h | 46 | header-y += comstats.h |
| 47 | header-y += consolemap.h | 47 | header-y += consolemap.h |
| 48 | header-y += cycx_cfm.h | 48 | header-y += cycx_cfm.h |
| 49 | header-y += dlm_device.h | ||
| 49 | header-y += dm-ioctl.h | 50 | header-y += dm-ioctl.h |
| 50 | header-y += dn.h | ||