Merge branch 'for-2.6.38/core' into for-next

2026-10-14 05:55:17 +00:00 · 2010-12-16 17:54:32 +01:00 · 2010-12-16 17:54:32 +01:00 · c4ffa14684
commit c4ffa14684
parent 82cc2e4b51 e4ea0c16a8
96 changed files with 1311 additions and 1453 deletions
--- a/Documentation/arm/OMAP/DSS
+++ b/Documentation/arm/OMAP/DSS
--- a/Documentation/cgroups/blkio-controller.txt
+++ b/Documentation/cgroups/blkio-controller.txt
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/5
+++ b/5
--- a/2
+++ b/2
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
--- a/arch/arm/mach-omap1/include/mach/camera.h
+++ b/arch/arm/mach-omap1/include/mach/camera.h
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
--- a/block/blk-core.c
+++ b/block/blk-core.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/ioctl.c
+++ b/block/ioctl.c
--- 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/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
--- a/drivers/hwmon/amc6821.c
+++ b/drivers/hwmon/amc6821.c
--- a/drivers/hwmon/lm93.c
+++ b/drivers/hwmon/lm93.c
--- a/drivers/hwmon/lm95241.c
+++ b/drivers/hwmon/lm95241.c
--- a/drivers/hwmon/max6650.c
+++ b/drivers/hwmon/max6650.c
--- a/drivers/hwmon/w83795.c
+++ b/drivers/hwmon/w83795.c
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
--- a/drivers/media/video/imx074.c
+++ b/drivers/media/video/imx074.c
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
--- a/drivers/misc/apds9802als.c
+++ b/drivers/misc/apds9802als.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
--- a/drivers/s390/block/dasd_genhd.c
+++ b/drivers/s390/block/dasd_genhd.c
--- a/drivers/sh/clk/core.c
+++ b/drivers/sh/clk/core.c
--- a/drivers/sh/intc/virq.c
+++ b/drivers/sh/intc/virq.c
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
--- a/drivers/usb/gadget/storage_common.c
+++ b/drivers/usb/gadget/storage_common.c
--- a/drivers/video/omap2/vram.c
+++ b/drivers/video/omap2/vram.c
--- a/drivers/video/riva/rivafb-i2c.c
+++ b/drivers/video/riva/rivafb-i2c.c
--- a/drivers/video/sh_mobile_hdmi.c
+++ b/drivers/video/sh_mobile_hdmi.c
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/gfs2/export.c
+++ b/fs/gfs2/export.c
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
--- a/fs/gfs2/inode.h
+++ b/fs/gfs2/inode.h
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
--- a/fs/logfs/dev_bdev.c
+++ b/fs/logfs/dev_bdev.c
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
--- a/fs/super.c
+++ b/fs/super.c
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fsl-diu-fb.h
+++ b/include/linux/fsl-diu-fb.h
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
--- a/kernel/printk.c
+++ b/kernel/printk.c
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
--- a/mm/slub.c
+++ b/mm/slub.c
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
--- a/security/capability.c
+++ b/security/capability.c
--- a/security/commoncap.c
+++ b/security/commoncap.c
--- a/security/security.c
+++ b/security/security.c
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c