Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes

2026-11-13 07:31:07 +00:00 · 2011-02-27 15:40:36 +00:00 · 2011-02-27 15:40:36 +00:00 · 78240e3796
commit 78240e3796
parent 59a4f92a36 fa4704fee2
58 changed files with 728 additions and 775 deletions
--- a/Documentation/DocBook/filesystems.tmpl
+++ b/Documentation/DocBook/filesystems.tmpl
--- a/Documentation/hwmon/jc42
+++ b/Documentation/hwmon/jc42
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/3
+++ b/3
--- a/2
+++ b/2
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
--- a/arch/arm/mach-pxa/tosa-bt.c
+++ b/arch/arm/mach-pxa/tosa-bt.c
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
--- a/arch/arm/mach-s5p6442/include/mach/map.h
+++ b/arch/arm/mach-s5p6442/include/mach/map.h
--- a/arch/arm/mach-s5p64x0/include/mach/map.h
+++ b/arch/arm/mach-s5p64x0/include/mach/map.h
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
--- a/arch/arm/mach-s5pv310/include/mach/map.h
+++ b/arch/arm/mach-s5pv310/include/mach/map.h
--- a/arch/arm/plat-s5p/dev-uart.c
+++ b/arch/arm/plat-s5p/dev-uart.c
--- a/arch/arm/plat-samsung/dev-ts.c
+++ b/arch/arm/plat-samsung/dev-ts.c
--- a/arch/s390/boot/compressed/misc.c
+++ b/arch/s390/boot/compressed/misc.c
--- a/arch/s390/include/asm/atomic.h
+++ b/arch/s390/include/asm/atomic.h
--- a/arch/s390/include/asm/cache.h
+++ b/arch/s390/include/asm/cache.h
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/jc42.c
+++ b/drivers/hwmon/jc42.c
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
--- a/drivers/pcmcia/pxa2xx_colibri.c
+++ b/drivers/pcmcia/pxa2xx_colibri.c
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
--- a/drivers/platform/x86/asus_acpi.c
+++ b/drivers/platform/x86/asus_acpi.c
--- a/drivers/platform/x86/dell-laptop.c
+++ b/drivers/platform/x86/dell-laptop.c
--- a/drivers/platform/x86/intel_pmic_gpio.c
+++ b/drivers/platform/x86/intel_pmic_gpio.c
--- a/drivers/platform/x86/tc1100-wmi.c
+++ b/drivers/platform/x86/tc1100-wmi.c
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
--- a/fs/cifs/netmisc.c
+++ b/fs/cifs/netmisc.c
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
--- a/fs/ecryptfs/dentry.c
+++ b/fs/ecryptfs/dentry.c
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
--- a/sound/pci/au88x0/au88x0_core.c
+++ b/sound/pci/au88x0/au88x0_core.c
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
--- a/sound/usb/caiaq/audio.c
+++ b/sound/usb/caiaq/audio.c
--- a/sound/usb/caiaq/midi.c
+++ b/sound/usb/caiaq/midi.c