diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 4082 |
1 files changed, 4082 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..d1d032e9fd8f --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4082 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 57d5488 Linux 2.6.34-rc1 +Merging origin/master +$ git merge origin/master +Updating 57d5488..522dba7 +Fast-forward + drivers/pci/pci.c | 2 ++ + fs/btrfs/disk-io.c | 4 ++-- + fs/btrfs/extent_io.c | 4 ++-- + fs/btrfs/extent_map.c | 2 +- + fs/btrfs/free-space-cache.c | 4 ++-- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/ref-cache.h | 2 +- + fs/btrfs/relocation.c | 4 ++-- + fs/btrfs/super.c | 5 +++-- + fs/btrfs/transaction.c | 2 +- + 10 files changed, 17 insertions(+), 14 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + drivers/block/pktcdvd.c | 17 +++++++++++++-- + drivers/i2c/busses/i2c-xiic.c | 1 + + drivers/i2c/i2c-smbus.c | 5 ++- + fs/compat_ioctl.c | 3 -- + include/linux/i2c-xiic.h | 43 +++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 61 insertions(+), 8 deletions(-) + create mode 100644 include/linux/i2c-xiic.h +Merging arm-current/master +$ git merge arm-current/master +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/boot/compressed/vmlinux.lds.in +Merge made by recursive. + arch/arm/boot/compressed/head.S | 50 ++++++++++++-------------- + arch/arm/boot/compressed/vmlinux.lds.in | 3 ++ + arch/arm/kernel/unwind.c | 4 ++- + arch/arm/mach-ux500/include/mach/hardware.h | 8 ++-- + drivers/mtd/maps/pismo.c | 2 +- + 5 files changed, 34 insertions(+), 33 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/sigcontext.h | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Merge made by recursive. + arch/powerpc/boot/dts/gef_ppc9a.dts | 4 +- + arch/powerpc/boot/dts/gef_sbc310.dts | 4 +- + arch/powerpc/boot/dts/gef_sbc610.dts | 4 +- + arch/powerpc/include/asm/paca.h | 18 +- + arch/powerpc/include/asm/perf_event.h | 109 +---- + arch/powerpc/include/asm/perf_event_fsl_emb.h | 50 ++ + arch/powerpc/include/asm/perf_event_server.h | 110 ++++ + arch/powerpc/include/asm/reg_booke.h | 4 +- + arch/powerpc/include/asm/reg_fsl_emb.h | 2 +- + arch/powerpc/kernel/Makefile | 7 +- + arch/powerpc/kernel/cputable.c | 2 +- + arch/powerpc/kernel/e500-pmu.c | 129 +++++ + arch/powerpc/kernel/head_64.S | 17 +- + arch/powerpc/kernel/paca.c | 93 +++- + arch/powerpc/kernel/perf_event_fsl_emb.c | 654 +++++++++++++++++++++++ + arch/powerpc/kernel/prom.c | 3 + + arch/powerpc/kernel/ptrace.c | 12 +- + arch/powerpc/kernel/setup-common.c | 3 + + arch/powerpc/kernel/setup_64.c | 12 +- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 10 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 34 +- + arch/powerpc/platforms/86xx/Kconfig | 12 +- + arch/powerpc/platforms/86xx/gef_gpio.c | 10 +- + arch/powerpc/platforms/86xx/gef_pic.c | 20 +- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 12 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 12 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 12 +- + arch/powerpc/platforms/Kconfig.cputype | 10 + + arch/powerpc/platforms/iseries/exception.S | 25 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 42 +- + arch/powerpc/platforms/pseries/offline_states.h | 23 +- + arch/powerpc/platforms/pseries/plpar_wrappers.h | 4 +- + arch/powerpc/platforms/pseries/xics.c | 7 +- + arch/powerpc/sysdev/cpm2_pic.h | 2 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 10 +- + drivers/macintosh/therm_pm72.c | 30 +- + drivers/macintosh/therm_pm72.h | 2 +- + 37 files changed, 1250 insertions(+), 264 deletions(-) + create mode 100644 arch/powerpc/include/asm/perf_event_fsl_emb.h + create mode 100644 arch/powerpc/include/asm/perf_event_server.h + create mode 100644 arch/powerpc/kernel/e500-pmu.c + create mode 100644 arch/powerpc/kernel/perf_event_fsl_emb.c +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Auto-merging drivers/net/cxgb3/cxgb3_main.c +Auto-merging drivers/net/gianfar.c +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Removing firmware/bnx2x-e1-5.2.7.0.fw.ihex +Removing firmware/bnx2x-e1h-5.2.7.0.fw.ihex +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + MAINTAINERS | 21 +- + drivers/net/arm/ks8695net.c | 2 +- + drivers/net/benet/be.h | 5 - + drivers/net/benet/be_cmds.c | 6 - + drivers/net/benet/be_hw.h | 5 +- + drivers/net/benet/be_main.c | 25 +- + drivers/net/can/bfin_can.c | 3 +- + drivers/net/can/usb/ems_usb.c | 4 +- + drivers/net/cassini.c | 2 +- + drivers/net/cpmac.c | 14 +- + drivers/net/cxgb3/cxgb3_main.c | 1 + + drivers/net/davinci_emac.c | 2 +- + drivers/net/e1000e/defines.h | 2 + + drivers/net/e1000e/ich8lan.c | 10 + + drivers/net/gianfar.c | 5 +- + drivers/net/irda/irda-usb.c | 4 + + drivers/net/qlcnic/qlcnic.h | 13 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 17 + + drivers/net/qlcnic/qlcnic_hw.c | 32 +- + drivers/net/qlcnic/qlcnic_init.c | 156 +- + drivers/net/qlcnic/qlcnic_main.c | 5 + + drivers/net/r8169.c | 4 +- + drivers/net/s2io.c | 6 +- + drivers/net/smc91x.h | 14 + + drivers/net/typhoon.c | 6 +- + drivers/net/usb/pegasus.h | 6 +- + drivers/net/wireless/airo.c | 3 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 1 + + drivers/net/wireless/ath/ar9170/main.c | 10 +- + drivers/net/wireless/ath/ar9170/usb.c | 170 +- + drivers/net/wireless/ath/ath9k/rc.c | 6 +- + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 157 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 2 + + drivers/net/wireless/rndis_wlan.c | 66 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00soc.c | 1 + + drivers/net/wireless/rt2x00/rt73usb.c | 2 + + drivers/net/wireless/zd1211rw/zd_mac.c | 10 +- + firmware/bnx2x-e1-5.2.7.0.fw.ihex |10178 ----------------------- + firmware/bnx2x-e1h-5.2.7.0.fw.ihex |12847 ------------------------------ + include/linux/ethtool.h | 24 +- + include/linux/rfkill.h | 2 +- + include/linux/snmp.h | 2 + + include/net/ip6_route.h | 18 + + include/net/mac80211.h | 3 +- + include/net/sock.h | 17 +- + include/net/tcp.h | 2 +- + include/net/xfrm.h | 3 +- + net/bluetooth/hci_sysfs.c | 41 +- + net/bridge/Kconfig | 1 + + net/bridge/br_multicast.c | 8 +- + net/core/ethtool.c | 103 +- + net/core/sock.c | 19 +- + net/dccp/minisocks.c | 2 +- + net/ipv4/ip_gre.c | 7 +- + net/ipv4/proc.c | 2 + + net/ipv4/route.c | 50 +- + net/ipv4/tcp_ipv4.c | 11 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 18 +- + net/ipv4/udp.c | 6 +- + net/ipv4/xfrm4_policy.c | 5 +- + net/ipv6/addrconf.c | 102 +- + net/ipv6/fib6_rules.c | 11 +- + net/ipv6/route.c | 11 +- + net/ipv6/tcp_ipv6.c | 7 +- + net/ipv6/udp.c | 28 +- + net/ipv6/xfrm6_policy.c | 3 +- + net/llc/llc_c_ac.c | 2 +- + net/llc/llc_conn.c | 3 +- + net/mac80211/mlme.c | 19 +- + net/mac80211/rate.h | 5 +- + net/packet/af_packet.c | 6 +- + net/rfkill/input.c | 8 + + net/sctp/input.c | 42 +- + net/sctp/socket.c | 3 + + net/sunrpc/xprtrdma/transport.c | 7 +- + net/sunrpc/xprtsock.c | 9 +- + net/tipc/bearer.c | 37 +- + net/tipc/bearer.h | 2 +- + net/tipc/link.c | 9 + + net/tipc/net.c | 25 +- + net/tipc/socket.c | 6 +- + net/tipc/subscr.c | 57 +- + net/tipc/subscr.h | 2 - + net/x25/x25_dev.c | 2 +- + net/xfrm/xfrm_policy.c | 7 +- + 88 files changed, 985 insertions(+), 23603 deletions(-) + delete mode 100644 firmware/bnx2x-e1-5.2.7.0.fw.ihex + delete mode 100644 firmware/bnx2x-e1h-5.2.7.0.fw.ihex +$ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch +Applying: ar9170: fix for driver-core ABI change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/ath/ar9170/usb.c +$ git add . +$ git commit -v -a --amend +[master 9f3f632] Merge remote branch 'net-current/master' +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/for-linus +$ git merge kbuild-current/for-linus +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/hid/hid-input.c | 24 ++-- + drivers/input/evdev.c | 2 +- + drivers/input/input.c | 20 +- + drivers/input/joystick/gamecon.c | 2 +- + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ati_remote2.c | 14 +- + drivers/input/misc/twl4030-vibra.c | 297 ++++++++++++++++++++++++++++ + drivers/input/misc/winbond-cir.c | 12 +- + drivers/input/serio/i8042-x86ia64io.h | 3 + + drivers/input/serio/i8042.c | 24 +-- + drivers/input/sparse-keymap.c | 6 +- + drivers/input/tablet/wacom_sys.c | 4 +- + drivers/input/tablet/wacom_wac.c | 165 ++++++---------- + drivers/input/tablet/wacom_wac.h | 1 - + drivers/media/IR/ir-keytable.c | 4 +- + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 4 +- + drivers/platform/x86/dell-wmi.c | 16 +- + drivers/platform/x86/hp-wmi.c | 15 +- + drivers/platform/x86/panasonic-laptop.c | 15 +- + drivers/platform/x86/topstar-laptop.c | 13 +- + drivers/platform/x86/toshiba_acpi.c | 17 +- + include/linux/input.h | 20 ++- + 23 files changed, 471 insertions(+), 219 deletions(-) + create mode 100644 drivers/input/misc/twl4030-vibra.c +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging MAINTAINERS +Removing arch/arm/common/icst307.c +Removing arch/arm/common/icst525.c +Removing arch/arm/configs/mx1ads_defconfig +Removing arch/arm/include/asm/hardware/icst307.h +Removing arch/arm/include/asm/hardware/icst525.h +Removing arch/arm/mach-integrator/common.h +Removing arch/arm/mach-kirkwood/openrd_base-setup.c +Removing arch/arm/mach-mx2/crm_regs.h +Removing arch/arm/mach-mx2/pca100.c +Removing arch/arm/mach-mx3/pcm043.c +Removing arch/arm/mach-realview/clock.c +Removing arch/arm/mach-realview/clock.h +Removing arch/arm/mach-s3c2442/Kconfig +Removing arch/arm/mach-s3c2442/Makefile +Removing arch/arm/mach-s3c2442/s3c2442.c +Removing arch/arm/mach-s3c6400/Kconfig +Removing arch/arm/mach-s3c6400/Makefile +Removing arch/arm/mach-s3c6400/include/mach/dma.h +Removing arch/arm/mach-s3c6400/include/mach/gpio-core.h +Removing arch/arm/mach-s3c6400/include/mach/irqs.h +Removing arch/arm/mach-s3c6400/include/mach/regs-clock.h +Removing arch/arm/mach-s3c6410/Kconfig +Removing arch/arm/mach-s3c6410/Makefile +Removing arch/arm/mach-s3c6410/setup-sdhci.c +Removing arch/arm/mach-s5pc100/include/mach/gpio-core.h +Removing arch/arm/mach-versatile/clock.c +Removing arch/arm/mach-versatile/clock.h +Removing arch/arm/plat-mxc/include/mach/mtd-xip.h +Removing arch/arm/plat-mxc/iomux-mx1-mx2.c +Removing arch/arm/plat-s3c/Kconfig +Removing arch/arm/plat-s3c/Makefile +Removing arch/arm/plat-s3c/dev-usb.c +Removing arch/arm/plat-s3c24xx/include/plat/s3c2440.h +Removing arch/arm/plat-s3c64xx/Kconfig +Removing arch/arm/plat-s3c64xx/clock.c +Removing arch/arm/plat-s3c64xx/dev-audio.c +Removing arch/arm/plat-s3c64xx/gpiolib.c +Removing arch/arm/plat-s3c64xx/include/plat/regs-clock.h +Removing arch/arm/plat-s3c64xx/irq.c +Removing arch/arm/plat-s3c64xx/s3c6400-clock.c +Removing arch/arm/plat-s3c64xx/s3c6400-init.c +Merge made by recursive. + Documentation/arm/Samsung/Overview.txt | 86 + + .../arm/Samsung/clksrc-change-registers.awk | 167 ++ + MAINTAINERS | 23 + + arch/arm/Kconfig | 111 +- + arch/arm/Kconfig.debug | 2 +- + arch/arm/Makefile | 18 +- + arch/arm/common/Kconfig | 5 +- + arch/arm/common/Makefile | 3 +- + arch/arm/common/icst.c | 100 + + arch/arm/common/icst307.c | 161 -- + arch/arm/common/icst525.c | 160 -- + arch/arm/common/locomo.c | 362 +---- + arch/arm/common/sa1111.c | 112 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/configs/ap4evb_defconfig | 779 ++++++++ + arch/arm/configs/g3evm_defconfig | 774 ++++++++ + arch/arm/configs/g4evm_defconfig | 779 ++++++++ + arch/arm/configs/imote2_defconfig | 2077 ++++++++++++++++++++ + arch/arm/configs/kirkwood_defconfig | 126 +- + arch/arm/configs/mini2440_defconfig | 6 +- + arch/arm/configs/mmp2_defconfig | 1194 +++++++++++ + arch/arm/configs/mv78xx0_defconfig | 1 + + arch/arm/configs/mx1ads_defconfig | 742 ------- + arch/arm/configs/mx27_defconfig | 2 +- + arch/arm/configs/mx51_defconfig | 1286 ++++++++++++ + arch/arm/configs/orion5x_defconfig | 101 +- + arch/arm/configs/pxa168_defconfig | 229 ++- + arch/arm/configs/raumfeld_defconfig | 1898 ++++++++++++++++++ + arch/arm/configs/s3c2410_defconfig | 6 +- + arch/arm/configs/s3c6400_defconfig | 360 +++- + arch/arm/configs/s5p6440_defconfig | 969 +++++++++ + arch/arm/configs/s5p6442_defconfig | 883 +++++++++ + arch/arm/configs/s5pc110_defconfig | 894 +++++++++ + arch/arm/configs/s5pv210_defconfig | 894 +++++++++ + .../asm/entry-macro-vic2.S} | 29 +- + arch/arm/include/asm/hardware/arm_timer.h | 39 +- + arch/arm/include/asm/hardware/icst.h | 59 + + arch/arm/include/asm/hardware/icst307.h | 38 - + arch/arm/include/asm/hardware/icst525.h | 36 - + arch/arm/include/asm/hardware/it8152.h | 12 + + arch/arm/include/asm/hardware/locomo.h | 4 + + arch/arm/include/asm/hardware/sa1111.h | 4 + + arch/arm/kernel/smp.c | 4 +- + arch/arm/mach-at91/at91rm9200_time.c | 20 +- + arch/arm/mach-at91/at91sam926x_time.c | 11 +- + arch/arm/mach-dove/common.c | 8 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/common.h | 2 - + arch/arm/mach-integrator/core.c | 127 +-- + arch/arm/mach-integrator/cpu.c | 53 +- + arch/arm/mach-integrator/impd1.c | 43 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 7 +- + .../arm/mach-integrator/include/mach/entry-macro.S | 1 + + arch/arm/mach-integrator/include/mach/hardware.h | 17 +- + arch/arm/mach-integrator/include/mach/platform.h | 54 +- + arch/arm/mach-integrator/integrator_ap.c | 166 ++- + arch/arm/mach-integrator/integrator_cp.c | 88 +- + arch/arm/mach-integrator/leds.c | 1 + + arch/arm/mach-integrator/pci_v3.c | 7 +- + arch/arm/mach-kirkwood/Kconfig | 23 + + arch/arm/mach-kirkwood/Makefile | 4 +- + arch/arm/mach-kirkwood/common.c | 8 +- + arch/arm/mach-kirkwood/netspace_v2-setup.c | 59 +- + arch/arm/mach-kirkwood/openrd-setup.c | 118 ++ + arch/arm/mach-kirkwood/openrd_base-setup.c | 96 - + arch/arm/mach-kirkwood/sheevaplug-setup.c | 50 +- + arch/arm/mach-mmp/Kconfig | 35 +- + arch/arm/mach-mmp/Makefile | 10 +- + arch/arm/mach-mmp/avengers_lite.c | 51 + + arch/arm/mach-mmp/common.h | 4 + + arch/arm/mach-mmp/flint.c | 123 ++ + arch/arm/mach-mmp/include/mach/cputype.h | 9 + + arch/arm/mach-mmp/include/mach/devices.h | 12 + + arch/arm/mach-mmp/include/mach/entry-macro.S | 7 +- + arch/arm/mach-mmp/include/mach/irqs.h | 115 ++- + arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 240 +++ + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 4 +- + arch/arm/mach-mmp/include/mach/mmp2.h | 60 + + arch/arm/mach-mmp/include/mach/regs-apbc.h | 41 + + arch/arm/mach-mmp/include/mach/regs-icu.h | 42 +- + arch/arm/mach-mmp/include/mach/uncompress.h | 13 +- + arch/arm/mach-mmp/irq-mmp2.c | 154 ++ + arch/arm/mach-mmp/{irq.c => irq-pxa168.c} | 0 + arch/arm/mach-mmp/jasper.c | 80 + + arch/arm/mach-mmp/mmp2.c | 123 ++ + arch/arm/mach-mmp/time.c | 26 +- + arch/arm/mach-mv78xx0/Kconfig | 6 + + arch/arm/mach-mv78xx0/Makefile | 3 +- + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 155 ++ + arch/arm/mach-mv78xx0/mpp.c | 96 + + arch/arm/mach-mv78xx0/mpp.h | 347 ++++ + arch/arm/mach-mx1/Makefile | 5 +- + arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} | 8 +- + arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} | 4 +- + arch/arm/mach-mx2/Kconfig | 10 +- + arch/arm/mach-mx2/Makefile | 23 +- + arch/arm/mach-mx2/clock_imx21.c | 236 +++- + arch/arm/mach-mx2/clock_imx27.c | 33 +- + arch/arm/mach-mx2/cpu_imx27.c | 3 +- + arch/arm/mach-mx2/crm_regs.h | 258 --- + arch/arm/mach-mx2/devices.c | 640 +++---- + arch/arm/mach-mx2/devices.h | 13 +- + arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 2 +- + .../{eukrea_cpuimx27.c => mach-cpuimx27.c} | 19 +- + arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} | 8 +- + arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} | 16 +- + arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} | 8 +- + arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} | 12 +- + arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} | 10 +- + arch/arm/mach-mx2/mach-pca100.c | 395 ++++ + arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} | 40 +- + arch/arm/mach-mx2/{generic.c => mm-imx21.c} | 46 +- + arch/arm/mach-mx2/{generic.c => mm-imx27.c} | 44 +- + arch/arm/mach-mx2/pca100.c | 244 --- + arch/arm/mach-mx2/pcm970-baseboard.c | 6 +- + arch/arm/mach-mx2/serial.c | 48 +- + arch/arm/mach-mx25/Kconfig | 1 - + arch/arm/mach-mx25/Makefile | 2 +- + arch/arm/mach-mx25/clock.c | 14 + + arch/arm/mach-mx25/devices.c | 62 + + arch/arm/mach-mx25/devices.h | 3 + + arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} | 67 +- + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/Makefile | 32 +- + arch/arm/mach-mx3/{clock.c => clock-imx31.c} | 5 +- + arch/arm/mach-mx3/clock-imx35.c | 5 +- + arch/arm/mach-mx3/cpu.c | 2 +- + arch/arm/mach-mx3/crm_regs.h | 2 +- + arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} | 2 +- + .../{armadillo5x0.c => mach-armadillo5x0.c} | 14 +- + .../mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} | 33 +- + arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} | 12 +- + arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} | 44 +- + .../arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} | 10 +- + arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} | 16 +- + .../mach-mx3/{mx31moboard.c => mach-mx31moboard.c} | 49 +- + arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} | 6 +- + arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} | 155 +- + .../mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} | 0 + arch/arm/mach-mx3/mach-pcm043.c | 413 ++++ + arch/arm/mach-mx3/{qong.c => mach-qong.c} | 20 +- + arch/arm/mach-mx3/mx31lite-db.c | 30 +- + arch/arm/mach-mx3/mx31moboard-devboard.c | 32 + + arch/arm/mach-mx3/mx31moboard-marxbot.c | 39 +- + arch/arm/mach-mx3/mx31moboard-smartbot.c | 162 ++ + arch/arm/mach-mx3/pcm043.c | 259 --- + arch/arm/mach-mx5/Kconfig | 18 + + arch/arm/mach-mx5/Makefile | 9 + + arch/arm/mach-mx5/Makefile.boot | 3 + + arch/arm/mach-mx5/board-mx51_babbage.c | 98 + + arch/arm/mach-mx5/clock-mx51.c | 825 ++++++++ + arch/arm/mach-mx5/cpu.c | 47 + + arch/arm/mach-mx5/crm_regs.h | 583 ++++++ + arch/arm/mach-mx5/devices.c | 96 + + arch/arm/mach-mx5/devices.h | 4 + + arch/arm/mach-mx5/mm.c | 89 + + arch/arm/mach-mxc91231/magx-zn5.c | 2 +- + arch/arm/mach-orion5x/Kconfig | 7 + + arch/arm/mach-orion5x/Makefile | 1 + + arch/arm/mach-orion5x/common.c | 4 +- + arch/arm/mach-orion5x/d2net-setup.c | 45 +- + arch/arm/mach-orion5x/dns323-setup.c | 36 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 276 +++ + arch/arm/mach-orion5x/lsmini-setup.c | 8 +- + arch/arm/mach-pxa/Kconfig | 35 + + arch/arm/mach-pxa/Makefile | 5 + + arch/arm/mach-pxa/balloon3.c | 33 +- + arch/arm/mach-pxa/capc7117.c | 158 ++ + arch/arm/mach-pxa/cm-x255.c | 21 +- + arch/arm/mach-pxa/cm-x270.c | 83 +- + arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +- + arch/arm/mach-pxa/e740.c | 6 + + arch/arm/mach-pxa/e750.c | 6 + + arch/arm/mach-pxa/e800.c | 9 + + arch/arm/mach-pxa/em-x270.c | 21 +- + arch/arm/mach-pxa/icontrol.c | 202 ++ + arch/arm/mach-pxa/idp.c | 20 +- + arch/arm/mach-pxa/imote2.c | 3 +- + arch/arm/mach-pxa/include/mach/balloon3.h | 10 + + arch/arm/mach-pxa/include/mach/irqs.h | 153 +-- + arch/arm/mach-pxa/include/mach/lpd270.h | 4 + + arch/arm/mach-pxa/include/mach/lubbock.h | 11 + + arch/arm/mach-pxa/include/mach/mainstone.h | 17 + + arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 32 + + arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 27 + + arch/arm/mach-pxa/include/mach/mxm8x10.h | 21 + + arch/arm/mach-pxa/include/mach/pcm027.h | 7 + + arch/arm/mach-pxa/include/mach/ssp.h | 2 + + arch/arm/mach-pxa/include/mach/uncompress.h | 41 +- + arch/arm/mach-pxa/include/mach/zeus.h | 3 +- + arch/arm/mach-pxa/lpd270.c | 6 +- + arch/arm/mach-pxa/lubbock.c | 35 +- + arch/arm/mach-pxa/magician.c | 21 +- + arch/arm/mach-pxa/mainstone.c | 27 +- + arch/arm/mach-pxa/mioa701.c | 24 +- + arch/arm/mach-pxa/mxm8x10.c | 474 +++++ + arch/arm/mach-pxa/palmld.c | 21 +- + arch/arm/mach-pxa/palmt5.c | 21 +- + arch/arm/mach-pxa/palmtc.c | 21 +- + arch/arm/mach-pxa/palmte2.c | 21 +- + arch/arm/mach-pxa/palmtreo.c | 20 +- + arch/arm/mach-pxa/palmtx.c | 21 +- + arch/arm/mach-pxa/palmz72.c | 22 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 9 +- + arch/arm/mach-pxa/poodle.c | 28 +- + arch/arm/mach-pxa/pxa27x.c | 19 + + arch/arm/mach-pxa/raumfeld.c | 1108 +++++++++++ + arch/arm/mach-pxa/spitz.c | 20 +- + arch/arm/mach-pxa/ssp.c | 5 + + arch/arm/mach-pxa/time.c | 10 +- + arch/arm/mach-pxa/tosa.c | 117 +- + arch/arm/mach-pxa/trizeps4.c | 27 +- + arch/arm/mach-pxa/viper.c | 8 +- + arch/arm/mach-pxa/zeus.c | 91 +- + arch/arm/mach-realview/Makefile | 2 +- + arch/arm/mach-realview/clock.c | 64 - + arch/arm/mach-realview/clock.h | 19 - + arch/arm/mach-realview/core.c | 194 +-- + arch/arm/mach-realview/include/mach/clkdev.h | 9 + + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 + + arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 +- + arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 +- + arch/arm/mach-realview/include/mach/platform.h | 20 - + arch/arm/mach-realview/realview_eb.c | 2 - + arch/arm/mach-realview/realview_pb1176.c | 2 - + arch/arm/mach-realview/realview_pb11mp.c | 2 - + arch/arm/mach-realview/realview_pba8.c | 2 - + arch/arm/mach-s3c2410/dma.c | 2 +- + .../include/mach/{gpio-core.h => gpio-track.h} | 1 - + .../plat => mach-s3c2410/include/mach}/pm-core.h | 2 +- + arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 10 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 32 +- + .../include/mach/timex.h | 2 - + .../include/mach/vmalloc.h | 4 +- + arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- + arch/arm/mach-s3c2410/mach-bast.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 7 +- + arch/arm/mach-s3c2410/mach-n30.c | 2 +- + arch/arm/mach-s3c2410/mach-otom.c | 2 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- + arch/arm/mach-s3c2410/usb-simtec.c | 4 +- + arch/arm/mach-s3c2412/clock.c | 52 +- + arch/arm/mach-s3c2412/dma.c | 2 +- + arch/arm/mach-s3c2412/mach-jive.c | 2 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 3 +- + arch/arm/mach-s3c2412/mach-vstms.c | 2 +- + arch/arm/mach-s3c2440/Kconfig | 74 +- + arch/arm/mach-s3c2440/Makefile | 11 + + arch/arm/mach-s3c2440/clock.c | 6 +- + arch/arm/mach-s3c2440/dma.c | 2 +- + arch/arm/mach-s3c2440/dsc.c | 2 +- + .../include/mach/gta02.h | 0 + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 7 +- + .../{mach-s3c2442 => mach-s3c2440}/mach-gta02.c | 7 +- + arch/arm/mach-s3c2440/mach-mini2440.c | 8 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 4 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 4 +- + .../s3c2440-pll-12000000.c | 2 +- + .../s3c2440-pll-16934400.c | 2 +- + arch/arm/mach-s3c2440/s3c2440.c | 2 +- + .../clock.c => mach-s3c2440/s3c2442.c} | 22 +- + .../{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c | 4 +- + .../{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c | 0 + arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c | 3 +- + arch/arm/mach-s3c2442/Kconfig | 37 - + arch/arm/mach-s3c2442/Makefile | 18 - + arch/arm/mach-s3c2442/s3c2442.c | 34 - + arch/arm/mach-s3c2443/Kconfig | 1 + + arch/arm/mach-s3c2443/clock.c | 842 +++------ + arch/arm/mach-s3c2443/dma.c | 2 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 10 +- + .../{plat-s3c => mach-s3c24a0}/include/mach/io.h | 4 +- + arch/arm/mach-s3c6400/Kconfig | 30 - + arch/arm/mach-s3c6400/Makefile | 23 - + arch/arm/mach-s3c6400/include/mach/dma.h | 70 - + arch/arm/mach-s3c6400/include/mach/gpio-core.h | 21 - + arch/arm/mach-s3c6400/include/mach/irqs.h | 16 - + arch/arm/mach-s3c6400/include/mach/regs-clock.h | 16 - + arch/arm/mach-s3c6410/Kconfig | 109 - + arch/arm/mach-s3c6410/Makefile | 26 - + arch/arm/mach-s3c6410/setup-sdhci.c | 68 - + arch/arm/mach-s3c64xx/Kconfig | 180 ++ + arch/arm/{plat-s3c64xx => mach-s3c64xx}/Makefile | 48 +- + .../{mach-s3c6400 => mach-s3c64xx}/Makefile.boot | 0 + arch/arm/mach-s3c64xx/clock.c | 809 ++++++++ + arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c | 19 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c | 0 + arch/arm/mach-s3c64xx/dev-adc.c | 46 + + arch/arm/mach-s3c64xx/dev-audio.c | 335 ++++ + arch/arm/mach-s3c64xx/dev-rtc.c | 43 + + arch/arm/mach-s3c64xx/dev-spi.c | 182 ++ + arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c | 29 - + arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c | 3 +- + arch/arm/mach-s3c64xx/gpiolib.c | 288 +++ + .../include/mach/debug-macro.S | 2 +- + .../dma-plat.h => mach-s3c64xx/include/mach/dma.h} | 79 +- + arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 18 + + .../include/mach}/gpio-bank-a.h | 2 +- + .../include/mach}/gpio-bank-b.h | 2 +- + .../include/mach}/gpio-bank-c.h | 2 +- + .../include/mach}/gpio-bank-d.h | 2 +- + .../include/mach}/gpio-bank-e.h | 2 +- + .../include/mach}/gpio-bank-f.h | 2 +- + .../include/mach}/gpio-bank-g.h | 2 +- + .../include/mach}/gpio-bank-h.h | 2 +- + .../include/mach}/gpio-bank-i.h | 2 +- + .../include/mach}/gpio-bank-j.h | 2 +- + .../include/mach}/gpio-bank-n.h | 2 +- + .../include/mach}/gpio-bank-o.h | 2 +- + .../include/mach}/gpio-bank-p.h | 2 +- + .../include/mach}/gpio-bank-q.h | 2 +- + .../include/mach/gpio.h | 6 +- + .../include/mach/hardware.h | 0 + .../{plat-s3c => mach-s3c64xx}/include/mach/io.h | 4 +- + .../plat => mach-s3c64xx/include/mach}/irqs.h | 24 +- + .../include/mach/map.h | 22 +- + .../include/mach/memory.h | 0 + .../plat => mach-s3c64xx/include/mach}/pll.h | 0 + .../plat => mach-s3c64xx/include/mach}/pm-core.h | 4 +- + .../include/mach/pwm-clock.h | 0 + arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 156 ++ + .../include/mach/regs-fb.h | 0 + .../include/mach}/regs-gpio-memport.h | 0 + .../plat => mach-s3c64xx/include/mach}/regs-gpio.h | 0 + .../include/mach/regs-irq.h | 0 + .../include/mach}/regs-modem.h | 0 + arch/arm/mach-s3c64xx/include/mach/regs-srom.h | 59 + + .../plat => mach-s3c64xx/include/mach}/regs-sys.h | 0 + .../include/mach}/regs-syscon-power.h | 0 + .../plat => mach-s3c64xx/include/mach}/s3c6400.h | 6 +- + .../plat => mach-s3c64xx/include/mach}/s3c6410.h | 2 +- + arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 + + .../include/mach/system.h | 0 + .../include/mach/tick.h | 2 +- + .../include/mach/timex.h | 6 +- + .../include/mach/uncompress.h | 0 + .../include/mach/vmalloc.h | 6 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c | 2 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/irq.c | 69 + + .../{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c | 8 +- + arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c | 4 +- + arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c | 4 +- + .../{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c | 4 +- + .../{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c | 337 +++- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c | 12 +- + arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c | 11 +- + .../{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} | 24 +- + .../setup-fb-24bpp.c | 0 + .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c | 2 +- + .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c | 2 +- + .../setup-sdhci-gpio.c | 0 + .../{mach-s3c6400 => mach-s3c64xx}/setup-sdhci.c | 15 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S | 6 +- + arch/arm/mach-s5p6440/Kconfig | 21 + + arch/arm/mach-s5p6440/Makefile | 19 + + arch/arm/mach-s5p6440/Makefile.boot | 2 + + arch/arm/mach-s5p6440/clock.c | 698 +++++++ + arch/arm/mach-s5p6440/cpu.c | 114 ++ + arch/arm/mach-s5p6440/gpio.c | 322 +++ + .../include/mach/debug-macro.S | 12 +- + arch/arm/mach-s5p6440/include/mach/entry-macro.S | 16 + + arch/arm/mach-s5p6440/include/mach/gpio.h | 80 + + arch/arm/mach-s5p6440/include/mach/hardware.h | 18 + + .../{plat-s3c => mach-s5p6440}/include/mach/io.h | 4 +- + arch/arm/mach-s5p6440/include/mach/irqs.h | 111 ++ + arch/arm/mach-s5p6440/include/mach/map.h | 68 + + arch/arm/mach-s5p6440/include/mach/memory.h | 19 + + .../include/mach/pwm-clock.h | 26 +- + arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 ++ + arch/arm/mach-s5p6440/include/mach/regs-gpio.h | 54 + + .../include/mach/regs-irq.h | 13 +- + arch/arm/mach-s5p6440/include/mach/system.h | 26 + + arch/arm/mach-s5p6440/include/mach/tick.h | 24 + + .../include/mach/timex.h | 6 +- + .../include/mach/uncompress.h | 12 +- + .../include/mach/vmalloc.h | 11 +- + arch/arm/mach-s5p6440/init.c | 52 + + arch/arm/mach-s5p6440/mach-smdk6440.c | 111 ++ + arch/arm/mach-s5p6442/Kconfig | 24 + + arch/arm/mach-s5p6442/Makefile | 19 + + arch/arm/mach-s5p6442/Makefile.boot | 2 + + arch/arm/mach-s5p6442/clock.c | 396 ++++ + arch/arm/mach-s5p6442/cpu.c | 121 ++ + .../include/mach/debug-macro.S | 23 +- + arch/arm/mach-s5p6442/include/mach/entry-macro.S | 48 + + arch/arm/mach-s5p6442/include/mach/gpio.h | 123 ++ + arch/arm/mach-s5p6442/include/mach/hardware.h | 18 + + .../{plat-s3c => mach-s5p6442}/include/mach/io.h | 7 +- + arch/arm/mach-s5p6442/include/mach/irqs.h | 86 + + arch/arm/mach-s5p6442/include/mach/map.h | 58 + + arch/arm/mach-s5p6442/include/mach/memory.h | 19 + + .../include/mach/pwm-clock.h | 33 +- + arch/arm/mach-s5p6442/include/mach/regs-clock.h | 103 + + .../include/mach/regs-irq.h | 13 +- + arch/arm/mach-s5p6442/include/mach/system.h | 26 + + arch/arm/mach-s5p6442/include/mach/tick.h | 26 + + .../include/mach/timex.h | 8 +- + .../include/mach/uncompress.h | 12 +- + .../include/mach/vmalloc.h | 11 +- + arch/arm/mach-s5p6442/init.c | 44 + + arch/arm/mach-s5p6442/mach-smdk6442.c | 91 + + arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 - + .../{plat-s3c => mach-s5pc100}/include/mach/io.h | 4 +- + arch/arm/mach-s5pc100/include/mach/tick.h | 2 +- + .../include/mach/timex.h | 6 +- + .../include/mach/vmalloc.h | 9 +- + arch/arm/mach-s5pv210/Kconfig | 40 + + arch/arm/mach-s5pv210/Makefile | 20 + + arch/arm/mach-s5pv210/Makefile.boot | 2 + + arch/arm/mach-s5pv210/clock.c | 454 +++++ + arch/arm/mach-s5pv210/cpu.c | 126 ++ + .../include/mach/debug-macro.S | 15 +- + arch/arm/mach-s5pv210/include/mach/entry-macro.S | 54 + + arch/arm/mach-s5pv210/include/mach/gpio.h | 129 ++ + arch/arm/mach-s5pv210/include/mach/hardware.h | 18 + + arch/arm/mach-s5pv210/include/mach/io.h | 26 + + arch/arm/mach-s5pv210/include/mach/irqs.h | 146 ++ + arch/arm/mach-s5pv210/include/mach/map.h | 65 + + arch/arm/mach-s5pv210/include/mach/memory.h | 23 + + .../include/mach/pwm-clock.h | 33 +- + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 169 ++ + .../include/mach/regs-irq.h | 13 +- + arch/arm/mach-s5pv210/include/mach/system.h | 26 + + arch/arm/mach-s5pv210/include/mach/tick.h | 26 + + .../include/mach/timex.h | 15 +- + .../include/mach/uncompress.h | 12 +- + arch/arm/mach-s5pv210/include/mach/vmalloc.h | 22 + + arch/arm/mach-s5pv210/init.c | 44 + + arch/arm/mach-s5pv210/mach-smdkc110.c | 98 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 98 + + arch/arm/mach-sa1100/badge4.c | 5 + + arch/arm/mach-sa1100/collie.c | 4 + + arch/arm/mach-sa1100/include/mach/collie.h | 7 - + arch/arm/mach-sa1100/include/mach/irqs.h | 91 +- + arch/arm/mach-sa1100/jornada720.c | 5 + + arch/arm/mach-sa1100/neponset.c | 5 + + arch/arm/mach-sa1100/time.c | 8 +- + arch/arm/mach-shmobile/Kconfig | 84 + + arch/arm/mach-shmobile/Makefile | 22 + + arch/arm/mach-shmobile/Makefile.boot | 9 + + arch/arm/mach-shmobile/board-ap4evb.c | 301 +++ + arch/arm/mach-shmobile/board-g3evm.c | 211 ++ + arch/arm/mach-shmobile/board-g4evm.c | 211 ++ + arch/arm/mach-shmobile/clock-sh7367.c | 96 + + arch/arm/mach-shmobile/console.c | 31 + + arch/arm/mach-shmobile/include/mach/clkdev.h | 7 + + arch/arm/mach-shmobile/include/mach/common.h | 23 + + arch/arm/mach-shmobile/include/mach/dma.h | 1 + + arch/arm/mach-shmobile/include/mach/entry-macro.S | 39 + + arch/arm/mach-shmobile/include/mach/gpio.h | 48 + + arch/arm/mach-shmobile/include/mach/hardware.h | 7 + + arch/arm/mach-shmobile/include/mach/io.h | 9 + + arch/arm/mach-shmobile/include/mach/irqs.h | 10 + + arch/arm/mach-shmobile/include/mach/memory.h | 7 + + arch/arm/mach-shmobile/include/mach/sh7367.h | 332 ++++ + arch/arm/mach-shmobile/include/mach/sh7372.h | 434 ++++ + arch/arm/mach-shmobile/include/mach/sh7377.h | 360 ++++ + arch/arm/mach-shmobile/include/mach/system.h | 14 + + arch/arm/mach-shmobile/include/mach/timex.h | 6 + + arch/arm/mach-shmobile/include/mach/uncompress.h | 21 + + arch/arm/mach-shmobile/include/mach/vmalloc.h | 6 + + arch/arm/mach-shmobile/intc-sh7367.c | 270 +++ + arch/arm/mach-shmobile/intc-sh7372.c | 369 ++++ + arch/arm/mach-shmobile/intc-sh7377.c | 350 ++++ + arch/arm/mach-shmobile/pfc-sh7367.c | 1801 +++++++++++++++++ + arch/arm/mach-shmobile/pfc-sh7372.c | 1637 +++++++++++++++ + arch/arm/mach-shmobile/pfc-sh7377.c | 1767 +++++++++++++++++ + arch/arm/mach-shmobile/setup-sh7367.c | 198 ++ + arch/arm/mach-shmobile/setup-sh7372.c | 199 ++ + arch/arm/mach-shmobile/setup-sh7377.c | 215 ++ + arch/arm/mach-shmobile/timer.c | 46 + + arch/arm/mach-versatile/Makefile | 2 +- + arch/arm/mach-versatile/clock.c | 65 - + arch/arm/mach-versatile/clock.h | 20 - + arch/arm/mach-versatile/core.c | 194 +-- + arch/arm/mach-versatile/include/mach/clkdev.h | 9 + + arch/arm/mach-versatile/include/mach/entry-macro.S | 1 + + arch/arm/mach-versatile/include/mach/hardware.h | 3 +- + arch/arm/mach-versatile/include/mach/platform.h | 26 +- + arch/arm/mach-vexpress/Kconfig | 9 + + arch/arm/mach-vexpress/Makefile | 8 + + arch/arm/mach-vexpress/Makefile.boot | 3 + + arch/arm/mach-vexpress/core.h | 26 + + arch/arm/mach-vexpress/ct-ca9x4.c | 215 ++ + arch/arm/mach-vexpress/headsmp.S | 39 + + arch/arm/mach-vexpress/include/mach/clkdev.h | 15 + + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 43 + + arch/arm/mach-vexpress/include/mach/debug-macro.S | 23 + + arch/arm/mach-vexpress/include/mach/entry-macro.S | 67 + + arch/arm/mach-vexpress/include/mach/hardware.h | 1 + + arch/arm/mach-vexpress/include/mach/io.h | 28 + + arch/arm/mach-vexpress/include/mach/irqs.h | 4 + + arch/arm/mach-vexpress/include/mach/memory.h | 25 + + arch/arm/mach-vexpress/include/mach/motherboard.h | 121 ++ + arch/arm/mach-vexpress/include/mach/smp.h | 21 + + arch/arm/mach-vexpress/include/mach/system.h | 37 + + arch/arm/mach-vexpress/include/mach/timex.h | 23 + + arch/arm/mach-vexpress/include/mach/uncompress.h | 52 + + arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 + + arch/arm/mach-vexpress/localtimer.c | 26 + + arch/arm/mach-vexpress/platsmp.c | 190 ++ + arch/arm/mach-vexpress/v2m.c | 319 +++ + arch/arm/mm/Kconfig | 3 +- + arch/arm/plat-mxc/Kconfig | 30 +- + arch/arm/plat-mxc/Makefile | 8 +- + arch/arm/plat-mxc/audmux-v1.c | 14 +- + arch/arm/plat-mxc/audmux-v2.c | 9 +- + arch/arm/plat-mxc/clock.c | 1 + + arch/arm/plat-mxc/dma-mx1-mx2.c | 207 ++- + arch/arm/plat-mxc/ehci.c | 122 ++- + arch/arm/plat-mxc/gpio.c | 30 +- + arch/arm/plat-mxc/include/mach/board-kzmarm11.h | 18 +- + arch/arm/plat-mxc/include/mach/board-mx31ads.h | 2 +- + arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 + + arch/arm/plat-mxc/include/mach/clock.h | 7 - + arch/arm/plat-mxc/include/mach/common.h | 5 + + arch/arm/plat-mxc/include/mach/debug-macro.S | 12 +- + arch/arm/plat-mxc/include/mach/entry-macro.S | 34 +- + arch/arm/plat-mxc/include/mach/hardware.h | 9 + + arch/arm/plat-mxc/include/mach/iomux-mx1.h | 313 ++-- + arch/arm/plat-mxc/include/mach/iomux-mx21.h | 210 +- + arch/arm/plat-mxc/include/mach/iomux-mx25.h | 24 +- + arch/arm/plat-mxc/include/mach/iomux-mx27.h | 372 ++-- + arch/arm/plat-mxc/include/mach/iomux-mx2x.h | 425 ++-- + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 76 +- + arch/arm/plat-mxc/include/mach/iomux-mx35.h | 2 +- + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 326 +++ + arch/arm/plat-mxc/include/mach/iomux-v1.h | 103 + + arch/arm/plat-mxc/include/mach/iomux-v3.h | 8 +- + arch/arm/plat-mxc/include/mach/iomux.h | 128 +-- + arch/arm/plat-mxc/include/mach/irqs.h | 20 +- + arch/arm/plat-mxc/include/mach/memory.h | 54 +- + arch/arm/plat-mxc/include/mach/mtd-xip.h | 34 - + arch/arm/plat-mxc/include/mach/mx1.h | 395 +++-- + arch/arm/plat-mxc/include/mach/mx21.h | 13 +- + arch/arm/plat-mxc/include/mach/mx25.h | 36 +- + arch/arm/plat-mxc/include/mach/mx27.h | 32 +- + arch/arm/plat-mxc/include/mach/mx2x.h | 8 +- + arch/arm/plat-mxc/include/mach/mx31.h | 33 + + arch/arm/plat-mxc/include/mach/mx35.h | 13 + + arch/arm/plat-mxc/include/mach/mx3x.h | 8 +- + arch/arm/plat-mxc/include/mach/mx51.h | 454 +++++ + arch/arm/plat-mxc/include/mach/mxc.h | 20 +- + arch/arm/plat-mxc/include/mach/mxc91231.h | 58 +- + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 4 + + arch/arm/plat-mxc/include/mach/ssi.h | 18 + + arch/arm/plat-mxc/include/mach/timex.h | 2 + + arch/arm/plat-mxc/include/mach/uncompress.h | 3 - + arch/arm/plat-mxc/iomux-mx1-mx2.c | 157 -- + arch/arm/plat-mxc/iomux-v1.c | 238 +++ + arch/arm/plat-mxc/time.c | 41 +- + arch/arm/plat-mxc/tzic.c | 172 ++ + arch/arm/plat-nomadik/timer.c | 9 +- + arch/arm/plat-s3c/Kconfig | 215 -- + arch/arm/plat-s3c/Makefile | 45 - + arch/arm/plat-s3c/dev-usb.c | 50 - + arch/arm/plat-s3c24xx/Kconfig | 60 +- + arch/arm/plat-s3c24xx/Makefile | 8 - + arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- + arch/arm/plat-s3c24xx/cpu.c | 4 +- + arch/arm/plat-s3c24xx/devs.c | 59 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + arch/arm/plat-s3c24xx/gpiolib.c | 2 +- + .../include/plat/audio-simtec.h | 2 +- + arch/arm/plat-s3c24xx/include/plat/mci.h | 9 + + arch/arm/plat-s3c24xx/include/plat/s3c2440.h | 17 - + arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h | 14 +- + arch/arm/plat-s3c64xx/Kconfig | 71 - + arch/arm/plat-s3c64xx/clock.c | 300 --- + arch/arm/plat-s3c64xx/dev-audio.c | 167 -- + arch/arm/plat-s3c64xx/gpiolib.c | 446 ----- + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 225 --- + arch/arm/plat-s3c64xx/irq.c | 256 --- + arch/arm/plat-s3c64xx/s3c6400-clock.c | 758 ------- + arch/arm/plat-s3c64xx/s3c6400-init.c | 29 - + arch/arm/plat-s5p/Kconfig | 25 + + arch/arm/plat-s5p/Makefile | 19 + + arch/arm/plat-s5p/clock.c | 149 ++ + arch/arm/plat-s5p/cpu.c | 113 ++ + arch/arm/plat-s5p/dev-uart.c | 139 ++ + arch/arm/plat-s5p/include/plat/irqs.h | 90 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 34 + + arch/arm/plat-s5p/include/plat/pll.h | 83 + + arch/arm/plat-s5p/include/plat/s5p-clock.h | 40 + + arch/arm/plat-s5p/include/plat/s5p6440.h | 37 + + arch/arm/plat-s5p/include/plat/s5p6442.h | 33 + + arch/arm/plat-s5p/include/plat/s5pv210.h | 33 + + arch/arm/plat-s5p/irq.c | 72 + + arch/arm/plat-s5p/setup-i2c0.c | 25 + + arch/arm/plat-s5pc1xx/Kconfig | 3 + + arch/arm/plat-s5pc1xx/clock.c | 31 +- + arch/arm/plat-s5pc1xx/dev-uart.c | 29 - + arch/arm/plat-s5pc1xx/gpio-config.c | 2 +- + arch/arm/plat-s5pc1xx/gpiolib.c | 2 +- + arch/arm/plat-s5pc1xx/include/plat/irqs.h | 19 +- + arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 119 +-- + arch/arm/plat-s5pc1xx/irq.c | 202 +-- + arch/arm/plat-s5pc1xx/s5pc100-clock.c | 770 +++----- + arch/arm/plat-samsung/Kconfig | 229 +++ + arch/arm/plat-samsung/Makefile | 45 + + arch/arm/{plat-s3c24xx => plat-samsung}/adc.c | 55 +- + arch/arm/plat-samsung/clock-clksrc.c | 212 ++ + arch/arm/{plat-s3c => plat-samsung}/clock.c | 75 +- + arch/arm/{plat-s3c => plat-samsung}/dev-fb.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-nand.c | 0 + arch/arm/plat-samsung/dev-uart.c | 44 + + .../arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c | 7 + + arch/arm/plat-samsung/dev-usb.c | 69 + + arch/arm/{plat-s3c => plat-samsung}/dma.c | 4 +- + arch/arm/{plat-s3c => plat-samsung}/gpio-config.c | 2 +- + arch/arm/{plat-s3c => plat-samsung}/gpio.c | 2 +- + arch/arm/plat-samsung/gpiolib.c | 199 ++ + .../{plat-s3c => plat-samsung}/include/plat/adc.h | 4 +- + .../include/plat/audio.h | 10 +- + arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 + + .../include/plat/clock.h | 36 +- + .../include/plat/cpu-freq.h | 2 +- + .../{plat-s3c => plat-samsung}/include/plat/cpu.h | 5 +- + .../include/plat/debug-macro.S | 14 +- + .../{plat-s3c => plat-samsung}/include/plat/devs.h | 11 +- + .../include/plat/dma-core.h | 0 + .../include/plat/dma-s3c24xx.h} | 4 +- + .../{plat-s3c => plat-samsung}/include/plat/dma.h | 2 +- + .../{plat-s3c => plat-samsung}/include/plat/fb.h | 2 +- + .../include/plat/gpio-cfg-helpers.h | 0 + .../include/plat/gpio-cfg.h | 0 + .../include/plat/gpio-core.h | 30 + + .../include/plat/hwmon.h | 0 + .../include/plat/iic-core.h | 0 + .../{plat-s3c => plat-samsung}/include/plat/iic.h | 0 + arch/arm/plat-samsung/include/plat/irq-uart.h | 20 + + .../include/plat/irq-vic-timer.h} | 12 +- + .../include/plat/map-base.h | 0 + .../{plat-s3c => plat-samsung}/include/plat/nand.h | 0 + .../{plat-s3c => plat-samsung}/include/plat/pm.h | 6 +- + .../include/plat/regs-ac97.h | 0 + .../include/plat/regs-adc.h | 4 + + .../include/plat/regs-fb-v4.h | 2 +- + .../include/plat/regs-fb.h | 2 +- + .../include/plat/regs-iic.h | 0 + .../include/plat/regs-irqtype.h | 0 + .../include/plat/regs-nand.h | 0 + .../include/plat/regs-rtc.h | 0 + .../include/plat/regs-s3c2412-iis.h | 0 + .../include/plat/regs-sdhci.h | 0 + .../include/plat/regs-serial.h | 32 +- + .../include/plat/regs-timer.h | 0 + .../include/plat/regs-usb-hsotg-phy.h | 0 + .../include/plat/regs-usb-hsotg.h | 0 + .../include/plat/regs-watchdog.h | 0 + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 67 + + .../include/plat/sdhci.h | 43 +- + .../include/plat/udc-hs.h | 4 +- + .../include/plat/uncompress.h | 2 +- + .../include/plat/usb-control.h | 4 +- + .../include/plat/watchdog-reset.h | 0 + arch/arm/{plat-s3c => plat-samsung}/init.c | 0 + arch/arm/plat-samsung/irq-uart.c | 143 ++ + arch/arm/plat-samsung/irq-vic-timer.c | 86 + + arch/arm/{plat-s3c => plat-samsung}/pm-check.c | 8 +- + arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c | 2 +- + arch/arm/{plat-s3c => plat-samsung}/pm.c | 8 +- + arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 112 +- + arch/arm/{plat-s3c => plat-samsung}/pwm.c | 0 + arch/arm/{plat-s3c => plat-samsung}/time.c | 2 +- + arch/arm/plat-versatile/Makefile | 4 + + .../{mach-integrator => plat-versatile}/clock.c | 43 +- + arch/arm/plat-versatile/include/plat/clock.h | 15 + + arch/arm/plat-versatile/include/plat/timer-sp.h | 2 + + arch/arm/plat-versatile/sched-clock.c | 53 + + arch/arm/plat-versatile/timer-sp.c | 156 ++ + drivers/Makefile | 1 + + drivers/i2c/busses/Kconfig | 2 +- + drivers/input/keyboard/locomokbd.c | 32 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/pcmcia/sa1111_generic.c | 25 +- + drivers/serial/Kconfig | 31 +- + drivers/serial/Makefile | 1 + + drivers/serial/imx.c | 2 +- + drivers/serial/s3c2412.c | 1 + + drivers/serial/s5pv210.c | 154 ++ + drivers/serial/samsung.c | 6 +- + drivers/serial/samsung.h | 19 +- + drivers/serial/sh-sci.h | 22 +- + drivers/sh/intc.c | 10 +- + drivers/usb/gadget/fsl_mx3_udc.c | 31 +- + drivers/usb/gadget/pxa25x_udc.c | 4 + + drivers/usb/gadget/s3c-hsotg.c | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/amba-clcd.c | 31 +- + include/linux/amba/clcd.h | 33 +- + sound/arm/pxa2xx-ac97-lib.c | 68 +- + sound/soc/pxa/pxa-ssp.c | 93 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- + 706 files changed, 47674 insertions(+), 11972 deletions(-) + create mode 100644 Documentation/arm/Samsung/Overview.txt + create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk + create mode 100644 arch/arm/common/icst.c + delete mode 100644 arch/arm/common/icst307.c + delete mode 100644 arch/arm/common/icst525.c + create mode 100644 arch/arm/configs/ap4evb_defconfig + create mode 100644 arch/arm/configs/g3evm_defconfig + create mode 100644 arch/arm/configs/g4evm_defconfig + create mode 100644 arch/arm/configs/imote2_defconfig + create mode 100644 arch/arm/configs/mmp2_defconfig + delete mode 100644 arch/arm/configs/mx1ads_defconfig + create mode 100644 arch/arm/configs/mx51_defconfig + create mode 100644 arch/arm/configs/raumfeld_defconfig + create mode 100644 arch/arm/configs/s5p6440_defconfig + create mode 100644 arch/arm/configs/s5p6442_defconfig + create mode 100644 arch/arm/configs/s5pc110_defconfig + create mode 100644 arch/arm/configs/s5pv210_defconfig + rename arch/arm/{mach-s3c6400/include/mach/entry-macro.S => include/asm/entry-macro-vic2.S} (50%) + create mode 100644 arch/arm/include/asm/hardware/icst.h + delete mode 100644 arch/arm/include/asm/hardware/icst307.h + delete mode 100644 arch/arm/include/asm/hardware/icst525.h + delete mode 100644 arch/arm/mach-integrator/common.h + create mode 100644 arch/arm/mach-kirkwood/openrd-setup.c + delete mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c + create mode 100644 arch/arm/mach-mmp/avengers_lite.c + create mode 100644 arch/arm/mach-mmp/flint.c + create mode 100644 arch/arm/mach-mmp/include/mach/mfp-mmp2.h + create mode 100644 arch/arm/mach-mmp/include/mach/mmp2.h + create mode 100644 arch/arm/mach-mmp/irq-mmp2.c + rename arch/arm/mach-mmp/{irq.c => irq-pxa168.c} (100%) + create mode 100644 arch/arm/mach-mmp/jasper.c + create mode 100644 arch/arm/mach-mmp/mmp2.c + create mode 100644 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c + create mode 100644 arch/arm/mach-mv78xx0/mpp.c + create mode 100644 arch/arm/mach-mv78xx0/mpp.h + rename arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} (95%) + rename arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} (98%) + delete mode 100644 arch/arm/mach-mx2/crm_regs.h + rename arch/arm/mach-mx2/{eukrea_cpuimx27.c => mach-cpuimx27.c} (91%) + rename arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} (93%) + rename arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} (94%) + rename arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} (93%) + rename arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} (96%) + rename arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} (96%) + create mode 100644 arch/arm/mach-mx2/mach-pca100.c + rename arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} (89%) + copy arch/arm/mach-mx2/{generic.c => mm-imx21.c} (66%) + rename arch/arm/mach-mx2/{generic.c => mm-imx27.c} (67%) + delete mode 100644 arch/arm/mach-mx2/pca100.c + rename arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} (68%) + rename arch/arm/mach-mx3/{clock.c => clock-imx31.c} (99%) + rename arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} (98%) + rename arch/arm/mach-mx3/{armadillo5x0.c => mach-armadillo5x0.c} (97%) + rename arch/arm/mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} (89%) + rename arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} (96%) + rename arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} (94%) + rename arch/arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} (96%) + rename arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} (95%) + rename arch/arm/mach-mx3/{mx31moboard.c => mach-mx31moboard.c} (93%) + rename arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} (95%) + rename arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} (82%) + rename arch/arm/mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} (100%) + create mode 100644 arch/arm/mach-mx3/mach-pcm043.c + rename arch/arm/mach-mx3/{qong.c => mach-qong.c} (93%) + create mode 100644 arch/arm/mach-mx3/mx31moboard-smartbot.c + delete mode 100644 arch/arm/mach-mx3/pcm043.c + create mode 100644 arch/arm/mach-mx5/Kconfig + create mode 100644 arch/arm/mach-mx5/Makefile + create mode 100644 arch/arm/mach-mx5/Makefile.boot + create mode 100644 arch/arm/mach-mx5/board-mx51_babbage.c + create mode 100644 arch/arm/mach-mx5/clock-mx51.c + create mode 100644 arch/arm/mach-mx5/cpu.c + create mode 100644 arch/arm/mach-mx5/crm_regs.h + create mode 100644 arch/arm/mach-mx5/devices.c + create mode 100644 arch/arm/mach-mx5/devices.h + create mode 100644 arch/arm/mach-mx5/mm.c + create mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c + create mode 100644 arch/arm/mach-pxa/capc7117.c + create mode 100644 arch/arm/mach-pxa/icontrol.c + create mode 100644 arch/arm/mach-pxa/include/mach/mxm8x10.h + create mode 100644 arch/arm/mach-pxa/mxm8x10.c + create mode 100644 arch/arm/mach-pxa/raumfeld.c + delete mode 100644 arch/arm/mach-realview/clock.c + delete mode 100644 arch/arm/mach-realview/clock.h + rename arch/arm/mach-s3c2410/include/mach/{gpio-core.h => gpio-track.h} (96%) + rename arch/arm/{plat-s3c24xx/include/plat => mach-s3c2410/include/mach}/pm-core.h (97%) + copy arch/arm/{plat-s3c => mach-s3c2410}/include/mach/timex.h (99%) + copy arch/arm/{plat-s3c => mach-s3c2410}/include/mach/vmalloc.h (85%) + rename arch/arm/{mach-s3c2442 => mach-s3c2440}/include/mach/gta02.h (100%) + rename arch/arm/{mach-s3c2442 => mach-s3c2440}/mach-gta02.c (99%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-12000000.c (98%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-16934400.c (99%) + rename arch/arm/{mach-s3c2442/clock.c => mach-s3c2440/s3c2442.c} (90%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c (97%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c (100%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c (98%) + delete mode 100644 arch/arm/mach-s3c2442/Kconfig + delete mode 100644 arch/arm/mach-s3c2442/Makefile + delete mode 100644 arch/arm/mach-s3c2442/s3c2442.c + copy arch/arm/{plat-s3c => mach-s3c24a0}/include/mach/io.h (72%) + delete mode 100644 arch/arm/mach-s3c6400/Kconfig + delete mode 100644 arch/arm/mach-s3c6400/Makefile + delete mode 100644 arch/arm/mach-s3c6400/include/mach/dma.h + delete mode 100644 arch/arm/mach-s3c6400/include/mach/gpio-core.h + delete mode 100644 arch/arm/mach-s3c6400/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s3c6400/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s3c6410/Kconfig + delete mode 100644 arch/arm/mach-s3c6410/Makefile + delete mode 100644 arch/arm/mach-s3c6410/setup-sdhci.c + create mode 100644 arch/arm/mach-s3c64xx/Kconfig + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/Makefile (52%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/Makefile.boot (100%) + create mode 100644 arch/arm/mach-s3c64xx/clock.c + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c (89%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c (100%) + create mode 100644 arch/arm/mach-s3c64xx/dev-adc.c + create mode 100644 arch/arm/mach-s3c64xx/dev-audio.c + create mode 100644 arch/arm/mach-s3c64xx/dev-rtc.c + create mode 100644 arch/arm/mach-s3c64xx/dev-spi.c + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c (85%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c (99%) + create mode 100644 arch/arm/mach-s3c64xx/gpiolib.c + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/debug-macro.S (97%) + rename arch/arm/{plat-s3c64xx/include/plat/dma-plat.h => mach-s3c64xx/include/mach/dma.h} (53%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/entry-macro.S + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-a.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-b.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-c.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-d.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-e.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-f.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-g.h (95%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-h.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-i.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-j.h (95%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-n.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-o.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-p.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-q.h (96%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/gpio.h (96%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/hardware.h (100%) + copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/io.h (72%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/irqs.h (93%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/map.h (81%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/memory.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pll.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pm-core.h (97%) + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/pwm-clock.h (100%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-clock.h + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-fb.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio-memport.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio.h (100%) + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-irq.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-modem.h (100%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-srom.h + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-sys.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-syscon-power.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6400.h (87%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6410.h (93%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/spi-clocks.h + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/system.h (100%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/tick.h (93%) + copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/timex.h (89%) + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/uncompress.h (100%) + copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/vmalloc.h (80%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c (99%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c (99%) + create mode 100644 arch/arm/mach-s3c64xx/irq.c + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c (97%) + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c (99%) + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c (97%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c (97%) + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c (62%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c (95%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c (87%) + rename arch/arm/{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} (81%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-fb-24bpp.c (100%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c (96%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c (96%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-sdhci-gpio.c (100%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/setup-sdhci.c (78%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S (97%) + create mode 100644 arch/arm/mach-s5p6440/Kconfig + create mode 100644 arch/arm/mach-s5p6440/Makefile + create mode 100644 arch/arm/mach-s5p6440/Makefile.boot + create mode 100644 arch/arm/mach-s5p6440/clock.c + create mode 100644 arch/arm/mach-s5p6440/cpu.c + create mode 100644 arch/arm/mach-s5p6440/gpio.c + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/debug-macro.S (77%) + create mode 100644 arch/arm/mach-s5p6440/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/hardware.h + copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/io.h (72%) + create mode 100644 arch/arm/mach-s5p6440/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/map.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/memory.h + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/pwm-clock.h (65%) + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-gpio.h + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/regs-irq.h (52%) + create mode 100644 arch/arm/mach-s5p6440/include/mach/system.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/tick.h + copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/timex.h (89%) + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/uncompress.h (61%) + copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/vmalloc.h (51%) + create mode 100644 arch/arm/mach-s5p6440/init.c + create mode 100644 arch/arm/mach-s5p6440/mach-smdk6440.c + create mode 100644 arch/arm/mach-s5p6442/Kconfig + create mode 100644 arch/arm/mach-s5p6442/Makefile + create mode 100644 arch/arm/mach-s5p6442/Makefile.boot + create mode 100644 arch/arm/mach-s5p6442/clock.c + create mode 100644 arch/arm/mach-s5p6442/cpu.c + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/debug-macro.S (55%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5p6442/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/hardware.h + copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/io.h (54%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/map.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/memory.h + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/pwm-clock.h (60%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/regs-clock.h + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/regs-irq.h (52%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/system.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/tick.h + copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/timex.h (83%) + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/uncompress.h (61%) + copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/vmalloc.h (51%) + create mode 100644 arch/arm/mach-s5p6442/init.c + create mode 100644 arch/arm/mach-s5p6442/mach-smdk6442.c + delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h + rename arch/arm/{plat-s3c => mach-s5pc100}/include/mach/io.h (72%) + copy arch/arm/{plat-s3c => mach-s5pc100}/include/mach/timex.h (89%) + rename arch/arm/{plat-s3c => mach-s5pc100}/include/mach/vmalloc.h (57%) + create mode 100644 arch/arm/mach-s5pv210/Kconfig + create mode 100644 arch/arm/mach-s5pv210/Makefile + create mode 100644 arch/arm/mach-s5pv210/Makefile.boot + create mode 100644 arch/arm/mach-s5pv210/clock.c + create mode 100644 arch/arm/mach-s5pv210/cpu.c + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/debug-macro.S (75%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5pv210/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/hardware.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/io.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/map.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/memory.h + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/pwm-clock.h (59%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-clock.h + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/regs-irq.h (52%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/system.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/tick.h + rename arch/arm/{plat-s3c => mach-s5pv210}/include/mach/timex.h (66%) + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/uncompress.h (61%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-s5pv210/init.c + create mode 100644 arch/arm/mach-s5pv210/mach-smdkc110.c + create mode 100644 arch/arm/mach-s5pv210/mach-smdkv210.c + create mode 100644 arch/arm/mach-shmobile/Kconfig + create mode 100644 arch/arm/mach-shmobile/Makefile + create mode 100644 arch/arm/mach-shmobile/Makefile.boot + create mode 100644 arch/arm/mach-shmobile/board-ap4evb.c + create mode 100644 arch/arm/mach-shmobile/board-g3evm.c + create mode 100644 arch/arm/mach-shmobile/board-g4evm.c + create mode 100644 arch/arm/mach-shmobile/clock-sh7367.c + create mode 100644 arch/arm/mach-shmobile/console.c + create mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h + create mode 100644 arch/arm/mach-shmobile/include/mach/common.h + create mode 100644 arch/arm/mach-shmobile/include/mach/dma.h + create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-shmobile/include/mach/gpio.h + create mode 100644 arch/arm/mach-shmobile/include/mach/hardware.h + create mode 100644 arch/arm/mach-shmobile/include/mach/io.h + create mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h + create mode 100644 arch/arm/mach-shmobile/include/mach/memory.h + create mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h + create mode 100644 arch/arm/mach-shmobile/include/mach/sh7372.h + create mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h + create mode 100644 arch/arm/mach-shmobile/include/mach/system.h + create mode 100644 arch/arm/mach-shmobile/include/mach/timex.h + create mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h + create mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-shmobile/intc-sh7367.c + create mode 100644 arch/arm/mach-shmobile/intc-sh7372.c + create mode 100644 arch/arm/mach-shmobile/intc-sh7377.c + create mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c + create mode 100644 arch/arm/mach-shmobile/pfc-sh7372.c + create mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c + create mode 100644 arch/arm/mach-shmobile/setup-sh7367.c + create mode 100644 arch/arm/mach-shmobile/setup-sh7372.c + create mode 100644 arch/arm/mach-shmobile/setup-sh7377.c + create mode 100644 arch/arm/mach-shmobile/timer.c + delete mode 100644 arch/arm/mach-versatile/clock.c + delete mode 100644 arch/arm/mach-versatile/clock.h + create mode 100644 arch/arm/mach-vexpress/Kconfig + create mode 100644 arch/arm/mach-vexpress/Makefile + create mode 100644 arch/arm/mach-vexpress/Makefile.boot + create mode 100644 arch/arm/mach-vexpress/core.h + create mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c + create mode 100644 arch/arm/mach-vexpress/headsmp.S + create mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h + create mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h + create mode 100644 arch/arm/mach-vexpress/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h + create mode 100644 arch/arm/mach-vexpress/include/mach/io.h + create mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h + create mode 100644 arch/arm/mach-vexpress/include/mach/memory.h + create mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h + create mode 100644 arch/arm/mach-vexpress/include/mach/smp.h + create mode 100644 arch/arm/mach-vexpress/include/mach/system.h + create mode 100644 arch/arm/mach-vexpress/include/mach/timex.h + create mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h + create mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-vexpress/localtimer.c + create mode 100644 arch/arm/mach-vexpress/platsmp.c + create mode 100644 arch/arm/mach-vexpress/v2m.c + create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx51.h + create mode 100644 arch/arm/plat-mxc/include/mach/iomux-v1.h + delete mode 100644 arch/arm/plat-mxc/include/mach/mtd-xip.h + create mode 100644 arch/arm/plat-mxc/include/mach/mx51.h + create mode 100644 arch/arm/plat-mxc/include/mach/ssi.h + delete mode 100644 arch/arm/plat-mxc/iomux-mx1-mx2.c + create mode 100644 arch/arm/plat-mxc/iomux-v1.c + create mode 100644 arch/arm/plat-mxc/tzic.c + delete mode 100644 arch/arm/plat-s3c/Kconfig + delete mode 100644 arch/arm/plat-s3c/Makefile + delete mode 100644 arch/arm/plat-s3c/dev-usb.c + rename arch/arm/{plat-s3c => plat-s3c24xx}/include/plat/audio-simtec.h (95%) + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2440.h + rename arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h (72%) + delete mode 100644 arch/arm/plat-s3c64xx/Kconfig + delete mode 100644 arch/arm/plat-s3c64xx/clock.c + delete mode 100644 arch/arm/plat-s3c64xx/dev-audio.c + delete mode 100644 arch/arm/plat-s3c64xx/gpiolib.c + delete mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-clock.h + delete mode 100644 arch/arm/plat-s3c64xx/irq.c + delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-clock.c + delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-init.c + create mode 100644 arch/arm/plat-s5p/Kconfig + create mode 100644 arch/arm/plat-s5p/Makefile + create mode 100644 arch/arm/plat-s5p/clock.c + create mode 100644 arch/arm/plat-s5p/cpu.c + create mode 100644 arch/arm/plat-s5p/dev-uart.c + create mode 100644 arch/arm/plat-s5p/include/plat/irqs.h + create mode 100644 arch/arm/plat-s5p/include/plat/map-s5p.h + create mode 100644 arch/arm/plat-s5p/include/plat/pll.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5p-clock.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5p6440.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5p6442.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5pv210.h + create mode 100644 arch/arm/plat-s5p/irq.c + create mode 100644 arch/arm/plat-s5p/setup-i2c0.c + rename arch/arm/{plat-s3c24xx => plat-samsung}/adc.c (89%) + create mode 100644 arch/arm/plat-samsung/clock-clksrc.c + rename arch/arm/{plat-s3c => plat-samsung}/clock.c (78%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-fb.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-nand.c (100%) + create mode 100644 arch/arm/plat-samsung/dev-uart.c + rename arch/arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c (85%) + create mode 100644 arch/arm/plat-samsung/dev-usb.c + rename arch/arm/{plat-s3c => plat-samsung}/dma.c (96%) + rename arch/arm/{plat-s3c => plat-samsung}/gpio-config.c (99%) + rename arch/arm/{plat-s3c => plat-samsung}/gpio.c (99%) + create mode 100644 arch/arm/plat-samsung/gpiolib.c + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/adc.h (92%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/audio.h (64%) + create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (72%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu-freq.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu.h (91%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/debug-macro.S (81%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/devs.h (87%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma-core.h (100%) + rename arch/arm/{plat-s3c24xx/include/plat/dma-plat.h => plat-samsung/include/plat/dma-s3c24xx.h} (95%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/fb.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-cfg-helpers.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-cfg.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-core.h (76%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/hwmon.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic-core.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic.h (100%) + create mode 100644 arch/arm/plat-samsung/include/plat/irq-uart.h + rename arch/arm/{plat-s3c24xx/include/plat/s3c2442.h => plat-samsung/include/plat/irq-vic-timer.h} (50%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/map-base.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/nand.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/pm.h (97%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-ac97.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-adc.h (90%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb-v4.h (99%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb.h (99%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-iic.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-irqtype.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-nand.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-rtc.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-s3c2412-iis.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-sdhci.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-serial.h (88%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-timer.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg-phy.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-watchdog.h (100%) + create mode 100644 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/sdhci.h (87%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/udc-hs.h (93%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/uncompress.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/usb-control.h (89%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/watchdog-reset.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/init.c (100%) + create mode 100644 arch/arm/plat-samsung/irq-uart.c + create mode 100644 arch/arm/plat-samsung/irq-vic-timer.c + rename arch/arm/{plat-s3c => plat-samsung}/pm-check.c (95%) + rename arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c (99%) + rename arch/arm/{plat-s3c => plat-samsung}/pm.c (98%) + rename arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c (82%) + rename arch/arm/{plat-s3c => plat-samsung}/pwm.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/time.c (99%) + create mode 100644 arch/arm/plat-versatile/Makefile + rename arch/arm/{mach-integrator => plat-versatile}/clock.c (59%) + create mode 100644 arch/arm/plat-versatile/include/plat/clock.h + create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h + create mode 100644 arch/arm/plat-versatile/sched-clock.c + create mode 100644 arch/arm/plat-versatile/timer-sp.c + create mode 100644 drivers/serial/s5pv210.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/mach-davinci/dm355.c +Merge made by recursive. +Merging i.MX/for-next +$ git merge i.MX/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + arch/arm/mach-msm/Makefile | 3 +- + arch/arm/mach-msm/acpuclock-arm11.c | 526 ++++++++++++++++++++ + arch/arm/mach-msm/acpuclock.h | 32 ++ + arch/arm/mach-msm/board-halibut.c | 15 + + arch/arm/mach-msm/board-mahimahi.c | 87 ++++ + arch/arm/mach-msm/board-msm7x27.c | 179 +++++++ + arch/arm/mach-msm/board-msm7x30.c | 196 ++++++++ + arch/arm/mach-msm/board-qsd8x50.c | 176 +++++++ + arch/arm/mach-msm/board-sapphire.c | 118 +++++ + arch/arm/mach-msm/{board-dream.c => board-trout.c} | 4 +- + arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0 + arch/arm/mach-msm/dma.c | 23 +- + arch/arm/mach-msm/include/mach/board.h | 11 + + arch/arm/mach-msm/include/mach/vreg.h | 2 +- + arch/arm/mach-msm/irq.c | 4 +- + arch/arm/mach-msm/proc_comm.h | 102 ++++- + arch/arm/mach-msm/vreg.c | 154 +++++-- + 18 files changed, 1580 insertions(+), 53 deletions(-) + create mode 100644 arch/arm/mach-msm/acpuclock-arm11.c + create mode 100644 arch/arm/mach-msm/acpuclock.h + create mode 100644 arch/arm/mach-msm/board-mahimahi.c + create mode 100644 arch/arm/mach-msm/board-msm7x27.c + create mode 100644 arch/arm/mach-msm/board-msm7x30.c + create mode 100644 arch/arm/mach-msm/board-qsd8x50.c + create mode 100644 arch/arm/mach-msm/board-sapphire.c + rename arch/arm/mach-msm/{board-dream.c => board-trout.c} (97%) + rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%) +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mm/Kconfig +Auto-merging drivers/usb/musb/tusb6010_omap.c +Merge made by recursive. + arch/arm/Kconfig | 2 +- + arch/arm/mach-omap2/board-4430sdp.c | 2 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 12 ++++++------ + arch/arm/mm/Kconfig | 2 +- + drivers/usb/musb/tusb6010_omap.c | 8 ++++---- + drivers/video/omap2/vram.c | 14 +++++++++----- + 6 files changed, 22 insertions(+), 18 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig | 81 +- + arch/blackfin/Kconfig.debug | 12 +- + arch/blackfin/Makefile | 7 +- + arch/blackfin/boot/Makefile | 23 +- + arch/blackfin/configs/BF518F-EZBRD_defconfig | 270 +++-- + arch/blackfin/configs/BF526-EZBRD_defconfig | 336 +++-- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 1811 +++++++++++++++++++++++ + arch/blackfin/configs/BF527-EZKIT_defconfig | 344 +++-- + arch/blackfin/configs/BF533-EZKIT_defconfig | 250 ++-- + arch/blackfin/configs/BF533-STAMP_defconfig | 295 +++-- + arch/blackfin/configs/BF537-STAMP_defconfig | 332 +++-- + arch/blackfin/configs/BF538-EZKIT_defconfig | 291 +++-- + arch/blackfin/configs/BF548-EZKIT_defconfig | 108 +- + arch/blackfin/configs/BF561-ACVILON_defconfig | 15 +- + arch/blackfin/configs/BF561-EZKIT_defconfig | 82 +- + arch/blackfin/configs/H8606_defconfig | 7 - + arch/blackfin/configs/PNAV-10_defconfig | 295 +++-- + arch/blackfin/configs/TCM-BF518_defconfig | 1375 +++++++++++++++++ + arch/blackfin/include/asm/bfin-lq035q1.h | 12 + + arch/blackfin/include/asm/bfin_can.h | 725 +++++++++ + arch/blackfin/include/asm/bfin_sport.h | 227 ++-- + arch/blackfin/include/asm/bfin_watchdog.h | 30 + + arch/blackfin/include/asm/bitops.h | 74 +- + arch/blackfin/include/asm/context.S | 22 + + arch/blackfin/include/asm/cpu.h | 2 - + arch/blackfin/include/asm/def_LPBlackfin.h | 58 +- + arch/blackfin/include/asm/delay.h | 16 +- + arch/blackfin/include/asm/dma-mapping.h | 15 +- + arch/blackfin/include/asm/dma.h | 4 + + arch/blackfin/include/asm/dpmc.h | 4 +- + arch/blackfin/include/asm/elf.h | 8 +- + arch/blackfin/include/asm/ftrace.h | 53 + + arch/blackfin/include/asm/gpio.h | 17 +- + arch/blackfin/include/asm/irq.h | 7 + + arch/blackfin/include/asm/mmu_context.h | 14 +- + arch/blackfin/include/asm/nmi.h | 12 + + arch/blackfin/include/asm/page.h | 3 + + arch/blackfin/include/asm/ptrace.h | 25 + + arch/blackfin/include/asm/sections.h | 3 + + arch/blackfin/include/asm/smp.h | 15 + + arch/blackfin/include/asm/syscall.h | 96 ++ + arch/blackfin/include/asm/thread_info.h | 25 +- + arch/blackfin/include/asm/time.h | 13 +- + arch/blackfin/kernel/Makefile | 1 + + arch/blackfin/kernel/bfin_dma_5xx.c | 10 +- + arch/blackfin/kernel/bfin_gpio.c | 20 +- + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 9 + + arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 54 +- + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 9 + + arch/blackfin/kernel/dma-mapping.c | 2 +- + arch/blackfin/kernel/entry.S | 8 +- + arch/blackfin/kernel/ftrace-entry.S | 23 +- + arch/blackfin/kernel/ftrace.c | 6 +- + arch/blackfin/kernel/init_task.c | 2 +- + arch/blackfin/kernel/kgdb.c | 10 +- + arch/blackfin/kernel/nmi.c | 299 ++++ + arch/blackfin/kernel/process.c | 7 - + arch/blackfin/kernel/ptrace.c | 360 ++--- + arch/blackfin/kernel/setup.c | 34 +- + arch/blackfin/kernel/signal.c | 24 +- + arch/blackfin/kernel/time-ts.c | 205 ++-- + arch/blackfin/kernel/traps.c | 32 +- + arch/blackfin/kernel/vmlinux.lds.S | 70 +- + arch/blackfin/mach-bf518/boards/Kconfig | 5 + + arch/blackfin/mach-bf518/boards/Makefile | 1 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 178 +++- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 753 ++++++++++ + arch/blackfin/mach-bf518/include/mach/irq.h | 12 +- + arch/blackfin/mach-bf518/include/mach/mem_map.h | 2 +- + arch/blackfin/mach-bf527/boards/Kconfig | 5 + + arch/blackfin/mach-bf527/boards/Makefile | 1 + + arch/blackfin/mach-bf527/boards/cm_bf527.c | 245 +++- + arch/blackfin/mach-bf527/boards/ezbrd.c | 199 +++- + arch/blackfin/mach-bf527/boards/ezkit.c | 431 +++++-- + arch/blackfin/mach-bf527/include/mach/irq.h | 12 +- + arch/blackfin/mach-bf533/boards/H8606.c | 66 +- + arch/blackfin/mach-bf533/boards/blackstamp.c | 134 ++- + arch/blackfin/mach-bf533/boards/cm_bf533.c | 138 ++- + arch/blackfin/mach-bf533/boards/ezkit.c | 102 ++- + arch/blackfin/mach-bf533/boards/ip0x.c | 63 +- + arch/blackfin/mach-bf533/boards/stamp.c | 174 ++- + arch/blackfin/mach-bf533/include/mach/irq.h | 3 +- + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 116 ++- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 187 +++- + arch/blackfin/mach-bf537/boards/minotaur.c | 183 +++- + arch/blackfin/mach-bf537/boards/pnav10.c | 169 ++- + arch/blackfin/mach-bf537/boards/stamp.c | 684 ++++++++- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 187 +++- + arch/blackfin/mach-bf537/include/mach/irq.h | 12 +- + arch/blackfin/mach-bf538/boards/ezkit.c | 346 ++++- + arch/blackfin/mach-bf538/include/mach/irq.h | 3 +- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 399 +++++- + arch/blackfin/mach-bf548/boards/ezkit.c | 443 ++++++- + arch/blackfin/mach-bf548/include/mach/irq.h | 3 +- + arch/blackfin/mach-bf561/Makefile | 1 + + arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 66 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 70 +- + arch/blackfin/mach-bf561/boards/tepla.c | 68 + + arch/blackfin/mach-bf561/hotplug.c | 32 + + arch/blackfin/mach-bf561/include/mach/irq.h | 3 +- + arch/blackfin/mach-bf561/include/mach/smp.h | 2 + + arch/blackfin/mach-bf561/secondary.S | 50 +- + arch/blackfin/mach-bf561/smp.c | 44 +- + arch/blackfin/mach-common/cpufreq.c | 168 ++- + arch/blackfin/mach-common/entry.S | 81 +- + arch/blackfin/mach-common/head.S | 16 +- + arch/blackfin/mach-common/interrupt.S | 35 +- + arch/blackfin/mach-common/ints-priority.c | 208 +++- + arch/blackfin/mach-common/smp.c | 87 +- + arch/blackfin/mm/isram-driver.c | 6 +- + arch/blackfin/mm/sram-alloc.c | 27 +- + 112 files changed, 12548 insertions(+), 2273 deletions(-) + create mode 100644 arch/blackfin/configs/BF527-EZKIT-V2_defconfig + create mode 100644 arch/blackfin/configs/TCM-BF518_defconfig + create mode 100644 arch/blackfin/include/asm/bfin_can.h + create mode 100644 arch/blackfin/include/asm/bfin_watchdog.h + create mode 100644 arch/blackfin/include/asm/nmi.h + create mode 100644 arch/blackfin/include/asm/syscall.h + create mode 100644 arch/blackfin/kernel/nmi.c + create mode 100644 arch/blackfin/mach-bf518/boards/tcm-bf518.c + create mode 100644 arch/blackfin/mach-bf561/hotplug.c +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already uptodate! +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merging fs/binfmt_flat.c +Merge made by recursive. + arch/m68k/include/asm/m520xsim.h | 4 + + arch/m68k/include/asm/m523xsim.h | 8 + + arch/m68k/include/asm/m5249sim.h | 6 +- + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 67 +--------- + arch/m68k/include/asm/m532xsim.h | 1 + + arch/m68k/include/asm/mcfqspi.h | 64 +++++++++ + arch/m68knommu/Kconfig | 4 + + arch/m68knommu/Makefile | 2 +- + arch/m68knommu/kernel/entry.S | 2 +- + arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++ + arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++ + arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++ + arch/m68knommu/platform/5272/intc.c | 39 +++++- + arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++ + arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++ + arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++ + arch/m68knommu/platform/68328/ints.c | 8 +- + arch/m68knommu/platform/68360/ints.c | 8 +- + arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++- + arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++- + arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++- + fs/binfmt_flat.c | 2 +- + 23 files changed, 1252 insertions(+), 105 deletions(-) + create mode 100644 arch/m68k/include/asm/mcfqspi.h +Merging microblaze/next +$ git merge microblaze/next +Resolved 'arch/microblaze/include/asm/prom.h' using previous resolution. +Auto-merging arch/microblaze/Kconfig +Auto-merging arch/microblaze/include/asm/prom.h +CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h +Auto-merging arch/microblaze/include/asm/tlbflush.h +Auto-merging drivers/pci/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3ae67df] Merge remote branch 'microblaze/next' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/Kconfig | 64 +- + arch/microblaze/Makefile | 1 + + arch/microblaze/include/asm/device.h | 4 + + arch/microblaze/include/asm/dma-mapping.h | 154 +++- + arch/microblaze/include/asm/io.h | 31 +- + arch/microblaze/include/asm/irq.h | 37 +- + arch/microblaze/include/asm/page.h | 12 +- + arch/microblaze/include/asm/pci-bridge.h | 195 ++++ + arch/microblaze/include/asm/pci.h | 178 ++++- + arch/microblaze/include/asm/pgalloc.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 40 +- + arch/microblaze/include/asm/prom.h | 15 + + arch/microblaze/include/asm/system.h | 3 + + arch/microblaze/include/asm/tlbflush.h | 2 +- + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/asm-offsets.c | 1 + + arch/microblaze/kernel/cpu/cache.c | 111 ++- + arch/microblaze/kernel/dma.c | 156 +++ + arch/microblaze/kernel/entry.S | 111 +- + arch/microblaze/kernel/head.S | 13 +- + arch/microblaze/kernel/irq.c | 15 + + arch/microblaze/kernel/setup.c | 45 +- + arch/microblaze/kernel/traps.c | 10 +- + arch/microblaze/mm/Makefile | 2 +- + arch/microblaze/mm/consistent.c | 246 +++++ + arch/microblaze/mm/init.c | 39 +- + arch/microblaze/mm/pgtable.c | 2 +- + arch/microblaze/pci/Makefile | 6 + + arch/microblaze/pci/indirect_pci.c | 163 +++ + arch/microblaze/pci/iomap.c | 39 + + arch/microblaze/pci/pci-common.c | 1642 +++++++++++++++++++++++++++++ + arch/microblaze/pci/pci_32.c | 430 ++++++++ + arch/microblaze/pci/xilinx_pci.c | 168 +++ + arch/powerpc/sysdev/xilinx_pci.c | 4 +- + drivers/pci/Makefile | 1 + + include/asm-generic/dma-mapping-common.h | 10 + + 36 files changed, 3783 insertions(+), 171 deletions(-) + create mode 100644 arch/microblaze/kernel/dma.c + create mode 100644 arch/microblaze/mm/consistent.c + create mode 100644 arch/microblaze/pci/Makefile + create mode 100644 arch/microblaze/pci/indirect_pci.c + create mode 100644 arch/microblaze/pci/iomap.c + create mode 100644 arch/microblaze/pci/pci-common.c + create mode 100644 arch/microblaze/pci/pci_32.c + create mode 100644 arch/microblaze/pci/xilinx_pci.c +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Resolved 'arch/mips/alchemy/common/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/common/setup.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/db1200/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/db1x00/board_setup.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/pb1100/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/pb1200/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/platform.h' using previous resolution. +Resolved 'arch/mips/alchemy/xxs1500/platform.c' using previous resolution. +Resolved 'arch/mips/cavium-octeon/octeon-irq.c' using previous resolution. +Resolved 'arch/mips/configs/db1200_defconfig' using previous resolution. +Resolved 'arch/mips/include/asm/mach-au1x00/au1000.h' using previous resolution. +Resolved 'drivers/i2c/busses/Kconfig' using previous resolution. +Resolved 'drivers/i2c/busses/Makefile' using previous resolution. +Resolved 'drivers/pcmcia/au1000_generic.h' using previous resolution. +Resolved 'drivers/pcmcia/db1xxx_ss.c' using previous resolution. +Resolved 'drivers/pcmcia/xxs1500_ss.c' using previous resolution. +Renaming arch/mips/mm/uasm.h->arch/mips/include/asm/uasm.h +Auto-merging arch/mips/include/asm/uasm.h +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/alchemy/common/platform.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/common/platform.c +Auto-merging arch/mips/alchemy/common/setup.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/common/setup.c +Auto-merging arch/mips/alchemy/devboards/db1200/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1200/platform.c +Auto-merging arch/mips/alchemy/devboards/db1x00/board_setup.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/board_setup.c +Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1100/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1100/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1200/platform.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/pb1200/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1500/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1500/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1550/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1550/platform.c +Auto-merging arch/mips/alchemy/devboards/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.c +Auto-merging arch/mips/alchemy/devboards/platform.h +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.h +Auto-merging arch/mips/alchemy/xxs1500/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/xxs1500/platform.c +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/configs/db1200_defconfig +CONFLICT (content): Merge conflict in arch/mips/configs/db1200_defconfig +Auto-merging arch/mips/include/asm/mach-au1x00/au1000.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-au1x00/au1000.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/mm/init.c +Auto-merging drivers/i2c/busses/Kconfig +CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile +Auto-merging drivers/ide/au1xxx-ide.c +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/maps/Makefile +Auto-merging drivers/net/au1000_eth.c +Auto-merging drivers/net/cpmac.c +Auto-merging drivers/pcmcia/Kconfig +Auto-merging drivers/pcmcia/Makefile +Auto-merging drivers/pcmcia/au1000_generic.h +CONFLICT (content): Merge conflict in drivers/pcmcia/au1000_generic.h +Auto-merging drivers/pcmcia/db1xxx_ss.c +CONFLICT (add/add): Merge conflict in drivers/pcmcia/db1xxx_ss.c +Auto-merging drivers/pcmcia/xxs1500_ss.c +CONFLICT (add/add): Merge conflict in drivers/pcmcia/xxs1500_ss.c +Auto-merging drivers/serial/8250.c +Auto-merging drivers/staging/octeon/ethernet.c +CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.c left in tree. +CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.h left in tree. +Auto-merging drivers/staging/sm7xx/smtcfb.c +Auto-merging drivers/watchdog/ar7_wdt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h +arch/mips/alchemy/common/platform.c: needs merge +arch/mips/alchemy/common/setup.c: needs merge +arch/mips/alchemy/devboards/db1200/platform.c: needs merge +arch/mips/alchemy/devboards/db1x00/board_setup.c: needs merge +arch/mips/alchemy/devboards/db1x00/platform.c: needs merge +arch/mips/alchemy/devboards/pb1100/platform.c: needs merge +arch/mips/alchemy/devboards/pb1200/platform.c: needs merge +arch/mips/alchemy/devboards/pb1500/platform.c: needs merge +arch/mips/alchemy/devboards/pb1550/platform.c: needs merge +arch/mips/alchemy/devboards/platform.c: needs merge +arch/mips/alchemy/devboards/platform.h: needs merge +arch/mips/alchemy/xxs1500/platform.c: needs merge +arch/mips/cavium-octeon/octeon-irq.c: needs merge +arch/mips/configs/db1200_defconfig: needs merge +arch/mips/include/asm/mach-au1x00/au1000.h: needs merge +drivers/i2c/busses/Kconfig: needs merge +drivers/i2c/busses/Makefile: needs merge +drivers/pcmcia/au1000_generic.h: needs merge +drivers/pcmcia/db1xxx_ss.c: needs merge +drivers/pcmcia/xxs1500_ss.c: needs merge +drivers/staging/sm7xx/smtc2d.c: needs merge +drivers/staging/sm7xx/smtc2d.h: needs merge +rm 'drivers/staging/sm7xx/smtc2d.c' +rm 'drivers/staging/sm7xx/smtc2d.h' +$ git commit -v -a +Recorded resolution for 'arch/mips/alchemy/devboards/db1x00/platform.c'. +Recorded resolution for 'arch/mips/alchemy/devboards/pb1500/platform.c'. +Recorded resolution for 'arch/mips/alchemy/devboards/pb1550/platform.c'. +[master a71a197] Merge remote branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Auto-merging drivers/sh/intc.c +Merge made by recursive. + arch/sh/mm/uncached.c | 5 +++++ + drivers/sh/intc.c | 31 ++++++++++++++++++++++++++++++- + 2 files changed, 35 insertions(+), 1 deletions(-) +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'fs/gfs2/super.c' using previous resolution. +Resolved 'fs/nfs/inode.c' using previous resolution. +Resolved 'fs/ufs/inode.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Auto-merging fs/Makefile +Auto-merging fs/affs/affs.h +Auto-merging fs/bfs/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/exofs/exofs.h +Auto-merging fs/exofs/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/gfs2/super.c +CONFLICT (content): Merge conflict in fs/gfs2/super.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/jfs/jfs_inode.h +Auto-merging fs/nfs/inode.c +CONFLICT (content): Merge conflict in fs/nfs/inode.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/udf/inode.c +Auto-merging fs/ufs/inode.c +CONFLICT (content): Merge conflict in fs/ufs/inode.c +Auto-merging fs/ufs/ufs.h +Auto-merging fs/xfs/linux-2.6/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/ext3_fs.h +Auto-merging include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8935440] Merge remote branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ceph.txt | 139 ++ + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ceph/Kconfig | 27 + + fs/ceph/Makefile | 39 + + fs/ceph/README | 20 + + fs/ceph/addr.c | 1188 +++++++++++++ + fs/ceph/armor.c | 99 ++ + fs/ceph/auth.c | 257 +++ + fs/ceph/auth.h | 84 + + fs/ceph/auth_none.c | 121 ++ + fs/ceph/auth_none.h | 28 + + fs/ceph/auth_x.c | 656 ++++++++ + fs/ceph/auth_x.h | 49 + + fs/ceph/auth_x_protocol.h | 90 + + fs/ceph/buffer.c | 78 + + fs/ceph/buffer.h | 39 + + fs/ceph/caps.c | 2927 ++++++++++++++++++++++++++++++++ + fs/ceph/ceph_debug.h | 37 + + fs/ceph/ceph_frag.c | 21 + + fs/ceph/ceph_frag.h | 109 ++ + fs/ceph/ceph_fs.c | 74 + + fs/ceph/ceph_fs.h | 650 ++++++++ + fs/ceph/ceph_hash.c | 118 ++ + fs/ceph/ceph_hash.h | 13 + + fs/ceph/ceph_strings.c | 176 ++ + fs/ceph/crush/crush.c | 151 ++ + fs/ceph/crush/crush.h | 180 ++ + fs/ceph/crush/hash.c | 149 ++ + fs/ceph/crush/hash.h | 17 + + fs/ceph/crush/mapper.c | 596 +++++++ + fs/ceph/crush/mapper.h | 20 + + fs/ceph/crypto.c | 408 +++++ + fs/ceph/crypto.h | 48 + + fs/ceph/debugfs.c | 483 ++++++ + fs/ceph/decode.h | 194 +++ + fs/ceph/dir.c | 1220 ++++++++++++++ + fs/ceph/export.c | 223 +++ + fs/ceph/file.c | 937 +++++++++++ + fs/ceph/inode.c | 1750 ++++++++++++++++++++ + fs/ceph/ioctl.c | 160 ++ + fs/ceph/ioctl.h | 40 + + fs/ceph/mds_client.c | 3021 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 335 ++++ + fs/ceph/mdsmap.c | 174 ++ + fs/ceph/mdsmap.h | 54 + + fs/ceph/messenger.c | 2240 +++++++++++++++++++++++++ + fs/ceph/messenger.h | 254 +++ + fs/ceph/mon_client.c | 834 ++++++++++ + fs/ceph/mon_client.h | 119 ++ + fs/ceph/msgpool.c | 186 +++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 158 ++ + fs/ceph/osd_client.c | 1537 +++++++++++++++++ + fs/ceph/osd_client.h | 166 ++ + fs/ceph/osdmap.c | 1019 ++++++++++++ + fs/ceph/osdmap.h | 125 ++ + fs/ceph/pagelist.c | 54 + + fs/ceph/pagelist.h | 54 + + fs/ceph/rados.h | 374 +++++ + fs/ceph/snap.c | 904 ++++++++++ + fs/ceph/super.c | 1030 ++++++++++++ + fs/ceph/super.h | 901 ++++++++++ + fs/ceph/types.h | 29 + + fs/ceph/xattr.c | 844 ++++++++++ + 67 files changed, 28066 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/ceph.txt + create mode 100644 fs/ceph/Kconfig + create mode 100644 fs/ceph/Makefile + create mode 100644 fs/ceph/README + create mode 100644 fs/ceph/addr.c + create mode 100644 fs/ceph/armor.c + create mode 100644 fs/ceph/auth.c + create mode 100644 fs/ceph/auth.h + create mode 100644 fs/ceph/auth_none.c + create mode 100644 fs/ceph/auth_none.h + create mode 100644 fs/ceph/auth_x.c + create mode 100644 fs/ceph/auth_x.h + create mode 100644 fs/ceph/auth_x_protocol.h + create mode 100644 fs/ceph/buffer.c + create mode 100644 fs/ceph/buffer.h + create mode 100644 fs/ceph/caps.c + create mode 100644 fs/ceph/ceph_debug.h + create mode 100644 fs/ceph/ceph_frag.c + create mode 100644 fs/ceph/ceph_frag.h + create mode 100644 fs/ceph/ceph_fs.c + create mode 100644 fs/ceph/ceph_fs.h + create mode 100644 fs/ceph/ceph_hash.c + create mode 100644 fs/ceph/ceph_hash.h + create mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/crush/crush.c + create mode 100644 fs/ceph/crush/crush.h + create mode 100644 fs/ceph/crush/hash.c + create mode 100644 fs/ceph/crush/hash.h + create mode 100644 fs/ceph/crush/mapper.c + create mode 100644 fs/ceph/crush/mapper.h + create mode 100644 fs/ceph/crypto.c + create mode 100644 fs/ceph/crypto.h + create mode 100644 fs/ceph/debugfs.c + create mode 100644 fs/ceph/decode.h + create mode 100644 fs/ceph/dir.c + create mode 100644 fs/ceph/export.c + create mode 100644 fs/ceph/file.c + create mode 100644 fs/ceph/inode.c + create mode 100644 fs/ceph/ioctl.c + create mode 100644 fs/ceph/ioctl.h + create mode 100644 fs/ceph/mds_client.c + create mode 100644 fs/ceph/mds_client.h + create mode 100644 fs/ceph/mdsmap.c + create mode 100644 fs/ceph/mdsmap.h + create mode 100644 fs/ceph/messenger.c + create mode 100644 fs/ceph/messenger.h + create mode 100644 fs/ceph/mon_client.c + create mode 100644 fs/ceph/mon_client.h + create mode 100644 fs/ceph/msgpool.c + create mode 100644 fs/ceph/msgpool.h + create mode 100644 fs/ceph/msgr.h + create mode 100644 fs/ceph/osd_client.c + create mode 100644 fs/ceph/osd_client.h + create mode 100644 fs/ceph/osdmap.c + create mode 100644 fs/ceph/osdmap.h + create mode 100644 fs/ceph/pagelist.c + create mode 100644 fs/ceph/pagelist.h + create mode 100644 fs/ceph/rados.h + create mode 100644 fs/ceph/snap.c + create mode 100644 fs/ceph/super.c + create mode 100644 fs/ceph/super.h + create mode 100644 fs/ceph/types.h + create mode 100644 fs/ceph/xattr.c +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsfs.c | 3 +- + fs/cifs/cifsfs.h | 3 +- + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifsproto.h | 6 + + fs/cifs/cifssmb.c | 133 +++++++++++++++++++++++ + fs/cifs/dir.c | 2 +- + fs/cifs/file.c | 7 +- + fs/cifs/inode.c | 297 +++++++++++++++++++++++++++++++------------------- + 8 files changed, 332 insertions(+), 120 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Auto-merging fs/fat/inode.c +Merge made by recursive. + fs/fat/inode.c | 2 +- + fs/fat/namei_vfat.c | 27 +++++++++++++++++++-------- + include/linux/msdos_fs.h | 3 ++- + 3 files changed, 22 insertions(+), 10 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/Kconfig | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_dmap.c | 16 ++++++++-------- + fs/jfs/jfs_dmap.h | 6 +++--- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging logfs/master +$ git merge logfs/master +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + fs/nfs/callback_xdr.c | 1 + + fs/nfs/nfs4proc.c | 1 + + net/sunrpc/xprtsock.c | 8 ++------ + 3 files changed, 4 insertions(+), 6 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by recursive. + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4state.c | 58 +++++++++++-------------------------------- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 64 +++++++++++++++++++++++++++++++++++------------ + fs/nfsd/nfsd.h | 6 ++-- + 5 files changed, 67 insertions(+), 65 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Merge made by recursive. + fs/udf/balloc.c | 49 +------------------------------------------------ + fs/udf/inode.c | 34 +++++++++++++++++----------------- + 2 files changed, 18 insertions(+), 65 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. +Resolved 'security/tomoyo/realpath.c' using previous resolution. +Auto-merging drivers/infiniband/core/uverbs.h +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/usb/gadget/f_mass_storage.c +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging fs/autofs4/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/dcache.c +Auto-merging fs/ext4/file.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfsd/nfs4xdr.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/open.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/generic.c +Auto-merging fs/udf/balloc.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/namei.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mount.h +Auto-merging mm/filemap.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/realpath.c +CONFLICT (content): Merge conflict in security/tomoyo/realpath.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5efda1b] Merge remote branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/uverbs_main.c | 1 + + fs/namei.c | 63 +++++++++++++++++---------------- + 2 files changed, 33 insertions(+), 31 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Removing drivers/i2c/chips/Kconfig +Removing drivers/i2c/chips/Makefile +Auto-merging drivers/i2c/i2c-smbus.c +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 8 ++++- + drivers/acpi/scan.c | 38 +++++++++++++++++++++ + drivers/i2c/Kconfig | 9 ----- + drivers/i2c/Makefile | 2 +- + drivers/i2c/busses/i2c-i801.c | 45 +++++++++++++++++-------- + drivers/i2c/busses/i2c-powermac.c | 25 ++++++++++---- + drivers/i2c/busses/i2c-scmi.c | 32 +++++++++++++---- + drivers/i2c/busses/i2c-stub.c | 9 +++-- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/chips/Kconfig | 19 ---------- + drivers/i2c/chips/Makefile | 18 ---------- + drivers/i2c/i2c-smbus.c | 1 - + drivers/misc/Kconfig | 10 +++++ + drivers/misc/Makefile | 1 + + drivers/misc/eeprom/at24.c | 59 ++++++++++++++++++++++++++------ + drivers/{i2c/chips => misc}/tsl2550.c | 4 +- + include/acpi/acpi_drivers.h | 2 + + 17 files changed, 187 insertions(+), 97 deletions(-) + delete mode 100644 drivers/i2c/chips/Kconfig + delete mode 100644 drivers/i2c/chips/Makefile + rename drivers/{i2c/chips => misc}/tsl2550.c (99%) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + drivers/hwmon/coretemp.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Recorded preimage for 'drivers/media/dvb/dvb-usb/af9015.c' +Recorded preimage for 'drivers/media/dvb/dvb-usb/az6027.c' +Recorded preimage for 'drivers/media/dvb/dvb-usb/dvb-usb-ids.h' +Recorded preimage for 'drivers/media/dvb/frontends/stv090x.c' +Recorded preimage for 'drivers/media/dvb/frontends/stv6110x.c' +Recorded preimage for 'drivers/media/video/em28xx/em28xx-cards.c' +Recorded preimage for 'drivers/media/video/gspca/cpia1.c' +Recorded preimage for 'drivers/media/video/gspca/sn9c2028.c' +Resolved 'drivers/media/dvb/ngene/ngene-core.c' using previous resolution. +Resolved 'drivers/media/video/cx88/cx88-dvb.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-dvb.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-main.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-radio.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-video.c' using previous resolution. +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/mach-davinci/dm355.c +Auto-merging arch/arm/mach-davinci/dm365.c +Auto-merging arch/arm/mach-davinci/dm644x.c +Auto-merging arch/arm/mach-davinci/include/mach/dm365.h +Auto-merging arch/sh/boards/mach-ap325rxa/setup.c +Auto-merging arch/sh/boards/mach-migor/setup.c +Auto-merging drivers/media/IR/ir-keytable.c +Auto-merging drivers/media/common/tuners/tuner-xc2028.c +Auto-merging drivers/media/dvb/bt8xx/dst.c +Auto-merging drivers/media/dvb/dvb-usb/af9015.c +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/af9015.c +Auto-merging drivers/media/dvb/dvb-usb/az6027.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/az6027.c +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-ids.h +CONFLICT (content): Merge conflict in drivers/media/dvb/dvb-usb/dvb-usb-ids.h +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-remote.c +Auto-merging drivers/media/dvb/firewire/firedtv-avc.c +Auto-merging drivers/media/dvb/firewire/firedtv-fw.c +Auto-merging drivers/media/dvb/frontends/stv0900_core.c +Auto-merging drivers/media/dvb/frontends/stv090x.c +CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/stv090x.c +Auto-merging drivers/media/dvb/frontends/stv090x.h +Auto-merging drivers/media/dvb/frontends/stv6110x.c +CONFLICT (content): Merge conflict in drivers/media/dvb/frontends/stv6110x.c +Auto-merging drivers/media/dvb/frontends/stv6110x.h +Auto-merging drivers/media/dvb/ngene/ngene-core.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/dvb/ttpci/budget.c +Auto-merging drivers/media/video/cx88/cx88-dvb.c +CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-dvb.c +Auto-merging drivers/media/video/cx88/cx88.h +Auto-merging drivers/media/video/dabusb.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-cards.c +Auto-merging drivers/media/video/em28xx/em28xx-dvb.c +CONFLICT (content): Merge conflict in drivers/media/video/em28xx/em28xx-dvb.c +Auto-merging drivers/media/video/gspca/cpia1.c +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/cpia1.c +Auto-merging drivers/media/video/gspca/gspca.c +Auto-merging drivers/media/video/gspca/pac207.c +Auto-merging drivers/media/video/gspca/sn9c2028.c +CONFLICT (add/add): Merge conflict in drivers/media/video/gspca/sn9c2028.c +Auto-merging drivers/media/video/gspca/sn9c20x.c +Auto-merging drivers/media/video/gspca/t613.c +Auto-merging drivers/media/video/ivtv/ivtv-streams.c +Auto-merging drivers/media/video/mt9v022.c +Auto-merging drivers/media/video/rj54n1cb0c.c +Auto-merging drivers/media/video/saa7134/saa7134-input.c +Auto-merging drivers/media/video/sh_mobile_ceu_camera.c +Auto-merging drivers/media/video/soc_camera.c +Auto-merging drivers/media/video/tlg2300/pd-dvb.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-dvb.c +Auto-merging drivers/media/video/tlg2300/pd-main.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-main.c +Auto-merging drivers/media/video/tlg2300/pd-radio.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-radio.c +Auto-merging drivers/media/video/tlg2300/pd-video.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-video.c +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/go7007/s2250-board.c +Auto-merging include/linux/videodev2.h +Auto-merging include/media/soc_camera.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/media/dvb/dvb-usb/af9015.c'. +Recorded resolution for 'drivers/media/dvb/dvb-usb/az6027.c'. +Recorded resolution for 'drivers/media/dvb/dvb-usb/dvb-usb-ids.h'. +Recorded resolution for 'drivers/media/dvb/frontends/stv090x.c'. +Recorded resolution for 'drivers/media/dvb/frontends/stv6110x.c'. +Recorded resolution for 'drivers/media/video/em28xx/em28xx-cards.c'. +Recorded resolution for 'drivers/media/video/em28xx/em28xx-dvb.c'. +Recorded resolution for 'drivers/media/video/gspca/cpia1.c'. +Recorded resolution for 'drivers/media/video/gspca/sn9c2028.c'. +[master f1ed3cb] Merge remote branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/common/tuners/tuner-xc2028.c | 25 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/media/dvb/bt8xx/dst.c | 2 - + drivers/media/dvb/dvb-core/dvb_demux.c | 11 +- + drivers/media/dvb/dvb-usb/af9015.c | 13 +- + drivers/media/dvb/dvb-usb/az6027.c | 43 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 +- + drivers/media/dvb/firewire/firedtv-avc.c | 2 +- + drivers/media/dvb/frontends/au8522_decoder.c | 7 + + drivers/media/dvb/frontends/au8522_dig.c | 26 + + drivers/media/dvb/frontends/au8522_priv.h | 5 + + drivers/media/dvb/frontends/stv0900_core.c | 16 +- + drivers/media/dvb/frontends/stv090x.c | 94 ++- + drivers/media/dvb/frontends/stv090x.h | 1 + + drivers/media/dvb/frontends/stv6110x.c | 24 +- + drivers/media/dvb/frontends/stv6110x.h | 1 + + drivers/media/dvb/ngene/ngene-core.c | 20 +- + drivers/media/dvb/ttpci/budget.c | 8 + + drivers/media/video/cx2341x.c | 14 - + drivers/media/video/cx23885/cimax2.c | 12 +- + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 7 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 + + drivers/media/video/gspca/cpia1.c | 34 +- + drivers/media/video/gspca/gspca.c | 7 +- + drivers/media/video/gspca/pac207.c | 4 +- + drivers/media/video/gspca/sn9c2028.c | 2 +- + drivers/media/video/gspca/sn9c20x.c | 6 +- + drivers/media/video/gspca/t613.c | 13 +- + drivers/media/video/ivtv/ivtv-streams.c | 4 + + drivers/media/video/mt9t031.c | 66 +- + drivers/media/video/mt9v022.c | 2 +- + drivers/media/video/mx3_camera.c | 4 +- + drivers/media/video/rj54n1cb0c.c | 18 +- + drivers/media/video/s2255drv.c | 555 +++++++--- + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- + drivers/media/video/soc_camera.c | 18 +- + drivers/media/video/tlg2300/pd-dvb.c | 6 +- + drivers/media/video/tlg2300/pd-main.c | 6 +- + drivers/media/video/tlg2300/pd-radio.c | 21 +- + drivers/media/video/tlg2300/pd-video.c | 18 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 17 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/tm6000-alsa.c | 414 +++++++ + drivers/staging/tm6000/tm6000-cards.c | 799 +++++++++++++ + drivers/staging/tm6000/tm6000-core.c | 494 ++++++++ + drivers/staging/tm6000/tm6000-dvb.c | 346 ++++++ + drivers/staging/tm6000/tm6000-i2c.c | 297 +++++ + drivers/staging/tm6000/tm6000-regs.h | 541 +++++++++ + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++++++ + drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + + drivers/staging/tm6000/tm6000-video.c | 1550 ++++++++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 283 +++++ + include/linux/videodev2.h | 1 + + include/media/soc_camera.h | 12 +- + 59 files changed, 6512 insertions(+), 351 deletions(-) + create mode 100644 drivers/staging/tm6000/Kconfig + create mode 100644 drivers/staging/tm6000/Makefile + create mode 100644 drivers/staging/tm6000/README + create mode 100644 drivers/staging/tm6000/tm6000-alsa.c + create mode 100644 drivers/staging/tm6000/tm6000-cards.c + create mode 100644 drivers/staging/tm6000/tm6000-core.c + create mode 100644 drivers/staging/tm6000/tm6000-dvb.c + create mode 100644 drivers/staging/tm6000/tm6000-i2c.c + create mode 100644 drivers/staging/tm6000/tm6000-regs.h + create mode 100644 drivers/staging/tm6000/tm6000-stds.c + create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h + create mode 100644 drivers/staging/tm6000/tm6000-video.c + create mode 100644 drivers/staging/tm6000/tm6000.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/ia64/include/asm/percpu.h +Auto-merging arch/ia64/kernel/ivt.S +Auto-merging arch/parisc/include/asm/system.h +Auto-merging arch/s390/kernel/swsusp_asm64.S +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/percpu.h +Auto-merging include/linux/percpu-defs.h +Auto-merging init/Kconfig +Auto-merging kernel/module.c +Auto-merging scripts/kconfig/Makefile +Auto-merging scripts/markup_oops.pl +Merge made by recursive. + Documentation/kbuild/kbuild.txt | 6 +- + Documentation/kbuild/makefiles.txt | 2 +- + Documentation/mutex-design.txt | 4 +- + MAINTAINERS | 5 +- + Makefile | 65 +- + arch/frv/kernel/break.S | 4 +- + arch/frv/kernel/entry.S | 2 +- + arch/frv/kernel/head.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 10 +- + arch/frv/mm/tlb-miss.S | 2 +- + arch/h8300/boot/compressed/head.S | 2 +- + arch/h8300/boot/compressed/vmlinux.lds | 2 +- + arch/ia64/include/asm/asmmacro.h | 12 +- + arch/ia64/include/asm/cache.h | 2 +- + arch/ia64/include/asm/percpu.h | 2 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/ia64/kernel/gate-data.S | 2 +- + arch/ia64/kernel/gate.S | 8 +- + arch/ia64/kernel/gate.lds.S | 10 +- + arch/ia64/kernel/init_task.c | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kernel/minstate.h | 4 +- + arch/ia64/kernel/paravirtentry.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 28 +- + arch/ia64/kvm/vmm_ivt.S | 2 +- + arch/ia64/scripts/unwcheck.py | 2 +- + arch/ia64/xen/gate-data.S | 2 +- + arch/ia64/xen/xensetup.S | 2 +- + arch/m68knommu/kernel/vmlinux.lds.S | 4 +- + arch/m68knommu/platform/68360/head-ram.S | 2 +- + arch/m68knommu/platform/68360/head-rom.S | 2 +- + arch/mips/lasat/image/head.S | 2 +- + arch/mips/lasat/image/romscript.normal | 2 +- + arch/parisc/include/asm/cache.h | 2 +- + arch/parisc/include/asm/system.h | 2 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/init_task.c | 6 +- + arch/parisc/kernel/vmlinux.lds.S | 12 +- + arch/powerpc/Makefile | 5 + + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/page_64.h | 8 - + arch/powerpc/kernel/vmlinux.lds.S | 10 +- + arch/s390/include/asm/cache.h | 2 +- + arch/s390/kernel/swsusp_asm64.S | 2 +- + arch/sh/boot/compressed/vmlinux.scr | 2 +- + arch/sh/include/asm/cache.h | 2 +- + arch/sparc/boot/btfixupprep.c | 2 +- + arch/sparc/include/asm/cache.h | 2 +- + arch/um/kernel/dyn.lds.S | 2 +- + arch/um/kernel/init_task.c | 2 +- + arch/um/kernel/uml.lds.S | 2 +- + arch/x86/boot/compressed/mkpiggy.c | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 4 +- + arch/x86/include/asm/cache.h | 2 +- + arch/x86/kernel/acpi/wakeup_32.S | 2 +- + arch/x86/kernel/init_task.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + include/asm-generic/percpu.h | 10 +- + include/asm-generic/vmlinux.lds.h | 38 +- + include/linux/cache.h | 2 +- + include/linux/init.h | 2 +- + include/linux/init_task.h | 2 +- + include/linux/linkage.h | 8 +- + include/linux/percpu-defs.h | 4 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 8 + + kernel/module.c | 2 +- + scripts/Makefile.build | 2 +- + scripts/checkincludes.pl | 24 +- + scripts/checkstack.pl | 16 +- + scripts/checkversion.pl | 23 +- + scripts/decodecode | 48 +- + scripts/export_report.pl | 37 +- + scripts/genksyms/genksyms.c | 4 +- + scripts/headers_check.pl | 11 +- + scripts/headers_install.pl | 19 +- + scripts/kallsyms.c | 6 +- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/expr.c | 27 +- + scripts/kconfig/expr.h | 5 +- + scripts/kconfig/lkc.h | 7 +- + scripts/kconfig/lkc_proto.h | 3 +- + scripts/kconfig/mconf.c | 14 +- + scripts/kconfig/menu.c | 16 +- + scripts/kconfig/nconf.c | 1568 ++++++++++++++++++++++++++++++ + scripts/kconfig/nconf.gui.c | 617 ++++++++++++ + scripts/kconfig/nconf.h | 95 ++ + scripts/kconfig/symbol.c | 29 +- + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.tab.c_shipped | 4 +- + scripts/kconfig/zconf.y | 4 +- + scripts/markup_oops.pl | 54 +- + scripts/mkcompile_h | 5 +- + scripts/mod/modpost.c | 152 ++-- + scripts/namespace.pl | 65 +- + scripts/package/builddeb | 2 + + scripts/package/mkspec | 2 +- + scripts/profile2linkerlist.pl | 8 +- + scripts/rt-tester/rt-tester.py | 2 +- + scripts/show_delta | 2 +- + scripts/tags.sh | 45 +- + 102 files changed, 2873 insertions(+), 426 deletions(-) + create mode 100644 scripts/kconfig/nconf.c + create mode 100644 scripts/kconfig/nconf.gui.c + create mode 100644 scripts/kconfig/nconf.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 265 +++++++++++++++++++++++++++++++--------------------- + 1 files changed, 159 insertions(+), 106 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Resolved 'drivers/acpi/processor_core.c' using previous resolution. +Resolved 'lib/vsprintf.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/ia64/include/asm/acpi.h +Auto-merging arch/ia64/kernel/acpi.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging drivers/acpi/processor_core.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c +Removing drivers/acpi/processor_pdc.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging include/acpi/processor.h +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 352ee2f] Merge remote branch 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + Documentation/acpi/apei/einj.txt | 49 ++ + Documentation/kernel-parameters.txt | 12 +- + arch/ia64/include/asm/acpi.h | 1 - + arch/ia64/kernel/acpi.c | 3 + + arch/x86/include/asm/acpi.h | 2 - + arch/x86/include/asm/emergency-restart.h | 1 + + arch/x86/kernel/acpi/boot.c | 113 +--- + arch/x86/kernel/reboot.c | 71 ++- + arch/x86/lguest/boot.c | 1 - + drivers/acpi/Kconfig | 2 + + drivers/acpi/Makefile | 7 +- + drivers/acpi/acpica/exmutex.c | 3 +- + drivers/acpi/apei/Kconfig | 16 + + drivers/acpi/apei/Makefile | 4 + + drivers/acpi/apei/apei-base.c | 589 ++++++++++++++++ + drivers/acpi/apei/apei-internal.h | 97 +++ + drivers/acpi/apei/einj.c | 471 +++++++++++++ + drivers/acpi/apei/hest.c | 147 ++++ + drivers/acpi/atomicio.c | 360 ++++++++++ + drivers/acpi/battery.c | 86 ++- + drivers/acpi/bus.c | 10 +- + drivers/acpi/ec.c | 33 +- + drivers/acpi/internal.h | 2 + + drivers/acpi/processor_core.c | 1118 +++++------------------------- + drivers/acpi/processor_driver.c | 976 ++++++++++++++++++++++++++ + drivers/acpi/processor_pdc.c | 209 ------ + drivers/acpi/processor_throttling.c | 3 - + drivers/acpi/sbs.c | 5 + + drivers/acpi/sleep.c | 19 +- + drivers/acpi/tables.c | 4 +- + drivers/acpi/thermal.c | 36 +- + drivers/acpi/utils.c | 45 -- + drivers/acpi/video.c | 28 +- + drivers/platform/x86/sony-laptop.c | 91 ++-- + drivers/pnp/base.h | 3 + + drivers/pnp/interface.c | 7 +- + drivers/pnp/pnpacpi/rsparser.c | 49 +- + drivers/pnp/resource.c | 27 +- + drivers/pnp/support.c | 4 +- + drivers/power/power_supply_sysfs.c | 1 + + include/acpi/apei.h | 13 + + include/acpi/atomicio.h | 10 + + include/acpi/processor.h | 10 +- + include/linux/ioport.h | 18 +- + include/linux/power_supply.h | 1 + + lib/vsprintf.c | 13 +- + 46 files changed, 3302 insertions(+), 1468 deletions(-) + create mode 100644 Documentation/acpi/apei/einj.txt + create mode 100644 drivers/acpi/apei/Kconfig + create mode 100644 drivers/acpi/apei/Makefile + create mode 100644 drivers/acpi/apei/apei-base.c + create mode 100644 drivers/acpi/apei/apei-internal.h + create mode 100644 drivers/acpi/apei/einj.c + create mode 100644 drivers/acpi/apei/hest.c + create mode 100644 drivers/acpi/atomicio.c + create mode 100644 drivers/acpi/processor_driver.c + delete mode 100644 drivers/acpi/processor_pdc.c + create mode 100644 include/acpi/apei.h + create mode 100644 include/acpi/atomicio.h +$ git am -3 ../patches/0001-cpufreq-merge-fixup-for-processor_core.c-rename.patch +Applying: cpufreq: merge fixup for processor_core.c rename +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/acpi/processor_driver.c +$ git add . +$ git commit -v -a --amend +[master 4674db6] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Auto-merging drivers/mtd/ubi/build.c +Merge made by recursive. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c +Removing drivers/scsi/bfa/include/defs/bfa_defs_im_common.h +Removing drivers/scsi/bfa/include/defs/bfa_defs_im_team.h +Removing drivers/scsi/bfa/include/protocol/pcifw.h +Merge made by recursive. + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/scsi/Kconfig | 6 + + drivers/scsi/be2iscsi/be_cmds.c | 7 - + drivers/scsi/be2iscsi/be_iscsi.c | 4 +- + drivers/scsi/be2iscsi/be_main.c | 201 ++- + drivers/scsi/be2iscsi/be_main.h | 11 +- + drivers/scsi/be2iscsi/be_mgmt.c | 14 +- + drivers/scsi/be2iscsi/be_mgmt.h | 8 +- + drivers/scsi/bfa/Makefile | 8 +- + drivers/scsi/bfa/bfa_core.c | 19 + + drivers/scsi/bfa/bfa_fcport.c | 1709 +++++++++++--------- + drivers/scsi/bfa/bfa_fcs.c | 63 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 75 +- + drivers/scsi/bfa/bfa_fcs_port.c | 11 +- + drivers/scsi/bfa/bfa_fcs_uf.c | 8 +- + drivers/scsi/bfa/bfa_hw_cb.c | 13 + + drivers/scsi/bfa/bfa_hw_ct.c | 9 + + drivers/scsi/bfa/bfa_intr.c | 111 +- + drivers/scsi/bfa/bfa_ioc.c | 762 +++------ + drivers/scsi/bfa/bfa_ioc.h | 57 +- + drivers/scsi/bfa/bfa_ioc_cb.c | 274 +++ + drivers/scsi/bfa/bfa_ioc_ct.c | 423 +++++ + drivers/scsi/bfa/bfa_iocfc.c | 24 +- + drivers/scsi/bfa/bfa_iocfc.h | 3 + + drivers/scsi/bfa/bfa_ioim.c | 22 +- + drivers/scsi/bfa/bfa_itnim.c | 30 +- + drivers/scsi/bfa/bfa_lps.c | 134 ++- + drivers/scsi/bfa/bfa_module.c | 4 +- + drivers/scsi/bfa/bfa_modules_priv.h | 2 +- + drivers/scsi/bfa/bfa_port_priv.h | 57 +- + drivers/scsi/bfa/bfa_priv.h | 2 +- + drivers/scsi/bfa/bfa_rport.c | 26 +- + drivers/scsi/bfa/bfa_trcmod_priv.h | 62 +- + drivers/scsi/bfa/bfa_tskim.c | 14 +- + drivers/scsi/bfa/bfad.c | 208 ++- + drivers/scsi/bfa/bfad_attr.c | 76 +- + drivers/scsi/bfa/bfad_attr.h | 9 - + drivers/scsi/bfa/bfad_drv.h | 35 +- + drivers/scsi/bfa/bfad_im.c | 53 +- + drivers/scsi/bfa/bfad_im.h | 5 - + drivers/scsi/bfa/bfad_intr.c | 11 +- + drivers/scsi/bfa/fabric.c | 59 +- + drivers/scsi/bfa/fcbuild.h | 6 + + drivers/scsi/bfa/fcpim.c | 51 +- + drivers/scsi/bfa/fcs_fabric.h | 2 + + drivers/scsi/bfa/fcs_fcpim.h | 5 - + drivers/scsi/bfa/fcs_lport.h | 7 +- + drivers/scsi/bfa/fcs_port.h | 3 +- + drivers/scsi/bfa/fcs_rport.h | 3 - + drivers/scsi/bfa/fcs_uf.h | 3 +- + drivers/scsi/bfa/fcs_vport.h | 8 - + drivers/scsi/bfa/fdmi.c | 79 +- + drivers/scsi/bfa/include/aen/bfa_aen.h | 50 +- + drivers/scsi/bfa/include/bfa.h | 22 + + drivers/scsi/bfa/include/bfa_svc.h | 101 +- + drivers/scsi/bfa/include/bfa_timer.h | 2 +- + drivers/scsi/bfa/include/bfi/bfi.h | 4 +- + drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 16 +- + drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 26 + + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- + drivers/scsi/bfa/include/bfi/bfi_lps.h | 8 + + drivers/scsi/bfa/include/bfi/bfi_pport.h | 172 +-- + drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 4 + + drivers/scsi/bfa/include/cs/bfa_log.h | 2 +- + drivers/scsi/bfa/include/cs/bfa_plog.h | 9 +- + drivers/scsi/bfa/include/cs/bfa_sm.h | 8 + + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 10 + + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 22 + + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 14 +- + drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 3 +- + drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 1 + + drivers/scsi/bfa/include/defs/bfa_defs_fcport.h | 94 ++ + drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 - + drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 - + drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 3 +- + drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 12 +- + drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 4 +- + drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 111 ++- + drivers/scsi/bfa/include/defs/bfa_defs_port.h | 19 +- + drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 151 +- + drivers/scsi/bfa/include/defs/bfa_defs_status.h | 17 +- + drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 1 - + drivers/scsi/bfa/include/fcs/bfa_fcs.h | 5 +- + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 8 - + drivers/scsi/bfa/include/log/bfa_log_hal.h | 6 + + drivers/scsi/bfa/include/log/bfa_log_linux.h | 16 + + drivers/scsi/bfa/include/protocol/fc.h | 5 + + drivers/scsi/bfa/include/protocol/pcifw.h | 75 - + drivers/scsi/bfa/loop.c | 2 +- + drivers/scsi/bfa/lport_api.c | 5 +- + drivers/scsi/bfa/ms.c | 29 +- + drivers/scsi/bfa/ns.c | 36 +- + drivers/scsi/bfa/rport.c | 91 +- + drivers/scsi/bfa/rport_api.c | 2 +- + drivers/scsi/bfa/rport_ftrs.c | 12 +- + drivers/scsi/bfa/scn.c | 10 +- + drivers/scsi/bfa/vport.c | 86 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 6 +- + drivers/scsi/hpsa.c | 330 ++-- + drivers/scsi/hpsa.h | 7 +- + drivers/scsi/hpsa_cmd.h | 20 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 27 + + drivers/scsi/ibmvscsi/ibmvscsi.c | 19 + + drivers/scsi/ibmvscsi/ibmvscsi.h | 1 + + drivers/scsi/ibmvscsi/iseries_vscsi.c | 6 + + drivers/scsi/ibmvscsi/rpa_vscsi.c | 13 + + drivers/scsi/ipr.c | 1756 +++++++++++++++----- + drivers/scsi/ipr.h | 467 ++++-- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libiscsi.c | 23 +- + drivers/scsi/lpfc/lpfc.h | 10 +- + drivers/scsi/lpfc/lpfc_attr.c | 7 +- + drivers/scsi/lpfc/lpfc_bsg.c | 332 ++++ + drivers/scsi/lpfc/lpfc_bsg.h | 12 + + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- + drivers/scsi/lpfc/lpfc_els.c | 142 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 527 +++++-- + drivers/scsi/lpfc/lpfc_init.c | 277 +++- + drivers/scsi/lpfc/lpfc_logmsg.h | 1 + + drivers/scsi/lpfc/lpfc_mbox.c | 8 +- + drivers/scsi/lpfc/lpfc_scsi.c | 49 +- + drivers/scsi/lpfc/lpfc_sli.c | 413 ++++- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_sli4.h | 38 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 7 +- + drivers/scsi/osd/osd_initiator.c | 4 + + drivers/scsi/raid_class.c | 2 + + drivers/scsi/scsi_transport_fc.c | 24 +- + drivers/scsi/sd.c | 4 +- + include/scsi/libiscsi.h | 3 +- + 133 files changed, 7204 insertions(+), 3525 deletions(-) + create mode 100644 drivers/scsi/bfa/bfa_ioc_cb.c + create mode 100644 drivers/scsi/bfa/bfa_ioc_ct.c + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcport.h + delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h + delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h + delete mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Removing drivers/net/wireless/wl12xx/wl1271_spi.h +Merge made by recursive. + drivers/net/wireless/ath/ath5k/ath5k.h | 222 +++++------- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath5k/pcu.c | 29 +- + drivers/net/wireless/ath/ath5k/phy.c | 10 +- + drivers/net/wireless/ath/ath5k/qcu.c | 2 + + drivers/net/wireless/ath/ath5k/reset.c | 29 ++- + drivers/net/wireless/ath/ath9k/hw.c | 16 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/mac.c | 6 +- + drivers/net/wireless/b43/b43.h | 1 + + drivers/net/wireless/b43/phy_n.c | 463 +++++++++++++++++++------ + drivers/net/wireless/b43/phy_n.h | 21 +- + drivers/net/wireless/b43/tables_nphy.h | 9 + + drivers/net/wireless/p54/main.c | 1 + + drivers/net/wireless/wl12xx/Kconfig | 24 ++ + drivers/net/wireless/wl12xx/Makefile | 6 +- + drivers/net/wireless/wl12xx/wl1271.h | 33 ++- + drivers/net/wireless/wl12xx/wl1271_acx.c | 8 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 3 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 8 +- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_event.c | 1 - + drivers/net/wireless/wl12xx/wl1271_io.c | 87 ++---- + drivers/net/wireless/wl12xx/wl1271_io.h | 122 ++++++- + drivers/net/wireless/wl12xx/wl1271_main.c | 336 +++++-------------- + drivers/net/wireless/wl12xx/wl1271_ps.c | 1 - + drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +- + drivers/net/wireless/wl12xx/wl1271_sdio.c | 307 ++++++++++++++++ + drivers/net/wireless/wl12xx/wl1271_spi.c | 267 ++++++++++++++- + drivers/net/wireless/wl12xx/wl1271_spi.h | 96 ----- + drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - + drivers/net/wireless/wl12xx/wl1271_tx.c | 94 +++--- + drivers/net/wireless/wl12xx/wl1271_tx.h | 4 +- + include/net/mac80211.h | 4 +- + net/mac80211/debugfs_sta.c | 2 - + net/mac80211/ibss.c | 3 + + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/iface.c | 116 ++++++- + net/mac80211/rx.c | 9 - + net/mac80211/scan.c | 71 ++++- + net/mac80211/sta_info.h | 2 - + 41 files changed, 1617 insertions(+), 814 deletions(-) + create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c + delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h +$ git reset --hard HEAD^ +HEAD is now at 19c99cd Merge remote branch 'scsi/master' +Merging refs/next/20100309/wireless +$ git merge refs/next/20100309/wireless +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/nand/sh_flctl.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/au1550nd.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/nand/sh_flctl.c +CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c +Removing drivers/mtd/nand/ts7250.c +Auto-merging lib/idr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d69da6] Merge remote branch 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 - + arch/arm/mach-ep93xx/ts72xx.c | 190 ++- + drivers/mtd/Kconfig | 21 + + drivers/mtd/Makefile | 1 + + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- + drivers/mtd/devices/pmc551.c | 4 +- + drivers/mtd/ftl.c | 1 - + drivers/mtd/inftlcore.c | 1 - + drivers/mtd/inftlmount.c | 7 +- + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 4 +- + drivers/mtd/maps/physmap_of.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 335 ++++-- + drivers/mtd/mtdblock.c | 72 +- + drivers/mtd/mtdblock_ro.c | 4 +- + drivers/mtd/mtdchar.c | 12 +- + drivers/mtd/mtdcore.c | 284 +++-- + drivers/mtd/mtdcore.h | 7 +- + drivers/mtd/mtdoops.c | 5 - + drivers/mtd/mtdsuper.c | 18 +- + drivers/mtd/nand/Kconfig | 34 +- + drivers/mtd/nand/Makefile | 6 +- + drivers/mtd/nand/alauda.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/au1550nd.c | 12 +- + drivers/mtd/nand/bcm_umi_nand.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 4 +- + drivers/mtd/nand/gpio.c | 12 +- + drivers/mtd/nand/mpc5121_nfc.c | 916 ++++++++++++++ + drivers/mtd/nand/mxc_nand.c | 22 +- + drivers/mtd/nand/nand_base.c | 312 ++++- + drivers/mtd/nand/nand_bbt.c | 26 +- + drivers/mtd/nand/nand_bcm_umi.h | 71 +- + drivers/mtd/nand/nandsim.c | 11 +- + drivers/mtd/nand/nomadik_nand.c | 6 +- + drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 ++-- + drivers/mtd/nand/omap2.c | 16 +- + drivers/mtd/nand/orion_nand.c | 10 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/r852.c | 1138 +++++++++++++++++ + drivers/mtd/nand/r852.h | 163 +++ + drivers/mtd/nand/s3c2410.c | 5 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/mtd/nand/sm_common.c | 143 +++ + drivers/mtd/nand/sm_common.h | 61 + + drivers/mtd/nand/socrates_nand.c | 4 +- + drivers/mtd/nand/tmio_nand.c | 14 +- + drivers/mtd/nand/ts7250.c | 207 ---- + drivers/mtd/nand/txx9ndfmc.c | 2 +- + drivers/mtd/nftlcore.c | 1 - + drivers/mtd/onenand/omap2.c | 4 +- + drivers/mtd/rfd_ftl.c | 1 - + drivers/mtd/sm_ftl.c | 1287 ++++++++++++++++++++ + drivers/mtd/sm_ftl.h | 94 ++ + drivers/mtd/ssfdc.c | 1 - + fs/jffs2/fs.c | 10 +- + fs/jffs2/nodelist.h | 8 +- + include/linux/jffs2.h | 4 +- + include/linux/mtd/blktrans.h | 15 +- + include/linux/mtd/cfi.h | 14 +- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand.h | 21 +- + lib/idr.c | 2 +- + 69 files changed, 4941 insertions(+), 929 deletions(-) + create mode 100644 drivers/mtd/nand/mpc5121_nfc.c + rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) + create mode 100644 drivers/mtd/nand/r852.c + create mode 100644 drivers/mtd/nand/r852.h + create mode 100644 drivers/mtd/nand/sm_common.c + create mode 100644 drivers/mtd/nand/sm_common.h + delete mode 100644 drivers/mtd/nand/ts7250.c + create mode 100644 drivers/mtd/sm_ftl.c + create mode 100644 drivers/mtd/sm_ftl.h +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/isa/opti9xx/opti92x-ad1848.c | 3 ++- + sound/pci/hda/hda_intel.c | 1 + + sound/pci/hda/patch_realtek.c | 8 +++++++- + 3 files changed, 10 insertions(+), 2 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/char/hvc_console.c' using previous resolution. +Resolved 'drivers/char/hvc_console.h' using previous resolution. +Resolved 'drivers/char/virtio_console.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/char/hvc_beat.c +Auto-merging drivers/char/hvc_console.c +CONFLICT (content): Merge conflict in drivers/char/hvc_console.c +Auto-merging drivers/char/hvc_console.h +CONFLICT (content): Merge conflict in drivers/char/hvc_console.h +Auto-merging drivers/char/hvc_iucv.c +Auto-merging drivers/char/virtio_console.c +CONFLICT (content): Merge conflict in drivers/char/virtio_console.c +Auto-merging drivers/virtio/virtio_pci.c +Auto-merging include/linux/gfp.h +Auto-merging include/linux/kernel.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7c068b3] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + include/linux/gfp.h | 2 +- + include/linux/kernel.h | 82 +++++++++++++++++++++++++---------------- + include/linux/kmemcheck.h | 2 +- + include/linux/virtio_config.h | 5 ++- + 5 files changed, 57 insertions(+), 36 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + fs/bio.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + Documentation/device-mapper/dm-flakey.txt | 18 +++ + drivers/md/Kconfig | 6 + + drivers/md/Makefile | 1 + + drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++ + 4 files changed, 239 insertions(+), 0 deletions(-) + create mode 100644 Documentation/device-mapper/dm-flakey.txt + create mode 100644 drivers/md/dm-flakey.c +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 80 ++++++++++-------- + drivers/leds/Makefile | 1 + + drivers/leds/dell-led.c | 200 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/leds/led-class.c | 2 +- + drivers/leds/leds-ss4200.c | 2 +- + 5 files changed, 248 insertions(+), 37 deletions(-) + create mode 100644 drivers/leds/dell-led.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merging drivers/acpi/video.c +Auto-merging drivers/platform/x86/panasonic-laptop.c +Auto-merging drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Merge made by recursive. + drivers/acpi/video.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 12 +- + drivers/macintosh/via-pmu-backlight.c | 7 +- + drivers/platform/x86/acer-wmi.c | 7 +- + drivers/platform/x86/asus-laptop.c | 7 +- + drivers/platform/x86/asus_acpi.c | 7 +- + drivers/platform/x86/classmate-laptop.c | 8 +- + drivers/platform/x86/compal-laptop.c | 11 +- + drivers/platform/x86/dell-laptop.c | 13 +- + drivers/platform/x86/eeepc-laptop.c | 8 +- + drivers/platform/x86/fujitsu-laptop.c | 14 +- + drivers/platform/x86/msi-laptop.c | 7 +- + drivers/platform/x86/msi-wmi.c | 9 +- + drivers/platform/x86/panasonic-laptop.c | 24 +- + drivers/platform/x86/sony-laptop.c | 8 +- + drivers/platform/x86/thinkpad_acpi.c | 12 +- + drivers/platform/x86/toshiba_acpi.c | 10 +- + drivers/staging/samsung-laptop/samsung-laptop.c | 7 +- + drivers/usb/misc/appledisplay.c | 7 +- + drivers/video/atmel_lcdfb.c | 8 +- + drivers/video/aty/aty128fb.c | 7 +- + drivers/video/aty/atyfb_base.c | 7 +- + drivers/video/aty/radeon_backlight.c | 7 +- + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/adp5520_bl.c | 11 +- + drivers/video/backlight/adx_bl.c | 10 +- + drivers/video/backlight/atmel-pwm-bl.c | 8 +- + drivers/video/backlight/backlight.c | 10 +- + drivers/video/backlight/corgi_lcd.c | 8 +- + drivers/video/backlight/cr_bllcd.c | 8 +- + drivers/video/backlight/da903x_bl.c | 7 +- + drivers/video/backlight/generic_bl.c | 8 +- + drivers/video/backlight/hp680_bl.c | 8 +- + drivers/video/backlight/jornada720_bl.c | 7 +- + drivers/video/backlight/kb3886_bl.c | 8 +- + drivers/video/backlight/l4f00242t03.c | 257 +++++++++++++++++++++++ + drivers/video/backlight/locomolcd.c | 8 +- + drivers/video/backlight/mbp_nvidia_bl.c | 10 +- + drivers/video/backlight/omap1_bl.c | 7 +- + drivers/video/backlight/progear_bl.c | 23 ++- + drivers/video/backlight/pwm_bl.c | 8 +- + drivers/video/backlight/tosa_bl.c | 8 +- + drivers/video/backlight/wm831x_bl.c | 7 +- + drivers/video/bf54x-lq043fb.c | 9 +- + drivers/video/bfin-t350mcqb-fb.c | 9 +- + drivers/video/nvidia/nv_backlight.c | 7 +- + drivers/video/omap2/displays/panel-taal.c | 15 +- + drivers/video/riva/fbdev.c | 7 +- + include/linux/backlight.h | 11 +- + include/linux/spi/l4f00242t03.h | 31 +++ + 51 files changed, 577 insertions(+), 157 deletions(-) + create mode 100644 drivers/video/backlight/l4f00242t03.c + create mode 100644 include/linux/spi/l4f00242t03.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/blackfin/kernel/kgdb.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging drivers/video/console/fbcon.c +Auto-merging init/main.c +Auto-merging kernel/Makefile +Removing kernel/kgdb.c +Auto-merging kernel/module.c +Auto-merging kernel/printk.c +Auto-merging kernel/sched.c +Auto-merging kernel/signal.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 773 +++++++--- + Documentation/kernel-parameters.txt | 34 +- + MAINTAINERS | 6 +- + arch/arm/include/asm/kmap_types.h | 1 + + arch/arm/kernel/kgdb.c | 5 + + arch/blackfin/kernel/kgdb.c | 5 + + arch/mips/include/asm/kgdb.h | 2 + + arch/mips/kernel/kgdb.c | 27 +- + arch/mips/kernel/traps.c | 13 + + arch/powerpc/include/asm/kmap_types.h | 1 + + arch/powerpc/kernel/kgdb.c | 11 +- + arch/powerpc/kernel/traps.c | 7 +- + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 6 + + arch/sparc/kernel/kgdb_64.c | 6 + + arch/x86/include/asm/kgdb.h | 3 + + arch/x86/include/asm/processor.h | 2 + + arch/x86/kernel/cpu/common.c | 29 +- + arch/x86/kernel/early_printk.c | 8 + + arch/x86/kernel/kgdb.c | 103 +- + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/traps.c | 20 +- + drivers/char/keyboard.c | 68 +- + drivers/gpu/drm/drm_fb_helper.c | 79 + + drivers/gpu/drm/i915/intel_display.c | 97 ++ + drivers/misc/kgdbts.c | 6 + + drivers/serial/8250.c | 4 +- + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/kgdboc.c | 134 ++- + drivers/serial/sh-sci.c | 6 +- + drivers/serial/sunzilog.c | 50 + + drivers/usb/early/ehci-dbgp.c | 120 ++- + drivers/video/console/fbcon.c | 7 + + include/asm-generic/kmap_types.h | 3 +- + include/drm/drm_crtc_helper.h | 2 + + include/drm/drm_fb_helper.h | 4 + + include/linux/kbd_kern.h | 1 + + include/linux/kdb.h | 117 ++ + include/linux/kgdb.h | 83 +- + include/linux/serial_core.h | 1 + + init/main.c | 2 + + kernel/Makefile | 2 +- + kernel/debug/Makefile | 8 + + kernel/debug/debug_core.c | 1006 ++++++++++++ + kernel/debug/debug_core.h | 81 + + kernel/debug/gdbstub.c | 1022 ++++++++++++ + kernel/debug/kdb/.gitignore | 1 + + kernel/debug/kdb/Makefile | 25 + + kernel/debug/kdb/kdb_bp.c | 564 +++++++ + kernel/debug/kdb/kdb_bt.c | 210 +++ + kernel/debug/kdb/kdb_cmds | 35 + + kernel/debug/kdb/kdb_debugger.c | 169 ++ + kernel/debug/kdb/kdb_io.c | 826 ++++++++++ + kernel/debug/kdb/kdb_keyboard.c | 212 +++ + kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++ + kernel/debug/kdb/kdb_private.h | 300 ++++ + kernel/debug/kdb/kdb_support.c | 926 +++++++++++ + kernel/debug/kms_hooks.c | 62 + + kernel/kallsyms.c | 21 + + kernel/kgdb.c | 1763 -------------------- + kernel/module.c | 4 + + kernel/printk.c | 25 + + kernel/sched.c | 7 +- + kernel/signal.c | 40 + + lib/Kconfig.kgdb | 24 +- + 65 files changed, 9993 insertions(+), 2059 deletions(-) + create mode 100644 include/linux/kdb.h + create mode 100644 kernel/debug/Makefile + create mode 100644 kernel/debug/debug_core.c + create mode 100644 kernel/debug/debug_core.h + create mode 100644 kernel/debug/gdbstub.c + create mode 100644 kernel/debug/kdb/.gitignore + create mode 100644 kernel/debug/kdb/Makefile + create mode 100644 kernel/debug/kdb/kdb_bp.c + create mode 100644 kernel/debug/kdb/kdb_bt.c + create mode 100644 kernel/debug/kdb/kdb_cmds + create mode 100644 kernel/debug/kdb/kdb_debugger.c + create mode 100644 kernel/debug/kdb/kdb_io.c + create mode 100644 kernel/debug/kdb/kdb_keyboard.c + create mode 100644 kernel/debug/kdb/kdb_main.c + create mode 100644 kernel/debug/kdb/kdb_private.h + create mode 100644 kernel/debug/kdb/kdb_support.c + create mode 100644 kernel/debug/kms_hooks.c + delete mode 100644 kernel/kgdb.c +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + mm/slab.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 170 insertions(+), 32 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Merge made by recursive. + drivers/md/bitmap.c | 37 ++++++++++++++++++++++++++++++++----- + drivers/md/bitmap.h | 1 + + drivers/md/faulty.c | 6 +++--- + drivers/md/md.h | 3 --- + drivers/md/multipath.c | 2 +- + drivers/md/raid1.c | 8 ++++---- + drivers/md/raid10.c | 8 ++++---- + drivers/md/raid5.c | 10 +++++----- + 8 files changed, 50 insertions(+), 25 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Merge made by recursive. + drivers/mfd/sm501.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/wm8350-regulator.c +Auto-merging include/linux/mfd/mc13783.h +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/keys/keyring.c | 13 +++++-------- + security/security.c | 2 +- + security/selinux/hooks.c | 2 +- + security/selinux/include/initial_sid_to_string.h | 2 +- + security/selinux/netlink.c | 1 - + security/selinux/nlmsgtab.c | 1 - + security/selinux/ss/policydb.c | 2 +- + security/selinux/ss/symtab.c | 1 - + security/tomoyo/common.c | 10 +++------- + 9 files changed, 12 insertions(+), 22 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/hwa-rc.c | 2 +- + drivers/uwb/i1480/dfu/usb.c | 12 +++-- + drivers/uwb/wlp/messages.c | 106 +++++++++++++++++++++++++------------------ + 3 files changed, 69 insertions(+), 51 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/watchdog/ar7_wdt.c +Auto-merging drivers/watchdog/i6300esb.c +Merge made by recursive. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/dmar.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging Documentation/filesystems/proc.txt +CONFLICT (content): Merge conflict in Documentation/filesystems/proc.txt +Auto-merging Documentation/power/runtime_pm.txt +Auto-merging arch/arm/common/clkdev.c +Auto-merging arch/arm/mach-davinci/include/mach/i2c.h +Auto-merging arch/arm/mach-omap2/board-3630sdp.c +Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c +Auto-merging arch/arm/mach-u300/core.c +Auto-merging arch/arm/mach-u300/include/mach/debug-macro.S +CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/debug-macro.S +Auto-merging arch/ia64/sn/kernel/setup.c +Auto-merging arch/s390/kernel/sclp.S +Auto-merging arch/sparc/kernel/perf_event.c +Auto-merging arch/x86/kernel/pci-dma.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/kernel/vmiclock_32.c +Auto-merging crypto/Kconfig +Auto-merging drivers/acpi/dock.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/pata_acpi.c +Auto-merging drivers/ata/pata_pcmcia.c +Removing drivers/char/ChangeLog +Auto-merging drivers/char/agp/intel-agp.c +Auto-merging drivers/char/hvc_iseries.c +Auto-merging drivers/char/serial167.c +Auto-merging drivers/char/tty_io.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bios.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h +Auto-merging drivers/gpu/drm/radeon/radeon_state.c +Auto-merging drivers/input/serio/i8042.c +Auto-merging drivers/media/dvb/bt8xx/bt878.c +Auto-merging drivers/media/video/gspca/ov519.c +Auto-merging drivers/mfd/sm501.c +Auto-merging drivers/mmc/card/sdio_uart.c +Auto-merging drivers/mtd/inftlcore.c +Auto-merging drivers/mtd/nand/bcm_umi_nand.c +Auto-merging drivers/mtd/nand/mxc_nand.c +Auto-merging drivers/net/chelsio/sge.c +Auto-merging drivers/net/cs89x0.c +Auto-merging drivers/net/cxgb3/sge.c +Auto-merging drivers/net/davinci_emac.c +Auto-merging drivers/net/e1000e/82571.c +Auto-merging drivers/net/e1000e/lib.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/net/ks8851.c +Auto-merging drivers/net/qlge/qlge_ethtool.c +CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_ethtool.c +Auto-merging drivers/net/qlge/qlge_main.c +CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_main.c +Auto-merging drivers/net/smsc9420.c +Auto-merging drivers/net/spider_net.c +Auto-merging drivers/net/sungem.c +Auto-merging drivers/net/tehuti.c +Auto-merging drivers/net/tokenring/tms380tr.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/typhoon.c +CONFLICT (content): Merge conflict in drivers/net/typhoon.c +Auto-merging drivers/net/ucc_geth.c +Auto-merging drivers/net/wimax/i2400m/fw.c +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00debug.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt73usb.c +Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c +Removing drivers/parport/ChangeLog +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/serial/samsung.c +Auto-merging drivers/usb/musb/musb_regs.h +Auto-merging drivers/usb/serial/cypress_m8.c +Auto-merging drivers/usb/serial/opticon.c +Auto-merging drivers/usb/serial/symbolserial.c +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/bio.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/move_extent.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/jbd/transaction.c +Auto-merging fs/locks.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/nfs4xdr.c +Removing fs/ntfs/ChangeLog +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/extent_map.c +Auto-merging fs/reiserfs/bitmap.c +AResolved 'Documentation/filesystems/proc.txt' using previous resolution. +Resolved 'arch/arm/mach-u300/include/mach/debug-macro.S' using previous resolution. +Resolved 'drivers/net/qlge/qlge_ethtool.c' using previous resolution. +Resolved 'drivers/net/qlge/qlge_main.c' using previous resolution. +Resolved 'drivers/net/typhoon.c' using previous resolution. +uto-merging fs/udf/inode.c +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/sched.h +Auto-merging kernel/irq/chip.c +Auto-merging kernel/ksysfs.c +Auto-merging kernel/params.c +Auto-merging kernel/sched_cpupri.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/trace.h +Auto-merging mm/slub.c +Auto-merging net/ipv4/tcp_timer.c +Auto-merging net/mac80211/mesh_plink.c +Auto-merging net/netfilter/nf_conntrack_sip.c +Auto-merging net/netfilter/xt_hashlimit.c +Auto-merging security/selinux/avc.c +Auto-merging sound/pci/rme9652/hdspm.c +Auto-merging sound/soc/codecs/wm8990.c +Auto-merging tools/perf/perf.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b610da4] Merge remote branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mtdnand.tmpl | 6 +- + Documentation/DocBook/v4l/common.xml | 2 +- + Documentation/DocBook/v4l/vidioc-g-parm.xml | 2 +- + Documentation/arm/Samsung-S3C24XX/CPUfreq.txt | 4 +- + Documentation/cgroups/cpusets.txt | 127 +- + Documentation/console/console.txt | 2 +- + Documentation/driver-model/platform.txt | 2 +- + Documentation/eisa.txt | 2 +- + Documentation/filesystems/proc.txt | 2 +- + Documentation/hwmon/abituguru | 2 +- + Documentation/input/rotary-encoder.txt | 2 +- + Documentation/laptops/00-INDEX | 4 + + Documentation/networking/skfp.txt | 2 +- + .../networking/timestamping/timestamping.c | 2 +- + Documentation/pnp.txt | 13 +- + Documentation/power/runtime_pm.txt | 2 +- + Documentation/s390/kvm.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 10 +- + Documentation/trace/ftrace.txt | 2 +- + arch/arm/boot/bootp/init.S | 2 +- + arch/arm/common/clkdev.c | 2 +- + arch/arm/mach-at91/include/mach/at91_mci.h | 2 +- + arch/arm/mach-davinci/include/mach/i2c.h | 2 +- + arch/arm/mach-ep93xx/micro9.c | 2 +- + arch/arm/mach-nomadik/board-nhk8815.c | 2 +- + arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 2 +- + arch/arm/mach-s5pc100/setup-sdhci.c | 4 +- + arch/arm/mach-u300/core.c | 4 +- + arch/arm/mach-u300/include/mach/debug-macro.S | 2 +- + arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 2 +- + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/nand.h | 2 +- + .../plat-samsung/include/plat/regs-usb-hsotg-phy.h | 2 +- + arch/blackfin/include/asm/nand.h | 4 +- + arch/cris/arch-v10/lib/old_checksum.c | 2 +- + arch/cris/arch-v32/mm/tlb.c | 2 +- + arch/h8300/include/asm/io.h | 2 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/m68k/atari/atakeyb.c | 2 +- + arch/m68k/include/asm/fbio.h | 2 +- + arch/m68k/include/asm/io_no.h | 2 +- + arch/powerpc/boot/dts/kmeter1.dts | 2 +- + arch/powerpc/kernel/legacy_serial.c | 2 +- + arch/powerpc/mm/init_32.c | 2 +- + arch/s390/crypto/sha_common.c | 2 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/kernel/sclp.S | 2 +- + arch/sh/kernel/cpu/clock.c | 2 +- + arch/sparc/include/asm/fbio.h | 2 +- + arch/sparc/kernel/perf_event.c | 2 +- + arch/x86/crypto/twofish-i586-asm_32.S | 10 +- + arch/x86/crypto/twofish-x86_64-asm_64.S | 20 +- + arch/x86/kernel/apic/apic_flat_64.c | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/pci-calgary_64.c | 2 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/xen/smp.c | 2 +- + arch/xtensa/kernel/entry.S | 4 +- + block/bsg.c | 2 +- + crypto/Kconfig | 4 +- + drivers/acpi/dock.c | 2 +- + drivers/acpi/proc.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/block/drbd/drbd_int.h | 4 +- + drivers/block/drbd/drbd_req.h | 2 +- + drivers/char/ChangeLog | 775 --------- + drivers/char/agp/intel-agp.c | 2 +- + drivers/char/applicom.c | 2 +- + drivers/char/hvc_iseries.c | 2 +- + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/char/ip2/i2hw.h | 2 +- + drivers/char/pty.c | 2 +- + drivers/char/random.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/char/tty_io.c | 2 +- + drivers/char/vt.c | 6 +- + drivers/crypto/hifn_795x.c | 2 +- + drivers/dma/coh901318_lli.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/via/via_irq.c | 4 +- + drivers/i2c/algos/i2c-algo-pcf.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/infiniband/hw/ehca/ehca_qes.h | 4 +- + drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- + drivers/input/misc/yealink.h | 2 +- + drivers/input/serio/i8042.c | 2 +- + drivers/input/tablet/aiptek.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 4 +- + drivers/isdn/i4l/isdn_common.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 4 +- + drivers/isdn/mISDN/l1oip_core.c | 4 +- + drivers/isdn/sc/hardware.h | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 8 +- + drivers/media/video/bt8xx/bttv-cards.c | 4 +- + drivers/media/video/gspca/ov519.c | 2 +- + drivers/media/video/pwc/philips.txt | 2 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- + drivers/media/video/tea6420.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/mfd/sm501.c | 8 +- + drivers/mmc/card/sdio_uart.c | 2 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mtd/chips/jedec_probe.c | 2 +- + drivers/mtd/maps/plat-ram.c | 2 +- + drivers/mtd/nand/bcm_umi_nand.c | 4 +- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/net/atlx/atl2.h | 2 +- + drivers/net/chelsio/sge.c | 2 +- + drivers/net/cs89x0.c | 2 +- + drivers/net/cxgb3/sge.c | 4 +- + drivers/net/davinci_emac.c | 2 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/lib.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/ks8851.c | 2 +- + drivers/net/qlge/qlge_ethtool.c | 2 +- + drivers/net/qlge/qlge_main.c | 2 +- + drivers/net/sfc/regs.h | 2 +- + drivers/net/skfp/ess.c | 2 +- + drivers/net/smsc9420.c | 2 +- + drivers/net/spider_net.c | 4 +- + drivers/net/sungem.c | 2 +- + drivers/net/tehuti.c | 2 +- + drivers/net/tokenring/tms380tr.c | 4 +- + drivers/net/tun.c | 2 +- + drivers/net/typhoon.c | 6 +- + drivers/net/ucc_geth.c | 2 +- + drivers/net/wan/cosa.c | 10 +- + drivers/net/wan/hdlc_cisco.c | 8 +- + drivers/net/wan/hdlc_x25.c | 4 +- + drivers/net/wimax/i2400m/fw.c | 2 +- + drivers/net/wimax/i2400m/i2400m.h | 2 +- + drivers/net/wimax/i2400m/sdio.c | 4 +- + drivers/net/wimax/i2400m/usb.c | 4 +- + drivers/net/wireless/ath/ar9170/main.c | 2 +- + drivers/net/wireless/iwmc3200wifi/lmac.h | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/rt2x00/rt61pci.c | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 6 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/parport/ChangeLog | 583 ------- + drivers/platform/x86/thinkpad_acpi.c | 4 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/sclp.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/libfc/fc_fcp.c | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 4 +- + drivers/scsi/lpfc/lpfc_scsi.c | 4 +- + drivers/scsi/pcmcia/nsp_cs.h | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_regs.h | 2 +- + drivers/usb/serial/cypress_m8.c | 2 +- + drivers/usb/serial/opticon.c | 2 +- + drivers/usb/serial/symbolserial.c | 2 +- + drivers/usb/wusbcore/wusbhc.h | 2 +- + drivers/uwb/i1480/i1480-est.c | 4 +- + drivers/uwb/uwbd.c | 2 +- + drivers/video/68328fb.c | 2 +- + drivers/video/mbx/mbxfb.c | 2 +- + drivers/video/omap/lcdc.c | 2 +- + drivers/video/pm2fb.c | 2 +- + drivers/video/s1d13xxxfb.c | 4 +- + drivers/video/sm501fb.c | 2 +- + drivers/video/sstfb.c | 2 +- + drivers/w1/w1.c | 4 +- + drivers/zorro/zorro.ids | 2 +- + fs/affs/bitmap.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/bio.c | 7 +- + fs/buffer.c | 2 +- + fs/cifs/asn1.c | 2 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/dlm/member.c | 2 +- + fs/ext3/super.c | 2 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/super.c | 2 +- + fs/fuse/inode.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/jbd/transaction.c | 2 +- + fs/locks.c | 2 +- + fs/mpage.c | 2 +- + fs/namei.c | 2 +- + fs/nfsd/nfs4xdr.c | 2 +- + fs/ntfs/ChangeLog | 1702 -------------------- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/extent_map.c | 2 +- + fs/qnx4/inode.c | 3 +- + fs/reiserfs/bitmap.c | 2 +- + fs/udf/inode.c | 2 +- + include/linux/dm9000.h | 2 +- + include/linux/hil.h | 16 +- + include/linux/lru_cache.h | 2 +- + include/linux/mmzone.h | 2 +- + include/linux/rbtree.h | 8 +- + include/linux/sched.h | 2 +- + include/math-emu/op-common.h | 2 +- + include/media/davinci/vpfe_capture.h | 2 +- + include/net/irda/irttp.h | 2 +- + kernel/audit.c | 2 +- + kernel/irq/chip.c | 2 +- + kernel/irq/devres.c | 4 +- + kernel/ksysfs.c | 2 +- + kernel/params.c | 6 +- + kernel/sched_cpupri.c | 2 +- + kernel/trace/ring_buffer.c | 4 +- + kernel/trace/trace.h | 2 +- + mm/highmem.c | 2 +- + mm/slub.c | 2 +- + net/ipv4/tcp_timer.c | 2 +- + net/mac80211/mesh_plink.c | 2 +- + net/netfilter/nf_conntrack_sip.c | 4 +- + net/netfilter/xt_hashlimit.c | 2 +- + net/sctp/sm_sideeffect.c | 2 +- + scripts/gfp-translate | 2 +- + security/selinux/avc.c | 6 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/soc/codecs/wm8990.c | 2 +- + tools/perf/perf.c | 2 +- + tools/perf/util/hist.c | 2 +- + 242 files changed, 396 insertions(+), 3454 deletions(-) + mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c + mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c + delete mode 100644 drivers/char/ChangeLog + mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c + mode change 100755 => 100644 drivers/mtd/inftlcore.c + delete mode 100644 drivers/parport/ChangeLog + delete mode 100644 fs/ntfs/ChangeLog +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. +Resolved 'include/linux/fsnotify.h' using previous resolution. +Resolved 'kernel/audit_tree.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Removing fs/notify/inotify/inotify.c +Auto-merging fs/notify/inotify/inotify_user.c +CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c +Auto-merging fs/open.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fsnotify.h +CONFLICT (content): Merge conflict in include/linux/fsnotify.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/security.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/audit_tree.c +CONFLICT (content): Merge conflict in kernel/audit_tree.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7340455] Merge remote branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 8 +- + fs/namei.c | 2 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 255 ++++++++ + fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ + fs/notify/fsnotify.c | 141 ++++- + fs/notify/fsnotify.h | 33 +- + fs/notify/group.c | 178 +++--- + fs/notify/inode_mark.c | 309 +++------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 933 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 114 +++- + fs/notify/inotify/inotify_user.c | 305 ++++++---- + fs/notify/mark.c | 325 ++++++++++ + fs/notify/notification.c | 180 +++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/dnotify.h | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 16 +- + include/linux/fsnotify.h | 164 +++--- + include/linux/fsnotify_backend.h | 169 ++++-- + include/linux/inotify.h | 175 +----- + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 5 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 232 ++++--- + kernel/audit_watch.c | 295 +++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 7 +- + security/security.c | 16 +- + 57 files changed, 3096 insertions(+), 2249 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6127b65] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/misc/Makefile' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d5941bd] Merge remote branch 'hwlat/for-linus' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging drbd/for-jens +$ git merge drbd/for-jens +Merge made by recursive. + drivers/block/drbd/drbd_bitmap.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 794091e] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 247 +++++++ + drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4387 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging Documentation/edac.txt +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/pci/legacy.c +Auto-merging drivers/edac/edac_core.h +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 42 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2465 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging limits/writable_limits +$ git merge limits/writable_limits +Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. +Auto-merging Documentation/filesystems/proc.txt +Auto-merging arch/x86/ia32/ia32entry.S +CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S +Auto-merging fs/proc/base.c +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging kernel/posix-cpu-timers.c +Auto-merging kernel/sys.c +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 09ca0d2] Merge remote branch 'limits/writable_limits' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 11 +++ + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/proc/base.c | 101 ++++++++++++++++++++++-- + include/asm-generic/unistd.h | 6 +- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 2 + + include/linux/security.h | 9 ++- + include/linux/syscalls.h | 4 + + kernel/compat.c | 98 +++++++++++++++++------- + kernel/posix-cpu-timers.c | 10 +- + kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 10 ++- + 17 files changed, 346 insertions(+), 78 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/perf_event.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging include/linux/rbtree.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/perf_event.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/rbtree.txt | 58 +++++++ + arch/mips/include/asm/i8253.h | 2 +- + arch/mips/kernel/i8253.c | 14 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/hw_breakpoint.h | 1 - + arch/x86/include/asm/i8253.h | 2 +- + arch/x86/include/asm/nmi.h | 2 + + arch/x86/include/asm/perf_event.h | 16 ++- + arch/x86/kernel/aperture_64.c | 1 - + arch/x86/kernel/apic/Makefile | 7 +- + arch/x86/kernel/apic/hw_nmi.c | 127 ++++++++++++++ + arch/x86/kernel/apic/nmi.c | 7 - + arch/x86/kernel/apm_32.c | 4 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/perf_event.c | 36 +++-- + arch/x86/kernel/cpu/perf_event_intel.c | 31 +++- + arch/x86/kernel/cpu/perf_event_p6.c | 8 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- + arch/x86/kernel/hw_breakpoint.c | 12 -- + arch/x86/kernel/i8253.c | 14 +- + arch/x86/kernel/traps.c | 7 + + arch/x86/mm/Makefile | 1 + + arch/x86/mm/pageattr.c | 25 +++- + arch/x86/mm/pat.c | 231 ++------------------------ + arch/x86/mm/pat_internal.h | 46 +++++ + arch/x86/mm/pat_rbtree.c | 273 +++++++++++++++++++++++++++++++ + arch/x86/oprofile/op_model_amd.c | 23 +-- + arch/x86/oprofile/op_model_ppro.c | 6 +- + drivers/block/hd.c | 4 +- + drivers/input/gameport/gameport.c | 4 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/misc/pcspkr.c | 6 +- + include/linux/cgroup.h | 1 + + include/linux/hw_breakpoint.h | 8 +- + include/linux/nmi.h | 13 ++ + include/linux/perf_event.h | 20 ++- + include/linux/rbtree.h | 5 +- + init/Kconfig | 5 + + kernel/Makefile | 1 + + kernel/hw_breakpoint.c | 11 +- + kernel/nmi_watchdog.c | 259 +++++++++++++++++++++++++++++ + kernel/perf_event.c | 15 -- + kernel/rcutree_plugin.h | 8 +- + kernel/sched_fair.c | 2 +- + kernel/sysctl.c | 15 ++- + kernel/time/clocksource.c | 4 + + kernel/trace/trace_clock.c | 1 + + lib/Kconfig.debug | 20 +++ + lib/rbtree.c | 48 +++++- + samples/hw_breakpoint/data_breakpoint.c | 6 +- + sound/drivers/pcsp/pcsp.h | 2 +- + sound/drivers/pcsp/pcsp_input.c | 4 +- + sound/drivers/pcsp/pcsp_lib.c | 12 +- + tools/perf/Documentation/perf-lock.txt | 29 ++++ + tools/perf/builtin-lock.c | 148 ++++++++++++++++- + tools/perf/command-list.txt | 1 + + tools/perf/perf-archive.sh | 3 +- + tools/perf/util/probe-event.c | 2 +- + 58 files changed, 1255 insertions(+), 366 deletions(-) + create mode 100644 arch/x86/kernel/apic/hw_nmi.c + create mode 100644 arch/x86/mm/pat_internal.h + create mode 100644 arch/x86/mm/pat_rbtree.c + create mode 100644 kernel/nmi_watchdog.c + create mode 100644 tools/perf/Documentation/perf-lock.txt +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + kernel/workqueue.c | 27 ++++++++++++++++++++++++++- + 1 files changed, 26 insertions(+), 1 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + drivers/base/core.c | 3 +-- + drivers/net/mlx4/mlx4.h | 1 + + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + + drivers/usb/core/usb.c | 2 +- + include/linux/device.h | 9 ++++----- + 5 files changed, 8 insertions(+), 8 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging quilt/staging +$ git merge quilt/staging +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +$ git am -3 ../patches/0001-backlight-update-for-API-change.patch +Applying: backlight: update for API change |