diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 05:39:39 -0400 |
| commit | 49997d75152b3d23c53b0fa730599f2f74c92c65 (patch) | |
| tree | 46e93126170d02cfec9505172e545732c1b69656 /Documentation/feature-removal-schedule.txt | |
| parent | a0c80b80e0fb48129e4e9d6a9ede914f9ff1850d (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/powerpc/booting-without-of.txt
drivers/atm/Makefile
drivers/net/fs_enet/fs_enet-main.c
drivers/pci/pci-acpi.c
net/8021q/vlan.c
net/iucv/iucv.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index db300e09c9ac..86334b6f8238 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -222,13 +222,6 @@ Who: Thomas Gleixner <tglx@linutronix.de> | |||
| 222 | 222 | ||
| 223 | --------------------------- | 223 | --------------------------- |
| 224 | 224 | ||
| 225 | What: i2c-i810, i2c-prosavage and i2c-savage4 | ||
| 226 | When: May 2008 | ||
| 227 | Why: These drivers are superseded by i810fb, intelfb and savagefb. | ||
| 228 | Who: Jean Delvare <khali@linux-fr.org> | ||
| 229 | |||
| 230 | --------------------------- | ||
| 231 | |||
| 232 | What (Why): | 225 | What (Why): |
| 233 | - include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files | 226 | - include/linux/netfilter_ipv4/ipt_TOS.h ipt_tos.h header files |
| 234 | (superseded by xt_TOS/xt_tos target & match) | 227 | (superseded by xt_TOS/xt_tos target & match) |