diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /include/linux | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'include/linux')
129 files changed, 3448 insertions, 872 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 7e09c5c1ed0..a2df7030d49 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
| @@ -135,6 +135,7 @@ header-y += posix_types.h | |||
| 135 | header-y += ppdev.h | 135 | header-y += ppdev.h |
| 136 | header-y += prctl.h | 136 | header-y += prctl.h |