diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 17:09:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 17:09:35 -0500 |
| commit | 5bdc22a56549e7983c6b443298672641952ea035 (patch) | |
| tree | fbfd4e7453e4fd23dfef826d4610ed2aae47b36c /Documentation/feature-removal-schedule.txt | |
| parent | b6f4098897f30b7ea90a1c1edf35e9b20a9d828a (diff) | |
| parent | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/sched/sch_hfsc.c
net/sched/sch_htb.c
net/sched/sch_tbf.c
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 05b248aa91f1..ccb6048415b2 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -357,14 +357,6 @@ Who: Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com> | |||
| 357 | 357 | ||
| 358 | ----------------------------- | 358 | ----------------------------- |
| 359 | 359 | ||
| 360 | What: __do_IRQ all in one fits nothing interrupt handler | ||
| 361 | When: 2.6.32 | ||
| 362 | Why: __do_IRQ was kept for easy migration to the type flow handlers. | ||
| 363 | More than two years of migration time is enough. | ||
| 364 | Who: Thomas Gleixner <tglx@linutronix.de> | ||
| 365 | |||
| 366 | ----------------------------- | ||
| 367 | |||
| 368 | What: fakephp and associated sysfs files in /sys/bus/pci/slots/ | 360 | What: fakephp and associated sysfs files in /sys/bus/pci/slots/ |
| 369 | When: 2011 | 361 | When: 2011 |
| 370 | Why: In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to | 362 | Why: In 2.6.27, the semantics of /sys/bus/pci/slots was redefined to |