Merge branch 'imx-features-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/devel

Conflicts: arch/arm/mach-mx5/clock-mx51-mx53.c arch/arm/mach-mx5/devices-imx53.h
2026-11-15 19:56:03 +00:00 · 2011-10-20 15:14:25 +02:00 · 2011-10-20 15:14:25 +02:00 · b4cbb8a4e6
commit b4cbb8a4e6
parent 526b264163 c5d7a9230e
993 changed files with 32973 additions and 29228 deletions
--- a/drivers/acpi/acpica/acconfig.h
+++ b/drivers/acpi/acpica/acconfig.h
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
--- a/drivers/block/xen-blkback/common.h
+++ b/drivers/block/xen-blkback/common.h
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
--- a/drivers/bluetooth/btwilink.c
+++ b/drivers/bluetooth/btwilink.c
--- a/drivers/char/msm_smd_pkt.c
+++ b/drivers/char/msm_smd_pkt.c
--- a/drivers/char/tpm/Kconfig
+++ b/drivers/char/tpm/Kconfig
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
--- a/drivers/cpufreq/pcc-cpufreq.c
+++ b/drivers/cpufreq/pcc-cpufreq.c
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
--- a/drivers/gpu/drm/nouveau/nv50_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv50_crtc.c
--- a/drivers/gpu/drm/radeon/atombios_dp.c
+++ b/drivers/gpu/drm/radeon/atombios_dp.c
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
--- a/drivers/gpu/drm/radeon/ni.c
+++ b/drivers/gpu/drm/radeon/ni.c
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
--- a/drivers/gpu/drm/radeon/r200.c
+++ b/drivers/gpu/drm/radeon/r200.c
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
--- a/drivers/gpu/drm/radeon/radeon_asic.h
+++ b/drivers/gpu/drm/radeon/radeon_asic.h
--- a/drivers/gpu/drm/radeon/radeon_clocks.c
+++ b/drivers/gpu/drm/radeon/radeon_clocks.c
--- a/drivers/gpu/drm/radeon/radeon_combios.c
+++ b/drivers/gpu/drm/radeon/radeon_combios.c
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
--- a/drivers/gpu/drm/radeon/radeon_test.c
+++ b/drivers/gpu/drm/radeon/radeon_test.c
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
--- a/drivers/gpu/drm/ttm/ttm_bo_util.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_util.c
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
--- a/drivers/hid/hid-magicmouse.c
+++ b/drivers/hid/hid-magicmouse.c
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
--- a/drivers/hid/hid-wiimote.c
+++ b/drivers/hid/hid-wiimote.c
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
--- a/drivers/hwmon/ds620.c
+++ b/drivers/hwmon/ds620.c
--- a/drivers/hwmon/i5k_amb.c
+++ b/drivers/hwmon/i5k_amb.c
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
--- a/drivers/hwmon/ntc_thermistor.c
+++ b/drivers/hwmon/ntc_thermistor.c
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
--- a/drivers/hwmon/pmbus/ucd9000.c
+++ b/drivers/hwmon/pmbus/ucd9000.c
--- a/drivers/hwmon/pmbus/ucd9200.c
+++ b/drivers/hwmon/pmbus/ucd9200.c
--- a/drivers/hwmon/w83791d.c
+++ b/drivers/hwmon/w83791d.c
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
--- a/drivers/i2c/busses/i2c-pxa-pci.c
+++ b/drivers/i2c/busses/i2c-pxa-pci.c
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
--- a/drivers/input/misc/ad714x-i2c.c
+++ b/drivers/input/misc/ad714x-i2c.c
--- a/drivers/input/misc/ad714x-spi.c
+++ b/drivers/input/misc/ad714x-spi.c
--- a/drivers/input/misc/ad714x.c
+++ b/drivers/input/misc/ad714x.c
--- a/drivers/input/misc/ad714x.h
+++ b/drivers/input/misc/ad714x.h
--- a/drivers/input/misc/cm109.c
+++ b/drivers/input/misc/cm109.c
--- a/drivers/input/misc/mma8450.c
+++ b/drivers/input/misc/mma8450.c
--- a/drivers/input/misc/mpu3050.c
+++ b/drivers/input/misc/mpu3050.c
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
--- a/drivers/input/touchscreen/max11801_ts.c
+++ b/drivers/input/touchscreen/max11801_ts.c
--- a/drivers/input/touchscreen/tnetv107x-ts.c
+++ b/drivers/input/touchscreen/tnetv107x-ts.c
--- a/drivers/input/touchscreen/wacom_w8001.c
+++ b/drivers/input/touchscreen/wacom_w8001.c
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
--- a/Show more
+++ b/Show more