Merge branches 'clks' and 'pnx' into devel

2026-11-13 07:31:07 +00:00 · 2010-02-25 22:10:38 +00:00 · 2010-02-25 22:10:38 +00:00 · 9f33be2c3a
commit 9f33be2c3a
parent 2741ecb4ce eed18b5fa4
146 changed files with 1466 additions and 1156 deletions
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_pdc.c
+++ b/drivers/acpi/processor_pdc.c
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/block/drbd/Kconfig
+++ b/drivers/block/drbd/Kconfig
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
--- a/drivers/serial/8250_pnp.c
+++ b/drivers/serial/8250_pnp.c
--- a/drivers/serial/imx.c
+++ b/drivers/serial/imx.c
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
--- a/drivers/staging/asus_oled/asus_oled.c
+++ b/drivers/staging/asus_oled/asus_oled.c
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/drivers/staging/et131x/et1310_rx.c
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
--- a/drivers/usb/core/sysfs.c
+++ b/drivers/usb/core/sysfs.c
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
--- a/drivers/usb/host/ehci-q.c
+++ b/drivers/usb/host/ehci-q.c
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c