Merge remote-tracking branch 'origin' into spi/merge

2026-11-13 07:31:07 +00:00 · 2011-06-08 14:37:22 -06:00 · 2011-06-08 14:37:22 -06:00 · b6336ca298
commit b6336ca298
parent a80fd9db0e 59c5f46fbe
154 changed files with 1561 additions and 1043 deletions
--- a/2
+++ b/2
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
--- a/arch/arm/mach-tegra/board-harmony-power.c
+++ b/arch/arm/mach-tegra/board-harmony-power.c
--- a/arch/arm/mach-tegra/board-harmony.h
+++ b/arch/arm/mach-tegra/board-harmony.h
--- a/arch/blackfin/lib/strncpy.S
+++ b/arch/blackfin/lib/strncpy.S
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
--- a/arch/sh/include/asm/pgtable.h
+++ b/arch/sh/include/asm/pgtable.h
--- a/arch/sh/include/asm/ptrace.h
+++ b/arch/sh/include/asm/ptrace.h
--- a/arch/sh/include/asm/tlb.h
+++ b/arch/sh/include/asm/tlb.h
--- a/arch/sh/include/cpu-sh4/cpu/sh7722.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7722.h
--- a/arch/sh/include/cpu-sh4/cpu/sh7724.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7724.h
--- a/arch/sh/include/cpu-sh4/cpu/sh7757.h
+++ b/arch/sh/include/cpu-sh4/cpu/sh7757.h
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
--- a/drivers/block/xen-blkback/blkback.c
+++ b/drivers/block/xen-blkback/blkback.c
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
--- a/drivers/clocksource/sh_tmu.c
+++ b/drivers/clocksource/sh_tmu.c
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
--- a/drivers/hwmon/max6642.c
+++ b/drivers/hwmon/max6642.c
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
--- a/drivers/net/caif/caif_serial.c
+++ b/drivers/net/caif/caif_serial.c
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
--- a/drivers/net/can/slcan.c
+++ b/drivers/net/can/slcan.c
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
--- a/drivers/net/ks8842.c
+++ b/drivers/net/ks8842.c
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
--- a/drivers/net/ppp_async.c
+++ b/drivers/net/ppp_async.c
--- a/drivers/net/ppp_synctty.c
+++ b/drivers/net/ppp_synctty.c
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
--- a/drivers/net/wireless/ath/ath9k/ar9002_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_calib.c
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
--- a/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965-lib.c
--- a/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ b/drivers/net/wireless/iwlegacy/iwl-4965.c
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
--- a/drivers/net/wireless/iwlwifi/iwl-agn.h
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.h
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
--- a/drivers/net/wireless/mwifiex/sdio.h
+++ b/drivers/net/wireless/mwifiex/sdio.h
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
--- a/drivers/net/wireless/wl12xx/scan.c
+++ b/drivers/net/wireless/wl12xx/scan.c
--- a/drivers/net/wireless/wl12xx/scan.h
+++ b/drivers/net/wireless/wl12xx/scan.h
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
--- a/drivers/tty/vt/selection.c
+++ b/drivers/tty/vt/selection.c
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
--- a/Show more
+++ b/Show more