diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-22 21:22:42 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-22 21:22:42 -0400 |
| commit | 76fef2b6bffa13ad7ccd54c0493b053295721b9a (patch) | |
| tree | f4509477d413398b7155fb3c35453ab26bd81bce /Documentation | |
| parent | 817bc4db7794d6dc6594265ddea88d2b839cf2f8 (diff) | |
| parent | ef8500457b29eed13d03ff19af36d810308e57b7 (diff) | |
Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Conflicts:
drivers/s390/net/qeth_main.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 9119d037c2ce..1d171fe5fcdc 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -213,14 +213,6 @@ Who: linuxppc-dev@ozlabs.org | |||
| 213 | 213 | ||
| 214 | --------------------------- | 214 | --------------------------- |
| 215 | 215 | ||
| 216 | What: sk98lin network driver | ||
| 217 | When: Feburary 2008 | ||
| 218 | Why: In kernel tree version of driver is unmaintained. Sk98lin driver | ||
| 219 | replaced by the skge driver. | ||
| 220 | Who: Stephen Hemminger <shemminger@linux-foundation.org> | ||
| 221 | |||
| 222 | --------------------------- | ||
| 223 | |||
| 224 | What: i386/x86_64 bzImage symlinks | 216 | What: i386/x86_64 bzImage symlinks |
| 225 | When: April 2008 | 217 | When: April 2008 |
| 226 | 218 | ||
| @@ -231,8 +223,6 @@ Who: Thomas Gleixner <tglx@linutronix.de> | |||
| 231 | 223 | ||
| 232 | --------------------------- | 224 | --------------------------- |
| 233 | 225 | ||
| 234 | --------------------------- | ||
| 235 | |||
| 236 | What: i2c-i810, i2c-prosavage and i2c-savage4 | 226 | What: i2c-i810, i2c-prosavage and i2c-savage4 |
| 237 | When: May 2008 | 227 | When: May 2008 |
| 238 | Why: These drivers are superseded by i810fb, intelfb and savagefb. | 228 | Why: These drivers are superseded by i810fb, intelfb and savagefb. |