![]() | |||||||||||||
Messages in this thread |
These patches are just attempts to merge code from the ubuntu kernel tree. This is most of the differences between our tree and stock code (not necessarily all differences, since we do have a lot of external drivers pulled in). You can pull from: master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6.git ubuntu-fixes Or: rsync://rsync.kernel.org/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6.git ubuntu-fixes diffstat: arch/i386/kernel/acpi/boot.c | 10 ++ arch/i386/kernel/acpi/boot.c | 10 ++ arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 10 ++ arch/i386/kernel/cpu/cpufreq/powernow-k7.c | 11 +- arch/i386/kernel/reboot.c | 9 ++ arch/i386/pci/fixup.c | 8 +- drivers/acpi/asus_acpi.c | 11 +- drivers/acpi/processor_idle.c | 68 +++++++++++++---- drivers/char/sonypi.c | 46 +++++++++++- drivers/input/misc/wistron_btns.c | 20 ++++- drivers/input/serio/i8042-x86ia64io.h | 9 ++ drivers/macintosh/therm_adt746x.c | 40 ++++++---- drivers/macintosh/via-pmu.c | 5 + drivers/net/irda/nsc-ircc.c | 103 +++++++++++++++++++++++++-- kernel/workqueue.c | 6 + scripts/kconfig/conf.c | 19 ++++ 16 files changed, 323 insertions(+), 62 deletions(-) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | ||||||||||||
| Last update: 2006-01-04 22:02 [from the cache] ©2003-2008 | |||||||||||||