diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /Documentation/feature-removal-schedule.txt | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.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 46ece3fba6f9..65a1482457a8 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) |