$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 64ba992 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd Merging origin/master $ git merge origin/master Updating 64ba992..25cf84c Fast-forward .gitignore | 1 + Documentation/ABI/stable/sysfs-devices-node | 7 + Documentation/cpu-freq/pcc-cpufreq.txt | 207 + Documentation/device-mapper/snapshot.txt | 44 + Documentation/fault-injection/provoke-crashes.txt | 38 + Documentation/feature-removal-schedule.txt | 38 +- Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/Locking | 18 - Documentation/filesystems/logfs.txt | 241 ++ Documentation/filesystems/nfs/nfs41-server.txt | 5 +- Documentation/filesystems/proc.txt | 53 +- Documentation/gpio.txt | 64 + Documentation/hwmon/adt7411 | 42 + Documentation/hwmon/adt7473 | 74 - Documentation/hwmon/asc7621 | 296 ++ Documentation/hwmon/it87 | 53 +- Documentation/hwmon/lm90 | 22 + Documentation/init.txt | 49 + Documentation/kernel-parameters.txt | 6 + Documentation/kprobes.txt | 207 +- Documentation/kvm/api.txt | 12 +- Documentation/power/runtime_pm.txt | 93 + Documentation/powerpc/dts-bindings/fsl/i2c.txt | 30 +- Documentation/vm/slub.txt | 1 + MAINTAINERS | 65 +- arch/Kconfig | 13 + arch/alpha/kernel/osf_sys.c | 3 +- arch/cris/Kconfig | 6 + arch/cris/arch-v32/drivers/cryptocop.c | 2 +- arch/cris/arch-v32/mach-fs/arbiter.c | 2 +- arch/cris/kernel/time.c | 68 +- arch/frv/include/asm/pci.h | 37 - arch/ia64/include/asm/elf.h | 48 - arch/ia64/kernel/Makefile | 2 + arch/ia64/kernel/elfcore.c | 80 + arch/ia64/kernel/perfmon.c | 1 + arch/ia64/kvm/Kconfig | 1 + arch/ia64/kvm/kvm-ia64.c | 50 +- arch/ia64/kvm/kvm_fw.c | 28 +- arch/ia64/kvm/mmio.c | 4 +- arch/ia64/kvm/vcpu.c | 4 +- arch/ia64/mm/init.c | 2 + arch/parisc/Kconfig.debug | 14 + arch/parisc/include/asm/param.h | 23 +- arch/parisc/include/asm/system.h | 2 +- arch/parisc/include/asm/uaccess.h | 27 +- arch/parisc/include/asm/unistd.h | 4 +- arch/parisc/kernel/cache.c | 4 +- arch/parisc/kernel/syscall_table.S | 2 + arch/parisc/kernel/time.c | 29 +- arch/parisc/kernel/unaligned.c | 14 +- arch/parisc/lib/memcpy.c | 3 +- arch/powerpc/include/asm/kvm_asm.h | 6 + arch/powerpc/include/asm/kvm_book3s.h | 11 +- arch/powerpc/include/asm/kvm_book3s_64_asm.h | 18 + arch/powerpc/include/asm/kvm_e500.h | 3 + arch/powerpc/include/asm/kvm_host.h | 23 +- arch/powerpc/include/asm/kvm_ppc.h | 83 +- arch/powerpc/include/asm/paca.h | 5 + arch/powerpc/include/asm/reg.h | 4 + arch/powerpc/kernel/asm-offsets.c | 33 +- arch/powerpc/kernel/ppc_ksyms.c | 1 + arch/powerpc/kvm/44x_emulate.c | 25 +- arch/powerpc/kvm/44x_tlb.c | 20 +- arch/powerpc/kvm/Kconfig | 1 + arch/powerpc/kvm/book3s.c | 309 ++- arch/powerpc/kvm/book3s_64_emulate.c | 77 +- arch/powerpc/kvm/book3s_64_exports.c | 8 + arch/powerpc/kvm/book3s_64_interrupts.S | 336 +- arch/powerpc/kvm/book3s_64_mmu.c | 10 +- arch/powerpc/kvm/book3s_64_rmhandlers.S | 119 +- arch/powerpc/kvm/book3s_64_slb.S | 160 +- arch/powerpc/kvm/booke.c | 87 +- arch/powerpc/kvm/booke_emulate.c | 107 +- arch/powerpc/kvm/e500.c | 6 + arch/powerpc/kvm/e500_emulate.c | 93 +- arch/powerpc/kvm/e500_tlb.c | 10 +- arch/powerpc/kvm/emulate.c | 118 +- arch/powerpc/kvm/powerpc.c | 40 +- arch/powerpc/mm/numa.c | 6 +- arch/s390/kvm/kvm-s390.c | 26 +- arch/s390/kvm/kvm-s390.h | 10 +- arch/sh/boards/mach-migor/setup.c | 16 + arch/sh/boot/compressed/cache.c | 2 +- arch/sh/include/asm/cacheflush.h | 4 +- arch/sh/include/asm/dma-register.h | 51 + arch/sh/include/asm/dma-sh.h | 88 +- arch/sh/include/asm/dmaengine.h | 93 + arch/sh/include/asm/io.h | 23 +- arch/sh/include/asm/mmu.h | 31 +- arch/sh/include/asm/siu.h | 2 +- arch/sh/include/asm/topology.h | 2 +- arch/sh/include/cpu-sh3/cpu/dma-register.h | 41 + arch/sh/include/cpu-sh3/cpu/dma.h | 27 - arch/sh/include/cpu-sh4/cpu/dma-register.h | 112 + arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 62 - arch/sh/include/cpu-sh4/cpu/dma.h | 36 +- arch/sh/include/mach-migor/mach/migor.h | 1 + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 190 +- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 186 +- arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 134 +- arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 134 +- arch/sh/kernel/hw_breakpoint.c | 30 +- arch/sh/kernel/setup.c | 3 +- arch/sh/kernel/time.c | 6 +- arch/sh/lib/libgcc.h | 3 +- arch/sh/mm/ioremap.c | 70 +- arch/sh/mm/ioremap_fixed.c | 11 +- arch/sh/mm/numa.c | 3 + arch/sh/mm/pmb.c | 412 ++- arch/um/.gitignore | 3 + arch/um/drivers/line.c | 4 +- arch/um/sys-i386/Makefile | 2 + arch/um/sys-i386/asm/elf.h | 43 - arch/um/sys-i386/elfcore.c | 83 + arch/x86/Kconfig | 16 + arch/x86/include/asm/Kbuild | 1 + arch/x86/include/asm/alternative.h | 4 +- arch/x86/include/asm/apb_timer.h | 70 + arch/x86/include/asm/hw_irq.h | 7 - arch/x86/include/asm/hyperv.h | 186 + arch/x86/include/asm/i8259.h | 19 +- arch/x86/include/asm/io_apic.h | 7 +- arch/x86/include/asm/irq.h | 1 - arch/x86/include/asm/kprobes.h | 31 +- arch/x86/include/asm/kvm_emulate.h | 17 +- arch/x86/include/asm/kvm_host.h | 60 +- arch/x86/include/asm/kvm_para.h | 1 + arch/x86/include/asm/mrst.h | 19 + arch/x86/include/asm/numaq.h | 1 + arch/x86/include/asm/olpc.h | 20 +- arch/x86/include/asm/pci.h | 9 +- arch/x86/include/asm/pci_x86.h | 22 +- arch/x86/include/asm/setup.h | 2 - arch/x86/include/asm/svm.h | 2 +- arch/x86/include/asm/visws/cobalt.h | 2 + arch/x86/include/asm/vmx.h | 5 +- arch/x86/include/asm/x86_init.h | 15 + arch/x86/kernel/Makefile | 1 + arch/x86/kernel/acpi/boot.c | 4 + arch/x86/kernel/alternative.c | 60 + arch/x86/kernel/apb_timer.c | 784 ++++ arch/x86/kernel/apic/apic.c | 8 +- arch/x86/kernel/apic/io_apic.c | 86 +- arch/x86/kernel/apic/nmi.c | 2 +- arch/x86/kernel/apic/numaq_32.c | 1 + arch/x86/kernel/cpu/cpufreq/Kconfig | 14 + arch/x86/kernel/cpu/cpufreq/Makefile | 1 + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 620 +++ arch/x86/kernel/cpu/mtrr/main.c | 1 + arch/x86/kernel/cpu/perf_event.c | 2 +- arch/x86/kernel/cpu/perf_event_intel.c | 2 +- arch/x86/kernel/i8259.c | 64 +- arch/x86/kernel/irqinit.c | 9 +- arch/x86/kernel/kprobes.c | 609 +++- arch/x86/kernel/mrst.c | 216 + arch/x86/kernel/olpc.c | 10 +- arch/x86/kernel/smpboot.c | 9 +- arch/x86/kernel/visws_quirks.c | 21 +- arch/x86/kernel/vsyscall_64.c | 3 +- arch/x86/kernel/x86_init.c | 8 + arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/emulate.c | 440 ++- arch/x86/kvm/i8254.c | 23 +- arch/x86/kvm/i8254.h | 2 +- arch/x86/kvm/i8259.c | 46 +- arch/x86/kvm/irq.h | 3 +- arch/x86/kvm/kvm_cache_regs.h | 31 + arch/x86/kvm/lapic.c | 31 + arch/x86/kvm/lapic.h | 8 + arch/x86/kvm/mmu.c | 137 +- arch/x86/kvm/mmu.h | 35 +- arch/x86/kvm/paging_tmpl.h | 13 +- arch/x86/kvm/svm.c | 237 +- arch/x86/kvm/trace.h | 59 +- arch/x86/kvm/vmx.c | 396 ++- arch/x86/kvm/x86.c | 1098 ++++-- arch/x86/kvm/x86.h | 30 + arch/x86/pci/Makefile | 2 + arch/x86/pci/acpi.c | 7 +- arch/x86/pci/common.c | 6 - arch/x86/pci/init.c | 8 +- arch/x86/pci/irq.c | 16 +- arch/x86/pci/legacy.c | 24 +- arch/x86/pci/mrst.c | 262 ++ arch/x86/pci/numaq_32.c | 6 - arch/x86/pci/olpc.c | 3 - arch/x86/pci/visws.c | 6 +- crypto/ahash.c | 1 - crypto/authenc.c | 27 +- crypto/md5.c | 1 + drivers/Kconfig | 2 - drivers/acpi/processor_core.c | 2 + drivers/base/power/Makefile | 1 + drivers/base/power/generic_ops.c | 233 ++ drivers/char/virtio_console.c | 29 +- drivers/clocksource/Kconfig | 9 - drivers/cpuidle/governors/menu.c | 2 +- drivers/dma/ioat/dma.c | 2 +- drivers/dma/shdma.c | 500 ++- drivers/dma/shdma.h | 26 +- drivers/eisa/eisa-bus.c | 240 +- drivers/firmware/memmap.c | 57 +- drivers/gpio/Kconfig | 57 +- drivers/gpio/Makefile | 6 + drivers/gpio/cs5535-gpio.c | 4 +- drivers/gpio/gpiolib.c | 58 + drivers/gpio/it8761e_gpio.c | 231 ++ drivers/gpio/max7300.c | 94 + drivers/gpio/max7301.c | 293 +-- drivers/gpio/max730x.c | 244 ++ drivers/gpio/pca953x.c | 249 ++- drivers/gpio/pl061.c | 2 +- drivers/gpio/sch_gpio.c | 295 ++ drivers/gpio/timbgpio.c | 35 +- drivers/gpio/wm831x-gpio.c | 45 +- drivers/gpio/wm8350-gpiolib.c | 181 + drivers/gpio/wm8994-gpio.c | 204 + drivers/hwmon/Kconfig | 45 +- drivers/hwmon/Makefile | 3 +- drivers/hwmon/adcxx.c | 15 +- drivers/hwmon/adt7411.c | 366 ++ drivers/hwmon/adt7473.c | 1180 ------ drivers/hwmon/asc7621.c | 1255 ++++++ drivers/hwmon/fschmd.c | 15 +- drivers/hwmon/g760a.c | 2 +- drivers/hwmon/it87.c | 939 ++++-- drivers/hwmon/lm90.c | 89 +- drivers/hwmon/tmp401.c | 7 +- drivers/hwmon/tmp421.c | 24 +- drivers/hwmon/vt8231.c | 3 +- drivers/hwmon/w83793.c | 482 +++- drivers/i2c/busses/Kconfig | 26 +- drivers/i2c/busses/Makefile | 2 + drivers/i2c/busses/i2c-designware.c | 4 +- drivers/i2c/busses/i2c-imx.c | 1 - drivers/i2c/busses/i2c-isch.c | 68 +- drivers/i2c/busses/i2c-mpc.c | 194 +- drivers/i2c/busses/i2c-nomadik.c | 959 +++++ drivers/i2c/busses/i2c-omap.c | 44 +- drivers/i2c/busses/i2c-pnx.c | 11 - drivers/i2c/busses/i2c-xiic.c | 824 ++++ drivers/infiniband/core/mad.c | 21 +- drivers/input/misc/88pm860x_onkey.c | 155 + drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/touchscreen/88pm860x-ts.c | 236 ++ drivers/input/touchscreen/Kconfig | 12 + drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/mc13783_ts.c | 4 +- drivers/leds/Kconfig | 7 + drivers/leds/Makefile | 1 + drivers/leds/leds-88pm860x.c | 325 ++ drivers/md/dm-crypt.c | 3 +- drivers/md/dm-delay.c | 8 +- drivers/md/dm-ioctl.c | 24 +- drivers/md/dm-linear.c | 3 +- drivers/md/dm-log.c | 3 +- drivers/md/dm-mpath.c | 111 +- drivers/md/dm-raid1.c | 53 +- drivers/md/dm-snap.c | 34 +- drivers/md/dm-stripe.c | 3 +- drivers/md/dm-table.c | 12 +- drivers/md/dm-uevent.c | 7 +- drivers/md/dm.c | 25 +- drivers/md/dm.h | 4 +- drivers/mfd/88pm8607.c | 302 -- drivers/mfd/88pm860x-core.c | 740 ++++ drivers/mfd/88pm860x-i2c.c | 236 ++ drivers/mfd/Kconfig | 72 +- drivers/mfd/Makefile | 8 +- drivers/mfd/ab3100-core.c | 54 +- drivers/mfd/ab3100-otp.c | 13 +- drivers/mfd/htc-egpio.c | 2 +- drivers/mfd/htc-i2cpld.c | 710 ++++ drivers/mfd/lpc_sch.c | 133 + drivers/mfd/max8925-core.c | 656 +++ drivers/mfd/max8925-i2c.c | 211 + drivers/mfd/mc13783-core.c | 73 +- drivers/mfd/mfd-core.c | 5 + drivers/mfd/sh_mobile_sdhi.c | 6 +- drivers/mfd/sm501.c | 7 +- drivers/mfd/t7l66xb.c | 4 +- drivers/mfd/tc6393xb.c | 2 +- drivers/mfd/twl-core.c | 41 +- drivers/mfd/twl4030-power.c | 52 +- drivers/mfd/ucb1x00-core.c | 1 + drivers/mfd/wm831x-core.c | 51 +- drivers/mfd/wm8350-core.c | 35 +- drivers/mfd/wm8350-irq.c | 155 +- drivers/mfd/wm8994-core.c | 537 +++ drivers/misc/Kconfig | 9 + drivers/misc/iwmc3200top/main.c | 2 - drivers/misc/lkdtm.c | 472 ++- drivers/misc/sgi-xp/xpnet.c | 2 +- drivers/mmc/core/core.c | 12 +- drivers/mmc/core/sdio.c | 64 +- drivers/mmc/core/sdio_io.c | 56 +- drivers/mmc/host/Kconfig | 15 +- drivers/mmc/host/Makefile | 1 - drivers/mmc/host/at91_mci.c | 224 +- drivers/mmc/host/bfin_sdh.c | 10 +- drivers/mmc/host/davinci_mmc.c | 45 +- drivers/mmc/host/ricoh_mmc.c | 262 -- drivers/mmc/host/s3cmci.c | 4 +- drivers/mmc/host/sdhci-pci.c | 24 +- drivers/mmc/host/sdhci.c | 76 +- drivers/mmc/host/tmio_mmc.c | 13 +- drivers/mmc/host/tmio_mmc.h | 6 +- drivers/mtd/ubi/build.c | 133 +- drivers/mtd/ubi/debug.h | 4 + drivers/mtd/ubi/io.c | 120 +- drivers/mtd/ubi/scan.c | 11 +- drivers/mtd/ubi/wl.c | 17 +- drivers/net/gianfar.c | 12 +- drivers/net/ixgbe/ixgbe_main.c | 2 +- drivers/net/ixgbevf/ixgbevf_main.c | 2 +- drivers/net/wireless/ath/ar9170/main.c | 2 +- drivers/net/wireless/iwmc3200wifi/debugfs.c | 2 +- drivers/net/wireless/iwmc3200wifi/rx.c | 2 +- drivers/parisc/eisa_enumerator.c | 2 +- drivers/parisc/superio.c | 2 +- drivers/pci/pci.c | 43 + drivers/pci/quirks.c | 85 + drivers/power/Kconfig | 7 + drivers/power/Makefile | 1 + drivers/power/max8925_power.c | 534 +++ drivers/power/wm8350_power.c | 26 +- drivers/regulator/88pm8607.c | 318 +-- drivers/regulator/Kconfig | 8 +- drivers/regulator/Makefile | 1 + drivers/regulator/max8925-regulator.c | 306 ++ drivers/regulator/wm8350-regulator.c | 2 +- drivers/rtc/Kconfig | 10 + drivers/rtc/Makefile | 1 + drivers/rtc/class.c | 1 + drivers/rtc/rtc-at91sam9.c | 2 +- drivers/rtc/rtc-coh901331.c | 5 +- drivers/rtc/rtc-ep93xx.c | 71 +- drivers/rtc/rtc-max8925.c | 314 ++ drivers/rtc/rtc-mc13783.c | 214 +- drivers/rtc/rtc-mxc.c | 7 +- drivers/rtc/rtc-pcf2123.c | 2 +- drivers/rtc/rtc-twl.c | 4 +- drivers/rtc/rtc-wm8350.c | 11 +- drivers/serial/Kconfig | 4 + drivers/serial/sh-sci.c | 616 +++- drivers/staging/Kconfig | 14 +- drivers/staging/Makefile | 8 +- drivers/staging/altpciechdma/Kconfig | 10 - drivers/staging/altpciechdma/Makefile | 2 - drivers/staging/altpciechdma/TODO | 15 - drivers/staging/altpciechdma/altpciechdma.c | 1182 ------ drivers/staging/arlan/Makefile | 2 +- drivers/staging/arlan/arlan.h | 136 +- drivers/staging/asus_oled/asus_oled.c | 21 +- drivers/staging/b3dfg/Kconfig | 10 - drivers/staging/b3dfg/Makefile | 1 - drivers/staging/b3dfg/TODO | 4 - drivers/staging/b3dfg/b3dfg.c | 1100 ----- drivers/staging/batman-adv/Kconfig | 6 +- drivers/staging/batman-adv/Makefile | 2 +- drivers/staging/batman-adv/README | 84 +- drivers/staging/batman-adv/TODO | 24 - drivers/staging/batman-adv/aggregation.c | 13 +- drivers/staging/batman-adv/bitarray.c | 15 +- drivers/staging/batman-adv/compat.h | 75 - drivers/staging/batman-adv/device.c | 53 +- drivers/staging/batman-adv/hard-interface.c | 209 +- drivers/staging/batman-adv/hard-interface.h | 4 + drivers/staging/batman-adv/hash.c | 23 +- drivers/staging/batman-adv/hash.h | 5 + drivers/staging/batman-adv/log.c | 179 - drivers/staging/batman-adv/main.c | 55 +- drivers/staging/batman-adv/main.h | 46 +- drivers/staging/batman-adv/originator.c | 252 ++ drivers/staging/batman-adv/{log.h => originator.h} | 19 +- drivers/staging/batman-adv/packet.h | 2 +- drivers/staging/batman-adv/proc.c | 508 +-- drivers/staging/batman-adv/proc.h | 13 +- drivers/staging/batman-adv/routing.c | 1304 +++--- drivers/staging/batman-adv/routing.h | 21 +- drivers/staging/batman-adv/send.c | 172 +- drivers/staging/batman-adv/send.h | 5 +- drivers/staging/batman-adv/soft-interface.c | 96 +- drivers/staging/batman-adv/soft-interface.h | 3 +- drivers/staging/batman-adv/translation-table.c | 94 +- drivers/staging/batman-adv/translation-table.h | 1 + drivers/staging/batman-adv/types.h | 14 +- drivers/staging/batman-adv/vis.c | 201 +- drivers/staging/batman-adv/vis.h | 13 +- drivers/staging/comedi/comedi_compat32.c | 1 - drivers/staging/comedi/comedi_fops.c | 12 +- drivers/staging/comedi/drivers.c | 30 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 2 +- .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 2 +- .../comedi/drivers/addi-data/addi_amcc_S5920.c | 7 +- .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.h | 4 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1032.c | 12 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 121 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 6 +- drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- drivers/staging/comedi/drivers/adq12b.c | 66 +- drivers/staging/comedi/drivers/adv_pci1710.c | 21 +- drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +- drivers/staging/comedi/drivers/amplc_dio200.c | 122 +- drivers/staging/comedi/drivers/amplc_pc236.c | 46 +- drivers/staging/comedi/drivers/amplc_pci224.c | 16 +- drivers/staging/comedi/drivers/c6xdigio.c | 57 +- drivers/staging/comedi/drivers/cb_pcidas.c | 28 +- drivers/staging/comedi/drivers/cb_pcidda.c | 12 +- drivers/staging/comedi/drivers/cb_pcidio.c | 6 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 8 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 8 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 3 +- drivers/staging/comedi/drivers/das08_cs.c | 4 +- drivers/staging/comedi/drivers/das6402.c | 2 +- drivers/staging/comedi/drivers/das800.c | 6 +- drivers/staging/comedi/drivers/dmm32at.c | 5 +- drivers/staging/comedi/drivers/dt2801.c | 33 +- drivers/staging/comedi/drivers/dt2815.c | 89 +- drivers/staging/comedi/drivers/dt9812.c | 2 +- drivers/staging/comedi/drivers/fl512.c | 72 +- drivers/staging/comedi/drivers/jr3_pci.c | 2 + drivers/staging/comedi/drivers/mpc624.c | 2 +- drivers/staging/comedi/drivers/ni_65xx.c | 49 +- drivers/staging/comedi/drivers/ni_660x.c | 73 +- drivers/staging/comedi/drivers/ni_670x.c | 32 +- drivers/staging/comedi/drivers/ni_atmio.c | 34 +- drivers/staging/comedi/drivers/ni_daq_700.c | 24 +- drivers/staging/comedi/drivers/ni_labpc.c | 276 +- drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- drivers/staging/comedi/drivers/ni_pcidio.c | 83 +- drivers/staging/comedi/drivers/pcl711.c | 29 +- drivers/staging/comedi/drivers/pcl724.c | 26 +- drivers/staging/comedi/drivers/pcl725.c | 6 +- drivers/staging/comedi/drivers/pcl730.c | 6 +- drivers/staging/comedi/drivers/pcl812.c | 16 +- drivers/staging/comedi/drivers/pcl816.c | 66 +- drivers/staging/comedi/drivers/pcl818.c | 39 +- drivers/staging/comedi/drivers/pcm3724.c | 85 +- drivers/staging/comedi/drivers/pcm3730.c | 6 +- drivers/staging/comedi/drivers/pcmad.c | 22 +- drivers/staging/comedi/drivers/pcmmio.c | 2 +- drivers/staging/comedi/drivers/poc.c | 14 +- drivers/staging/comedi/drivers/rti800.c | 61 +- drivers/staging/comedi/drivers/rti802.c | 8 +- drivers/staging/comedi/drivers/s626.c | 2 +- drivers/staging/comedi/drivers/serial2002.c | 2 +- drivers/staging/comedi/drivers/ssv_dnp.c | 6 +- drivers/staging/comedi/drivers/usbdux.c | 5 +- drivers/staging/comedi/drivers/usbduxfast.c | 5 +- drivers/staging/comedi/drivers/vmk80xx.c | 2 +- drivers/staging/crystalhd/Kconfig | 6 + drivers/staging/crystalhd/Makefile | 6 + drivers/staging/crystalhd/TODO | 16 + drivers/staging/crystalhd/bc_dts_defs.h | 498 +++ drivers/staging/crystalhd/bc_dts_glob_lnx.h | 299 ++ drivers/staging/crystalhd/bc_dts_types.h | 121 + drivers/staging/crystalhd/bcm_70012_regs.h | 757 ++++ drivers/staging/crystalhd/crystalhd_cmds.c | 1058 +++++ drivers/staging/crystalhd/crystalhd_cmds.h | 88 + drivers/staging/crystalhd/crystalhd_fw_if.h | 369 ++ drivers/staging/crystalhd/crystalhd_hw.c | 2395 +++++++++++ drivers/staging/crystalhd/crystalhd_hw.h | 398 ++ drivers/staging/crystalhd/crystalhd_lnx.c | 765 ++++ drivers/staging/crystalhd/crystalhd_lnx.h | 96 + drivers/staging/crystalhd/crystalhd_misc.c | 1030 +++++ drivers/staging/crystalhd/crystalhd_misc.h | 229 ++ drivers/staging/cx25821/cx25821-audups11.c | 3 +- drivers/staging/cx25821/cx25821-medusa-video.c | 4 +- drivers/staging/cx25821/cx25821-video.c | 5 +- drivers/staging/dream/camera/Kconfig | 2 +- drivers/staging/dream/camera/Makefile | 1 + drivers/staging/dream/camera/msm_camera.c | 69 +- drivers/staging/dream/camera/msm_vfe7x.c | 3 +- drivers/staging/dream/camera/s5k3e2fx.c | 30 +- drivers/staging/dream/include/linux/android_pmem.h | 80 + drivers/staging/dream/include/linux/gpio_event.h | 154 + drivers/staging/dream/include/linux/msm_adsp.h | 84 + drivers/staging/dream/include/linux/msm_audio.h | 115 + .../staging/dream/include/linux/msm_rpcrouter.h | 47 + drivers/staging/dream/include/linux/wakelock.h | 91 + drivers/staging/dream/include/mach/camera.h | 279 ++ drivers/staging/dream/include/mach/msm_adsp.h | 112 + drivers/staging/dream/include/mach/msm_rpcrouter.h | 179 + drivers/staging/dream/include/mach/msm_smd.h | 107 + .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h | 94 + .../dream/include/mach/qdsp5/qdsp5audplaymsg.h | 70 + .../dream/include/mach/qdsp5/qdsp5audppcmdi.h | 914 +++++ .../dream/include/mach/qdsp5/qdsp5audppmsg.h | 318 ++ .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h | 256 ++ .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h | 85 + .../dream/include/mach/qdsp5/qdsp5audreccmdi.h | 176 + .../dream/include/mach/qdsp5/qdsp5audrecmsg.h | 127 + .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h | 376 ++ .../dream/include/mach/qdsp5/qdsp5jpegmsg.h | 177 + .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h | 82 + .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h | 80 + .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h | 235 ++ .../dream/include/mach/qdsp5/qdsp5vdecmsg.h | 107 + .../dream/include/mach/qdsp5/qdsp5venccmdi.h | 212 + .../dream/include/mach/qdsp5/qdsp5vfecmdi.h | 910 +++++ .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h | 290 ++ drivers/staging/dream/include/media/msm_camera.h | 388 ++ drivers/staging/dream/pmem.c | 26 +- drivers/staging/dream/qdsp5/Makefile | 1 + drivers/staging/dream/qdsp5/audio_mp3.c | 3 +- drivers/staging/dream/smd/Makefile | 1 + drivers/staging/dream/smd/smd_rpcrouter.c | 2 - drivers/staging/dt3155/Kconfig | 4 + drivers/staging/dt3155/Makefile | 6 + drivers/staging/dt3155/TODO | 10 + drivers/staging/dt3155/allocator.README | 98 + drivers/staging/dt3155/allocator.c | 295 ++ drivers/staging/dt3155/allocator.h | 28 + drivers/staging/dt3155/dt3155.h | 171 + drivers/staging/dt3155/dt3155.sysvinit | 60 + drivers/staging/dt3155/dt3155_drv.c | 1095 +++++ drivers/staging/dt3155/dt3155_drv.h | 45 + drivers/staging/dt3155/dt3155_io.c | 175 + drivers/staging/dt3155/dt3155_io.h | 358 ++ drivers/staging/dt3155/dt3155_isr.c | 516 +++ drivers/staging/dt3155/dt3155_isr.h | 77 + drivers/staging/et131x/et1310_address_map.h | 617 +-- drivers/staging/et131x/et1310_eeprom.c | 39 +- drivers/staging/et131x/et1310_eeprom.h | 103 - drivers/staging/et131x/et1310_jagcore.h | 94 - drivers/staging/et131x/et1310_mac.c | 104 +- drivers/staging/et131x/et1310_mac.h | 93 - drivers/staging/et131x/et1310_phy.c | 7 +- drivers/staging/et131x/et1310_phy.h | 34 - drivers/staging/et131x/et1310_pm.c | 6 +- drivers/staging/et131x/et1310_pm.h | 85 - drivers/staging/et131x/et1310_rx.c | 301 +- drivers/staging/et131x/et1310_rx.h | 253 +- drivers/staging/et131x/et1310_tx.c | 10 +- drivers/staging/et131x/et1310_tx.h | 14 - drivers/staging/et131x/et131x.h | 153 + drivers/staging/et131x/et131x_adapter.h | 43 +- drivers/staging/et131x/et131x_config.h | 67 - drivers/staging/et131x/et131x_initpci.c | 12 +- drivers/staging/et131x/et131x_initpci.h | 73 - drivers/staging/et131x/et131x_isr.c | 34 +- drivers/staging/et131x/et131x_isr.h | 65 - drivers/staging/et131x/et131x_netdev.c | 63 +- drivers/staging/et131x/et131x_netdev.h | 64 - drivers/staging/et131x/et131x_version.h | 9 +- drivers/staging/frontier/alphatrack.c | 2 +- drivers/staging/frontier/tranzport.c | 2 +- drivers/staging/go7007/go7007-driver.c | 2 + drivers/staging/go7007/go7007-usb.c | 4 +- drivers/staging/go7007/s2250-board.c | 2 +- drivers/staging/go7007/s2250-loader.c | 4 +- drivers/staging/go7007/saa7134-go7007.c | 1 + drivers/staging/go7007/wis-ov7640.c | 2 +- drivers/staging/go7007/wis-saa7113.c | 2 +- drivers/staging/go7007/wis-saa7115.c | 2 +- drivers/staging/go7007/wis-sony-tuner.c | 2 +- drivers/staging/go7007/wis-tw2804.c | 2 +- drivers/staging/go7007/wis-tw9903.c | 2 +- drivers/staging/go7007/wis-uda1342.c | 2 +- drivers/staging/hv/Channel.c | 3 +- drivers/staging/hv/Hv.c | 205 +- drivers/staging/hv/Hv.h | 10 +- drivers/staging/hv/NetVscApi.h | 4 +- drivers/staging/hv/RingBuffer.c | 153 +- drivers/staging/hv/RndisFilter.c | 10 +- drivers/staging/hv/StorVsc.c | 3 +- drivers/staging/hv/StorVscApi.h | 5 +- drivers/staging/hv/VersionInfo.h | 22 +- drivers/staging/hv/Vmbus.c | 6 +- drivers/staging/hv/blkvsc_drv.c | 10 +- drivers/staging/hv/netvsc_drv.c | 29 +- drivers/staging/hv/storvsc_drv.c | 227 +- drivers/staging/hv/vmbus.h | 12 +- drivers/staging/hv/vmbus_drv.c | 68 +- drivers/staging/iio/industrialio-core.c | 35 +- drivers/staging/iio/ring_generic.h | 3 +- drivers/staging/iio/ring_sw.c | 3 +- drivers/staging/iio/trigger_consumer.h | 4 +- drivers/staging/line6/driver.c | 2 +- drivers/staging/line6/variax.c | 2 +- drivers/staging/mimio/Kconfig | 10 - drivers/staging/mimio/Makefile | 1 - drivers/staging/mimio/mimio.c | 914 ----- drivers/staging/otus/80211core/cagg.c | 18 +- drivers/staging/otus/80211core/ccmd.c | 2 +- drivers/staging/otus/80211core/cfunc.c | 2 - drivers/staging/otus/80211core/cmm.c | 4 - drivers/staging/otus/80211core/cmmsta.c | 7 +- drivers/staging/otus/80211core/cpsmgr.c | 2 - drivers/staging/otus/80211core/cscanmgr.c | 2 - drivers/staging/otus/80211core/ctkip.c | 5 +- drivers/staging/otus/80211core/ctxrx.c | 8 +- drivers/staging/otus/80211core/ledmgr.c | 1 - drivers/staging/otus/80211core/pub_zfi.h | 1 - drivers/staging/otus/Kconfig | 2 + drivers/staging/otus/apdbg.c | 53 +- drivers/staging/otus/hal/hpmain.c | 4 - drivers/staging/otus/hal/hpreg.c | 133 - drivers/staging/otus/hal/hprw.c | 1 - drivers/staging/otus/ioctl.c | 16 +- drivers/staging/otus/usbdrv.c | 4 +- drivers/staging/otus/wrap_pkt.c | 10 +- drivers/staging/otus/zdusb.c | 2 +- drivers/staging/p9auth/Kconfig | 9 - drivers/staging/p9auth/Makefile | 1 - drivers/staging/p9auth/p9auth.c | 408 -- drivers/staging/panel/panel.c | 1 - drivers/staging/phison/phison.c | 2 +- drivers/staging/pohmelfs/inode.c | 30 +- drivers/staging/pohmelfs/netfs.h | 3 + drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- drivers/staging/ramzswap/Kconfig | 2 +- drivers/staging/ramzswap/ramzswap.txt | 6 +- drivers/staging/ramzswap/ramzswap_drv.c | 144 +- drivers/staging/ramzswap/ramzswap_drv.h | 67 +- drivers/staging/ramzswap/ramzswap_ioctl.h | 7 +- drivers/staging/ramzswap/xvmalloc.c | 4 +- drivers/staging/ramzswap/xvmalloc.h | 2 +- drivers/staging/ramzswap/xvmalloc_int.h | 4 +- drivers/staging/rar/Kconfig | 17 - drivers/staging/rar/Makefile | 2 - drivers/staging/rar/rar_driver.c | 444 -- drivers/staging/rar/rar_driver.h | 99 - drivers/staging/rar_register/Kconfig | 30 + drivers/staging/rar_register/Makefile | 2 + drivers/staging/rar_register/rar_register.c | 615 +++ drivers/staging/rar_register/rar_register.h | 84 + drivers/staging/rt2860/Kconfig | 2 + drivers/staging/rt2860/common/firmware.h | 558 --- drivers/staging/rt2860/common/firmware_3070.h | 517 --- drivers/staging/rt2860/common/rtmp_mcu.c | 167 +- drivers/staging/rt2860/rt_linux.c | 13 +- drivers/staging/rt2860/rt_linux.h | 4 +- drivers/staging/rt2860/rt_main_dev.c | 2 +- drivers/staging/rt2860/rtmp.h | 7 +- drivers/staging/rt2860/sta/connect.c | 4 +- drivers/staging/rt2860/sta_ioctl.c | 5 +- drivers/staging/rt2860/usb_main_dev.c | 6 +- drivers/staging/rt2870/Kconfig | 2 + drivers/staging/rt2870/common/rtusb_io.c | 10 +- drivers/staging/rt3070/firmware.h | 558 --- drivers/staging/rt3070/md4.h | 8 +- drivers/staging/rt3090/firmware.h | 517 --- drivers/staging/rtl8187se/Kconfig | 1 + drivers/staging/rtl8187se/Makefile | 1 - drivers/staging/rtl8187se/TODO | 1 - drivers/staging/rtl8187se/ieee80211/ieee80211.h | 5 +- .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 20 +- drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 48 +- .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 3 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 6 +- drivers/staging/rtl8187se/r8180.h | 4 - drivers/staging/rtl8187se/r8180_93cx6.c | 146 - drivers/staging/rtl8187se/r8180_93cx6.h | 17 +- drivers/staging/rtl8187se/r8180_core.c | 502 +-- drivers/staging/rtl8187se/r8180_dm.c | 69 +- drivers/staging/rtl8187se/r8180_rtl8225z2.c | 232 +- drivers/staging/rtl8187se/r8185b_init.c | 986 +----- drivers/staging/rtl8192e/Makefile | 9 +- drivers/staging/rtl8192e/dot11d.h | 138 +- drivers/staging/rtl8192e/ieee80211.h | 3 - drivers/staging/rtl8192e/ieee80211/ieee80211.h | 160 +- .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 2 +- .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 37 +- .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 29 +- drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 148 +- .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 246 +- .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 26 +- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 80 +- drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 6 +- .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 4 +- .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 65 +- .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192e/r8180_93cx6.c | 63 +- drivers/staging/rtl8192e/r8180_93cx6.h | 33 +- drivers/staging/rtl8192e/r8190_rtl8256.c | 360 +- drivers/staging/rtl8192e/r8190_rtl8256.h | 49 +- drivers/staging/rtl8192e/r8192E.h | 23 +- drivers/staging/rtl8192e/r8192E_core.c | 773 +++- drivers/staging/rtl8192e/r8192E_dm.c | 40 +- drivers/staging/rtl8192e/r8192E_hw.h | 8 + drivers/staging/rtl8192e/r8192E_wx.c | 212 +- drivers/staging/rtl8192e/r8192E_wx.h | 1 - drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +- drivers/staging/rtl8192e/r819xE_firmware.c | 85 +- drivers/staging/rtl8192e/r819xE_phy.c | 2 +- drivers/staging/rtl8192e/r819xE_phy.h | 194 +- drivers/staging/rtl8192e/r819xE_phyreg.h | 1117 +++--- drivers/staging/rtl8192su/Kconfig | 3 +- drivers/staging/rtl8192su/TODO | 1 - drivers/staging/rtl8192su/ieee80211/ieee80211.h | 5 +- .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 19 +- .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 20 +- .../staging/rtl8192su/ieee80211/ieee80211_module.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 48 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 6 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 6 +- .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 21 +- .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +- .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192su/r8192SU_HWImg.c | 4276 ------------------- drivers/staging/rtl8192su/r8192SU_HWImg.h | 2 - drivers/staging/rtl8192su/r8192S_firmware.c | 126 +- drivers/staging/rtl8192su/r8192S_firmware.h | 7 - drivers/staging/rtl8192su/r8192S_phy.c | 16 +- drivers/staging/rtl8192su/r8192U.h | 1 - drivers/staging/rtl8192su/r8192U_core.c | 183 +- drivers/staging/rtl8192su/r8192U_dm.c | 2 +- drivers/staging/rtl8192u/Kconfig | 3 +- drivers/staging/rtl8192u/Makefile | 2 +- drivers/staging/rtl8192u/ieee80211.h | 3 - drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +- .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 20 +- .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 48 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192u/r8192U_core.c | 8 +- drivers/staging/samsung-laptop/samsung-laptop.c | 9 +- drivers/staging/sep/sep_driver.c | 28 +- drivers/staging/serqt_usb2/serqt_usb2.c | 4 +- drivers/staging/slicoss/slic.h | 9 - drivers/staging/slicoss/slicoss.c | 116 +- drivers/staging/sm7xx/Kconfig | 7 - drivers/staging/sm7xx/TODO | 1 + drivers/staging/sm7xx/smtc2d.c | 979 ----- drivers/staging/sm7xx/smtc2d.h | 530 --- drivers/staging/sm7xx/smtcfb.c | 131 +- drivers/staging/udlfb/Kconfig | 14 +- drivers/staging/udlfb/udlfb.c | 1993 ++++++--- drivers/staging/udlfb/udlfb.h | 281 +- drivers/staging/usbip/Kconfig | 7 + drivers/staging/usbip/Makefile | 2 +- drivers/staging/usbip/usbip_common.c | 90 +- drivers/staging/usbip/usbip_common.h | 8 +- drivers/staging/vme/Kconfig | 2 + drivers/staging/vme/Makefile | 1 + drivers/staging/vme/TODO | 28 - drivers/staging/vme/boards/Kconfig | 9 + drivers/staging/vme/boards/Makefile | 5 + drivers/staging/vme/boards/vme_vmivme7805.c | 124 + drivers/staging/vme/boards/vme_vmivme7805.h | 37 + drivers/staging/vme/bridges/Kconfig | 2 + drivers/staging/vme/bridges/vme_ca91cx42.c | 1592 ++++---- drivers/staging/vme/bridges/vme_ca91cx42.h | 136 +- drivers/staging/vme/bridges/vme_tsi148.c | 1010 ++--- drivers/staging/vme/bridges/vme_tsi148.h | 16 + drivers/staging/vme/devices/vme_user.c | 65 +- drivers/staging/vme/vme.c | 248 +- drivers/staging/vme/vme.h | 33 +- drivers/staging/vme/vme_api.txt | 27 +- drivers/staging/vme/vme_bridge.h | 107 +- drivers/staging/vt6655/card.c | 6 +- drivers/staging/vt6655/device_main.c | 5 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/winbond/core.h | 2 +- drivers/staging/winbond/localpara.h | 34 +- drivers/staging/winbond/mds_f.h | 3 - drivers/staging/winbond/mds_s.h | 28 - drivers/staging/winbond/mlme_s.h | 8 - drivers/staging/winbond/mto.h | 5 - drivers/staging/winbond/reg.c | 10 +- drivers/staging/winbond/scan_s.h | 1 - drivers/staging/winbond/sme_api.h | 4 +- drivers/staging/winbond/wb35reg_f.h | 2 +- drivers/staging/winbond/wbusb.c | 24 +- drivers/staging/wlags49_h2/wl_main.c | 2 +- drivers/staging/wlags49_h2/wl_netdev.c | 2 +- drivers/staging/wlags49_h2/wl_pci.c | 1 - drivers/staging/wlags49_h2/wl_profile.c | 76 +- drivers/staging/wlags49_h2/wl_util.c | 49 - drivers/staging/wlags49_h2/wl_util.h | 2 - drivers/staging/wlan-ng/Kconfig | 4 +- drivers/staging/wlan-ng/hfa384x.h | 180 +- drivers/staging/wlan-ng/hfa384x_usb.c | 42 +- drivers/staging/wlan-ng/p80211conv.c | 16 +- drivers/staging/wlan-ng/p80211conv.h | 4 +- drivers/staging/wlan-ng/p80211metadef.h | 18 +- drivers/staging/wlan-ng/p80211mgmt.h | 42 +- drivers/staging/wlan-ng/p80211netdev.c | 7 +- drivers/staging/wlan-ng/p80211netdev.h | 44 +- drivers/staging/wlan-ng/p80211req.c | 2 +- drivers/staging/wlan-ng/p80211req.h | 2 +- drivers/staging/wlan-ng/p80211types.h | 18 +- drivers/staging/wlan-ng/p80211wext.c | 83 +- drivers/staging/wlan-ng/prism2fw.c | 69 +- drivers/staging/wlan-ng/prism2mgmt.c | 30 +- drivers/staging/wlan-ng/prism2mgmt.h | 48 +- drivers/staging/wlan-ng/prism2mib.c | 10 +- drivers/staging/wlan-ng/prism2sta.c | 20 +- drivers/staging/wlan-ng/prism2usb.c | 6 +- drivers/usb/core/devices.c | 69 +- drivers/video/backlight/88pm860x_bl.c | 304 ++ drivers/video/backlight/Kconfig | 13 + drivers/video/backlight/Makefile | 2 + drivers/video/backlight/max8925_bl.c | 200 + drivers/video/console/Kconfig | 1 + drivers/video/console/vgacon.c | 2 +- drivers/virtio/virtio_pci.c | 1 + drivers/xen/Kconfig | 12 +- fs/9p/fid.c | 2 +- fs/9p/v9fs.c | 8 +- fs/9p/v9fs.h | 23 +- fs/9p/vfs_dir.c | 2 +- fs/9p/vfs_file.c | 4 +- fs/9p/vfs_inode.c | 48 +- fs/Kconfig | 1 + fs/Makefile | 1 + fs/adfs/adfs.h | 2 +- fs/adfs/inode.c | 5 +- fs/affs/affs.h | 3 +- fs/affs/inode.c | 2 +- fs/afs/internal.h | 1 - fs/afs/super.c | 1 - fs/afs/write.c | 21 - fs/attr.c | 13 +- fs/bfs/inode.c | 5 +- fs/binfmt_aout.c | 38 +- fs/binfmt_elf.c | 151 +- fs/binfmt_elf_fdpic.c | 181 +- fs/binfmt_flat.c | 2 +- fs/btrfs/ctree.h | 2 +- fs/btrfs/inode.c | 4 +- fs/compat_binfmt_elf.c | 2 + fs/compat_ioctl.c | 4 +- fs/exec.c | 50 +- fs/exofs/exofs.h | 2 +- fs/exofs/inode.c | 4 +- fs/ext2/balloc.c | 12 +- fs/ext2/ext2.h | 2 +- fs/ext2/file.c | 5 +- fs/ext2/ialloc.c | 14 +- fs/ext2/inode.c | 18 +- fs/ext2/namei.c | 51 +- fs/ext2/super.c | 2 + fs/ext2/xattr.c | 10 +- fs/ext3/balloc.c | 11 +- fs/ext3/file.c | 7 +- fs/ext3/ialloc.c | 16 +- fs/ext3/inode.c | 45 +- fs/ext3/namei.c | 24 +- fs/ext3/super.c | 246 +- fs/ext3/xattr.c | 22 +- fs/ext4/balloc.c | 35 +- fs/ext4/block_validity.c | 4 +- fs/ext4/dir.c | 14 +- fs/ext4/ext4.h | 108 +- fs/ext4/ext4_jbd2.c | 4 +- fs/ext4/ext4_jbd2.h | 24 + fs/ext4/extents.c | 260 +- fs/ext4/file.c | 7 +- fs/ext4/fsync.c | 2 +- fs/ext4/ialloc.c | 48 +- fs/ext4/inode.c | 492 ++- fs/ext4/ioctl.c | 12 +- fs/ext4/mballoc.c | 79 +- fs/ext4/mballoc.h | 9 +- fs/ext4/migrate.c | 35 +- fs/ext4/move_extent.c | 36 +- fs/ext4/namei.c | 86 +- fs/ext4/resize.c | 102 +- fs/ext4/super.c | 357 +- fs/ext4/xattr.c | 64 +- fs/fat/inode.c | 9 +- fs/fcntl.c | 2 +- fs/file.c | 2 +- fs/file_table.c | 2 + fs/fs-writeback.c | 22 +- fs/gfs2/quota.c | 9 +- fs/gfs2/quota.h | 2 +- fs/gfs2/super.c | 7 +- fs/gfs2/sys.c | 2 +- fs/hfs/hfs_fs.h | 2 +- fs/hfs/inode.c | 2 +- fs/hfsplus/super.c | 3 +- fs/inode.c | 4 - fs/jbd/commit.c | 10 +- fs/jbd/transaction.c | 43 +- fs/jbd2/checkpoint.c | 1 + fs/jbd2/commit.c | 13 +- fs/jbd2/journal.c | 132 + fs/jbd2/transaction.c | 43 +- fs/jfs/acl.c | 26 +- fs/jfs/file.c | 31 +- fs/jfs/inode.c | 14 +- fs/jfs/jfs_acl.h | 7 +- fs/jfs/jfs_dtree.c | 28 +- fs/jfs/jfs_extent.c | 16 +- fs/jfs/jfs_inode.c | 8 +- fs/jfs/jfs_inode.h | 3 +- fs/jfs/jfs_xtree.c | 21 +- fs/jfs/namei.c | 23 +- fs/jfs/super.c | 6 + fs/jfs/xattr.c | 17 +- fs/lockd/host.c | 2 +- fs/lockd/mon.c | 12 +- fs/lockd/svc.c | 2 - fs/logfs/Kconfig | 17 + fs/logfs/Makefile | 13 + fs/logfs/compr.c | 95 + fs/logfs/dev_bdev.c | 327 ++ fs/logfs/dev_mtd.c | 254 ++ fs/logfs/dir.c | 827 ++++ fs/logfs/file.c | 263 ++ fs/logfs/gc.c | 730 ++++ fs/logfs/inode.c | 417 ++ fs/logfs/journal.c | 883 ++++ fs/logfs/logfs.h | 724 ++++ fs/logfs/logfs_abi.h | 629 +++ fs/logfs/readwrite.c | 2246 ++++++++++ fs/logfs/segment.c | 927 +++++ fs/logfs/super.c | 650 +++ fs/minix/inode.c | 8 +- fs/namei.c | 531 ++-- fs/nfs/callback.c | 2 - fs/nfs/callback.h | 8 + fs/nfs/callback_proc.c | 165 +- fs/nfs/callback_xdr.c | 105 +- fs/nfs/client.c | 48 +- fs/nfs/dir.c | 2 +- fs/nfs/dns_resolve.c | 18 +- fs/nfs/file.c | 30 +- fs/nfs/inode.c | 94 +- fs/nfs/internal.h | 2 +- fs/nfs/nfs3proc.c | 9 +- fs/nfs/nfs4_fs.h | 2 + fs/nfs/nfs4proc.c | 103 +- fs/nfs/nfs4renewd.c | 24 +- fs/nfs/nfs4state.c | 118 +- fs/nfs/nfs4xdr.c | 10 +- fs/nfs/proc.c | 41 + fs/nfs/symlink.c | 2 +- fs/nfs/write.c | 247 +- fs/nfsd/nfs4callback.c | 5 +- fs/nfsd/nfs4recover.c | 4 +- fs/nfsd/nfs4state.c | 6 +- fs/nfsd/nfs4xdr.c | 2 +- fs/nfsd/nfsctl.c | 24 +- fs/nfsd/vfs.c | 157 +- fs/ntfs/dir.c | 2 +- fs/ntfs/file.c | 2 +- fs/ntfs/inode.c | 2 +- fs/ntfs/inode.h | 4 +- fs/ntfs/super.c | 8 + fs/ocfs2/alloc.c | 13 +- fs/ocfs2/aops.c | 11 +- fs/ocfs2/dir.c | 37 +- fs/ocfs2/file.c | 20 +- fs/ocfs2/inode.c | 6 +- fs/ocfs2/namei.c | 52 +- fs/ocfs2/quota_global.c | 7 - fs/ocfs2/quota_local.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/omfs/inode.c | 10 +- fs/open.c | 5 +- fs/proc/array.c | 4 +- fs/proc/generic.c | 33 +- fs/proc/task_mmu.c | 13 +- fs/quota/Kconfig | 5 + fs/quota/Makefile | 2 + fs/quota/compat.c | 118 + fs/quota/dquot.c | 412 +- fs/quota/netlink.c | 95 + fs/quota/quota.c | 735 ++--- fs/reiserfs/bitmap.c | 10 +- fs/reiserfs/file.c | 2 +- fs/reiserfs/inode.c | 24 +- fs/reiserfs/namei.c | 23 +- fs/reiserfs/stree.c | 20 +- fs/reiserfs/super.c | 15 +- fs/reiserfs/xattr.c | 4 - fs/select.c | 2 +- fs/seq_file.c | 4 +- fs/squashfs/Makefile | 2 +- fs/squashfs/block.c | 76 +- fs/squashfs/cache.c | 1 - fs/squashfs/decompressor.c | 68 + fs/squashfs/decompressor.h | 55 + fs/squashfs/dir.c | 1 - fs/squashfs/export.c | 1 - fs/squashfs/file.c | 1 - fs/squashfs/fragment.c | 1 - fs/squashfs/id.c | 1 - fs/squashfs/inode.c | 1 - fs/squashfs/namei.c | 1 - fs/squashfs/squashfs.h | 8 +- fs/squashfs/squashfs_fs.h | 6 +- fs/squashfs/squashfs_fs_sb.h | 40 +- fs/squashfs/super.c | 49 +- fs/squashfs/symlink.c | 1 - fs/squashfs/zlib_wrapper.c | 150 + fs/sync.c | 14 +- fs/sysv/inode.c | 10 +- fs/sysv/sysv.h | 2 +- fs/ubifs/dir.c | 2 +- fs/ubifs/file.c | 8 +- fs/ubifs/super.c | 2 +- fs/udf/balloc.c | 35 +- fs/udf/file.c | 28 +- fs/udf/ialloc.c | 14 +- fs/udf/inode.c | 10 +- fs/udf/namei.c | 17 + fs/udf/udfdecl.h | 2 +- fs/ufs/balloc.c | 24 +- fs/ufs/file.c | 3 +- fs/ufs/ialloc.c | 11 +- fs/ufs/inode.c | 9 +- fs/ufs/namei.c | 18 + fs/ufs/super.c | 6 + fs/ufs/truncate.c | 10 + fs/ufs/ufs.h | 2 +- fs/xfs/Makefile | 1 - fs/xfs/linux-2.6/xfs_aops.c | 221 +- fs/xfs/linux-2.6/xfs_export.c | 20 + fs/xfs/linux-2.6/xfs_file.c | 854 ++++- fs/xfs/linux-2.6/xfs_iops.c | 10 + fs/xfs/linux-2.6/xfs_linux.h | 1 - fs/xfs/linux-2.6/xfs_lrw.c | 796 ---- fs/xfs/linux-2.6/xfs_lrw.h | 29 - fs/xfs/linux-2.6/xfs_quotaops.c | 19 - fs/xfs/linux-2.6/xfs_super.c | 8 +- fs/xfs/linux-2.6/xfs_sync.c | 10 +- fs/xfs/linux-2.6/xfs_trace.c | 16 - fs/xfs/linux-2.6/xfs_trace.h | 22 +- fs/xfs/xfs_bmap.c | 220 +- fs/xfs/xfs_fs.h | 3 +- fs/xfs/xfs_iget.c | 19 +- fs/xfs/xfs_inode.c | 68 +- fs/xfs/xfs_inode.h | 3 +- fs/xfs/xfs_inode_item.c | 18 +- fs/xfs/xfs_itable.c | 2 + fs/xfs/xfs_log.c | 106 +- fs/xfs/xfs_log.h | 16 +- fs/xfs/xfs_mount.c | 69 +- fs/xfs/xfs_mount.h | 2 + fs/xfs/xfs_trans.c | 2 +- fs/xfs/xfs_trans.h | 2 +- fs/xfs/xfs_trans_buf.c | 216 +- fs/xfs/xfs_vnodeops.c | 107 - fs/xfs/xfs_vnodeops.h | 15 +- include/asm-generic/gpio.h | 26 + include/linux/binfmts.h | 1 + include/linux/bitops.h | 4 +- include/linux/btree-128.h | 109 + include/linux/btree-type.h | 147 + include/linux/btree.h | 243 ++ include/linux/coredump.h | 41 + include/linux/cpumask.h | 8 +- include/linux/device-mapper.h | 5 +- include/linux/dm-io.h | 4 +- include/linux/dm-ioctl.h | 9 +- include/linux/elf.h | 28 +- include/linux/elfcore.h | 17 + include/linux/exportfs.h | 5 + include/linux/ext3_fs.h | 35 +- include/linux/ext3_fs_i.h | 2 +- include/linux/fault-inject.h | 5 +- include/linux/firmware-map.h | 6 +- include/linux/fs.h | 25 +- include/linux/gfp.h | 12 +- include/linux/htcpld.h | 24 + include/linux/i2c/pca953x.h | 11 + include/linux/i2c/twl.h | 28 +- include/linux/jbd.h | 11 - include/linux/jbd2.h | 22 +- include/linux/kprobes.h | 44 + include/linux/kvm.h | 10 +- include/linux/kvm_host.h | 71 +- include/linux/list.h | 6 +- include/linux/mfd/88pm8607.h | 217 - include/linux/mfd/88pm860x.h | 375 ++ include/linux/mfd/ab3100.h | 3 - include/linux/mfd/max8925.h | 253 ++ include/linux/mfd/mc13783.h | 26 +- include/linux/mfd/tmio.h | 3 +- include/linux/mfd/ucb1x00.h | 1 + include/linux/mfd/wm831x/core.h | 6 + include/linux/mfd/wm831x/gpio.h | 4 + include/linux/mfd/wm8350/core.h | 49 +- include/linux/mfd/wm8350/gpio.h | 1 + include/linux/mfd/wm8350/rtc.h | 1 + include/linux/mfd/wm8994/core.h | 54 + include/linux/mfd/wm8994/gpio.h | 72 + include/linux/mfd/wm8994/pdata.h | 97 + include/linux/mfd/wm8994/registers.h | 4292 ++++++++++++++++++++ include/linux/mm.h | 104 +- include/linux/mm_types.h | 43 +- include/linux/mmc/card.h | 7 + include/linux/mmc/host.h | 5 + include/linux/mmc/pm.h | 30 + include/linux/mmc/sdio.h | 2 + include/linux/mmc/sdio_func.h | 5 + include/linux/mmzone.h | 7 +- include/linux/nfs_fs.h | 14 +- include/linux/nfs_fs_sb.h | 2 + include/linux/nodemask.h | 11 - include/linux/pci.h | 2 + include/linux/pci_regs.h | 1 + include/linux/pm.h | 51 +- include/linux/pm_runtime.h | 6 + include/linux/quota.h | 33 +- include/linux/quotaops.h | 304 +- include/linux/reiserfs_fs.h | 2 +- include/linux/rmap.h | 38 +- include/linux/sched.h | 58 +- include/linux/serial_sci.h | 6 + include/linux/slab.h | 5 + include/linux/slub_def.h | 27 +- include/linux/smp.h | 2 +- include/linux/spi/max7301.h | 18 + include/linux/sunrpc/bc_xprt.h | 15 + include/linux/virtio_9p.h | 3 - include/net/9p/client.h | 18 +- include/trace/events/ext4.h | 101 + include/trace/events/jbd2.h | 28 + include/trace/events/kvm.h | 41 + init/initramfs.c | 12 +- init/main.c | 7 +- kernel/Makefile | 3 + kernel/cpu.c | 2 +- kernel/elfcore.c | 28 + kernel/exit.c | 5 +- kernel/fork.c | 19 +- kernel/kprobes.c | 647 +++- kernel/padata.c | 8 +- kernel/panic.c | 46 +- kernel/params.c | 1 - kernel/perf_event.c | 2 +- kernel/pid.c | 2 +- kernel/posix-cpu-timers.c | 36 +- kernel/power/hibernate.c | 9 + kernel/power/suspend.c | 3 + kernel/printk.c | 3 +- kernel/relay.c | 5 +- kernel/sched.c | 4 +- kernel/sched_cpupri.c | 2 +- kernel/sched_rt.c | 5 +- kernel/signal.c | 2 +- kernel/sys.c | 3 +- kernel/sysctl.c | 12 + kernel/tsacct.c | 1 + lib/Kconfig | 3 + lib/Kconfig.debug | 5 +- lib/Makefile | 1 + lib/bitmap.c | 19 +- lib/btree.c | 797 ++++ lib/crc32.c | 30 +- lib/list_sort.c | 263 +- lib/show_mem.c | 14 +- lib/string.c | 40 +- lib/vsprintf.c | 71 +- mm/fadvise.c | 10 +- mm/failslab.c | 18 +- mm/filemap.c | 2 +- mm/filemap_xip.c | 2 +- mm/fremap.c | 2 +- mm/ksm.c | 12 +- mm/memcontrol.c | 2 +- mm/memory-failure.c | 5 +- mm/memory.c | 161 +- mm/memory_hotplug.c | 4 + mm/mempolicy.c | 112 +- mm/migrate.c | 4 - mm/mlock.c | 12 +- mm/mmap.c | 151 +- mm/mremap.c | 9 +- mm/nommu.c | 6 +- mm/oom_kill.c | 4 +- mm/page_alloc.c | 53 +- mm/readahead.c | 6 + mm/rmap.c | 185 +- mm/slab.c | 13 +- mm/slub.c | 337 +-- mm/swap.c | 2 +- mm/swapfile.c | 40 +- mm/vmscan.c | 177 +- mm/vmstat.c | 2 +- net/9p/client.c | 114 +- net/9p/protocol.c | 74 +- net/9p/protocol.h | 6 +- net/9p/trans_virtio.c | 80 +- net/sunrpc/addr.c | 8 +- net/sunrpc/auth_gss/auth_gss.c | 11 +- net/sunrpc/svc.c | 6 +- net/sunrpc/svc_xprt.c | 27 +- net/sunrpc/svcauth_unix.c | 49 +- net/sunrpc/svcsock.c | 3 +- net/sunrpc/xprtsock.c | 9 +- scripts/checkpatch.pl | 78 +- scripts/get_maintainer.pl | 185 +- sound/soc/codecs/uda1380.c | 2 +- sound/soc/codecs/wm8350.c | 8 +- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_pcm.c | 2 +- tools/perf/Documentation/perf-probe.txt | 58 +- tools/perf/Makefile | 10 +- tools/perf/builtin-probe.c | 36 +- tools/perf/util/probe-event.c | 55 +- tools/perf/util/probe-finder.c | 1002 +++--- tools/perf/util/probe-finder.h | 53 +- tools/perf/util/string.c | 55 +- tools/perf/util/string.h | 1 + virt/kvm/Kconfig | 3 + virt/kvm/assigned-dev.c | 12 +- virt/kvm/coalesced_mmio.c | 43 +- virt/kvm/coalesced_mmio.h | 15 + virt/kvm/eventfd.c | 21 +- virt/kvm/ioapic.c | 38 +- virt/kvm/ioapic.h | 2 + virt/kvm/iommu.c | 36 +- virt/kvm/kvm_main.c | 392 ++- 1245 files changed, 79385 insertions(+), 38261 deletions(-) create mode 100644 Documentation/ABI/stable/sysfs-devices-node create mode 100644 Documentation/cpu-freq/pcc-cpufreq.txt create mode 100644 Documentation/fault-injection/provoke-crashes.txt create mode 100644 Documentation/filesystems/logfs.txt create mode 100644 Documentation/hwmon/adt7411 delete mode 100644 Documentation/hwmon/adt7473 create mode 100644 Documentation/hwmon/asc7621 create mode 100644 Documentation/init.txt create mode 100644 arch/ia64/kernel/elfcore.c create mode 100644 arch/sh/include/asm/dma-register.h create mode 100644 arch/sh/include/asm/dmaengine.h create mode 100644 arch/sh/include/cpu-sh3/cpu/dma-register.h create mode 100644 arch/sh/include/cpu-sh4/cpu/dma-register.h create mode 100644 arch/um/.gitignore create mode 100644 arch/um/sys-i386/elfcore.c create mode 100644 arch/x86/include/asm/apb_timer.h create mode 100644 arch/x86/include/asm/hyperv.h create mode 100644 arch/x86/include/asm/mrst.h create mode 100644 arch/x86/kernel/apb_timer.c create mode 100644 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c create mode 100644 arch/x86/pci/mrst.c create mode 100644 drivers/base/power/generic_ops.c delete mode 100644 drivers/clocksource/Kconfig create mode 100644 drivers/gpio/it8761e_gpio.c create mode 100644 drivers/gpio/max7300.c create mode 100644 drivers/gpio/max730x.c create mode 100644 drivers/gpio/sch_gpio.c create mode 100644 drivers/gpio/wm8350-gpiolib.c create mode 100644 drivers/gpio/wm8994-gpio.c create mode 100644 drivers/hwmon/adt7411.c delete mode 100644 drivers/hwmon/adt7473.c create mode 100644 drivers/hwmon/asc7621.c create mode 100644 drivers/i2c/busses/i2c-nomadik.c create mode 100644 drivers/i2c/busses/i2c-xiic.c create mode 100644 drivers/input/misc/88pm860x_onkey.c create mode 100644 drivers/input/touchscreen/88pm860x-ts.c create mode 100644 drivers/leds/leds-88pm860x.c delete mode 100644 drivers/mfd/88pm8607.c create mode 100644 drivers/mfd/88pm860x-core.c create mode 100644 drivers/mfd/88pm860x-i2c.c create mode 100644 drivers/mfd/htc-i2cpld.c create mode 100644 drivers/mfd/lpc_sch.c create mode 100644 drivers/mfd/max8925-core.c create mode 100644 drivers/mfd/max8925-i2c.c create mode 100644 drivers/mfd/wm8994-core.c delete mode 100644 drivers/mmc/host/ricoh_mmc.c create mode 100644 drivers/power/max8925_power.c create mode 100644 drivers/regulator/max8925-regulator.c create mode 100644 drivers/rtc/rtc-max8925.c delete mode 100644 drivers/staging/altpciechdma/Kconfig delete mode 100644 drivers/staging/altpciechdma/Makefile delete mode 100644 drivers/staging/altpciechdma/TODO delete mode 100644 drivers/staging/altpciechdma/altpciechdma.c delete mode 100644 drivers/staging/b3dfg/Kconfig delete mode 100644 drivers/staging/b3dfg/Makefile delete mode 100644 drivers/staging/b3dfg/TODO delete mode 100644 drivers/staging/b3dfg/b3dfg.c delete mode 100644 drivers/staging/batman-adv/compat.h delete mode 100644 drivers/staging/batman-adv/log.c create mode 100644 drivers/staging/batman-adv/originator.c rename drivers/staging/batman-adv/{log.h => originator.h} (61%) create mode 100644 drivers/staging/crystalhd/Kconfig create mode 100644 drivers/staging/crystalhd/Makefile create mode 100644 drivers/staging/crystalhd/TODO create mode 100644 drivers/staging/crystalhd/bc_dts_defs.h create mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h create mode 100644 drivers/staging/crystalhd/bc_dts_types.h create mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h create mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h create mode 100644 drivers/staging/crystalhd/crystalhd_hw.c create mode 100644 drivers/staging/crystalhd/crystalhd_hw.h create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h create mode 100644 drivers/staging/crystalhd/crystalhd_misc.c create mode 100644 drivers/staging/crystalhd/crystalhd_misc.h create mode 100644 drivers/staging/dream/include/linux/android_pmem.h create mode 100644 drivers/staging/dream/include/linux/gpio_event.h create mode 100644 drivers/staging/dream/include/linux/msm_adsp.h create mode 100644 drivers/staging/dream/include/linux/msm_audio.h create mode 100644 drivers/staging/dream/include/linux/msm_rpcrouter.h create mode 100644 drivers/staging/dream/include/linux/wakelock.h create mode 100644 drivers/staging/dream/include/mach/camera.h create mode 100644 drivers/staging/dream/include/mach/msm_adsp.h create mode 100644 drivers/staging/dream/include/mach/msm_rpcrouter.h create mode 100644 drivers/staging/dream/include/mach/msm_smd.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h create mode 100644 drivers/staging/dream/include/media/msm_camera.h create mode 100644 drivers/staging/dt3155/Kconfig create mode 100644 drivers/staging/dt3155/Makefile create mode 100644 drivers/staging/dt3155/TODO create mode 100644 drivers/staging/dt3155/allocator.README create mode 100644 drivers/staging/dt3155/allocator.c create mode 100644 drivers/staging/dt3155/allocator.h create mode 100644 drivers/staging/dt3155/dt3155.h create mode 100644 drivers/staging/dt3155/dt3155.sysvinit create mode 100644 drivers/staging/dt3155/dt3155_drv.c create mode 100644 drivers/staging/dt3155/dt3155_drv.h create mode 100644 drivers/staging/dt3155/dt3155_io.c create mode 100644 drivers/staging/dt3155/dt3155_io.h create mode 100644 drivers/staging/dt3155/dt3155_isr.c create mode 100644 drivers/staging/dt3155/dt3155_isr.h delete mode 100644 drivers/staging/et131x/et1310_eeprom.h delete mode 100644 drivers/staging/et131x/et1310_jagcore.h delete mode 100644 drivers/staging/et131x/et1310_mac.h delete mode 100644 drivers/staging/et131x/et1310_pm.h create mode 100644 drivers/staging/et131x/et131x.h delete mode 100644 drivers/staging/et131x/et131x_config.h delete mode 100644 drivers/staging/et131x/et131x_initpci.h delete mode 100644 drivers/staging/et131x/et131x_isr.h delete mode 100644 drivers/staging/et131x/et131x_netdev.h delete mode 100644 drivers/staging/mimio/Kconfig delete mode 100644 drivers/staging/mimio/Makefile delete mode 100644 drivers/staging/mimio/mimio.c delete mode 100644 drivers/staging/p9auth/Kconfig delete mode 100644 drivers/staging/p9auth/Makefile delete mode 100644 drivers/staging/p9auth/p9auth.c delete mode 100644 drivers/staging/rar/Kconfig delete mode 100644 drivers/staging/rar/Makefile delete mode 100644 drivers/staging/rar/rar_driver.c delete mode 100644 drivers/staging/rar/rar_driver.h create mode 100644 drivers/staging/rar_register/Kconfig create mode 100644 drivers/staging/rar_register/Makefile create mode 100644 drivers/staging/rar_register/rar_register.c create mode 100644 drivers/staging/rar_register/rar_register.h delete mode 100644 drivers/staging/rt2860/common/firmware.h delete mode 100644 drivers/staging/rt2860/common/firmware_3070.h delete mode 100644 drivers/staging/rt3070/firmware.h delete mode 100644 drivers/staging/rt3090/firmware.h delete mode 100644 drivers/staging/rtl8187se/r8180_93cx6.c delete mode 100644 drivers/staging/sm7xx/smtc2d.c delete mode 100644 drivers/staging/sm7xx/smtc2d.h create mode 100644 drivers/staging/vme/boards/Kconfig create mode 100644 drivers/staging/vme/boards/Makefile create mode 100644 drivers/staging/vme/boards/vme_vmivme7805.c create mode 100644 drivers/staging/vme/boards/vme_vmivme7805.h create mode 100644 drivers/video/backlight/88pm860x_bl.c create mode 100644 drivers/video/backlight/max8925_bl.c create mode 100644 fs/logfs/Kconfig create mode 100644 fs/logfs/Makefile create mode 100644 fs/logfs/compr.c create mode 100644 fs/logfs/dev_bdev.c create mode 100644 fs/logfs/dev_mtd.c create mode 100644 fs/logfs/dir.c create mode 100644 fs/logfs/file.c create mode 100644 fs/logfs/gc.c create mode 100644 fs/logfs/inode.c create mode 100644 fs/logfs/journal.c create mode 100644 fs/logfs/logfs.h create mode 100644 fs/logfs/logfs_abi.h create mode 100644 fs/logfs/readwrite.c create mode 100644 fs/logfs/segment.c create mode 100644 fs/logfs/super.c create mode 100644 fs/quota/compat.c create mode 100644 fs/quota/netlink.c create mode 100644 fs/squashfs/decompressor.c create mode 100644 fs/squashfs/decompressor.h create mode 100644 fs/squashfs/zlib_wrapper.c delete mode 100644 fs/xfs/linux-2.6/xfs_lrw.c delete mode 100644 fs/xfs/linux-2.6/xfs_lrw.h create mode 100644 include/linux/btree-128.h create mode 100644 include/linux/btree-type.h create mode 100644 include/linux/btree.h create mode 100644 include/linux/coredump.h create mode 100644 include/linux/htcpld.h delete mode 100644 include/linux/mfd/88pm8607.h create mode 100644 include/linux/mfd/88pm860x.h create mode 100644 include/linux/mfd/max8925.h create mode 100644 include/linux/mfd/wm8994/core.h create mode 100644 include/linux/mfd/wm8994/gpio.h create mode 100644 include/linux/mfd/wm8994/pdata.h create mode 100644 include/linux/mfd/wm8994/registers.h create mode 100644 include/linux/mmc/pm.h create mode 100644 kernel/elfcore.c create mode 100644 lib/btree.c Merging fixes/fixes $ git merge fixes/fixes Auto-merging fs/compat_ioctl.c Merge made by recursive. drivers/block/pktcdvd.c | 17 ++++++++++++++--- fs/compat_ioctl.c | 3 --- 2 files changed, 14 insertions(+), 6 deletions(-) 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 Already up-to-date. 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 Merge made by recursive. MAINTAINERS | 1 + drivers/net/benet/be_hw.h | 5 +- drivers/net/benet/be_main.c | 14 +- drivers/net/cassini.c | 2 +- drivers/net/cpmac.c | 2 +- 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/r8169.c | 4 +- drivers/net/s2io.c | 6 +- drivers/net/smc91x.h | 14 + drivers/net/typhoon.c | 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/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/core/ethtool.c | 71 + net/core/sock.c | 16 +- net/dccp/minisocks.c | 2 +- net/ipv4/ip_gre.c | 7 +- net/ipv4/tcp_ipv4.c | 6 +- net/ipv4/tcp_minisocks.c | 2 +- net/ipv4/udp.c | 6 +- net/ipv4/xfrm4_policy.c | 5 +- net/ipv6/addrconf.c | 102 +- net/ipv6/tcp_ipv6.c | 6 +- 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/tipc/bearer.c | 37 +- net/tipc/bearer.h | 2 +- net/tipc/net.c | 25 +- net/tipc/socket.c | 6 +- net/x25/x25_dev.c | 2 +- net/xfrm/xfrm_policy.c | 7 +- 63 files changed, 640 insertions(+), 23407 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 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 Auto-merging drivers/pci/pci.c Merge made by recursive. drivers/pci/pci.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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/input/joystick/gamecon.c | 2 +- drivers/input/tablet/wacom_sys.c | 4 +- drivers/input/tablet/wacom_wac.c | 165 ++++++++++++++------------------------ drivers/input/tablet/wacom_wac.h | 1 - 4 files changed, 63 insertions(+), 109 deletions(-) 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 Auto-merging drivers/i2c/busses/Kconfig Auto-merging drivers/serial/Kconfig 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 +- .../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 +- 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/clock.c | 97 +- 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/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 +- 700 files changed, 47444 insertions(+), 11414 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/{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 (51%) 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 arch/arm/Kconfig Removing arch/arm/mach-msm/clock-7x01a.c Removing arch/arm/mach-msm/idle.S Auto-merging arch/arm/mach-msm/io.c Merge made by recursive. arch/arm/Kconfig | 11 +- arch/arm/mach-msm/Kconfig | 671 ++++++- arch/arm/mach-msm/Makefile | 69 +- arch/arm/mach-msm/Makefile.boot | 18 + arch/arm/mach-msm/acpuclock-8x50.c | 723 +++++++ arch/arm/mach-msm/acpuclock.c | 915 ++++++++ arch/arm/mach-msm/acpuclock.h | 39 + arch/arm/mach-msm/avs.c | 323 +++ arch/arm/mach-msm/avs.h | 52 + arch/arm/mach-msm/avs_hw.S | 158 ++ arch/arm/mach-msm/board-comet.c | 488 +++++ arch/arm/mach-msm/board-dream.c | 4 +- arch/arm/mach-msm/board-halibut-keypad.c | 177 ++ arch/arm/mach-msm/board-halibut.c | 704 +++++++- arch/arm/mach-msm/board-msm7x27.c | 1195 +++++++++++ arch/arm/mach-msm/board-msm7x30.c | 209 ++ arch/arm/mach-msm/board-qsd8x50.c | 538 +++++ arch/arm/mach-msm/board-sapphire-gpio.c | 326 +++ arch/arm/mach-msm/board-sapphire-h2w.c | 545 +++++ arch/arm/mach-msm/board-sapphire-keypad.c | 122 ++ arch/arm/mach-msm/board-sapphire-mmc.c | 479 +++++ arch/arm/mach-msm/board-sapphire-panel.c | 656 ++++++ arch/arm/mach-msm/board-sapphire-rfkill.c | 99 + arch/arm/mach-msm/board-sapphire-wifi.c | 74 + arch/arm/mach-msm/board-sapphire.c | 1175 +++++++++++ arch/arm/mach-msm/board-sapphire.h | 219 ++ arch/arm/mach-msm/board-trout-gpio.c | 305 +++ arch/arm/mach-msm/board-trout-keypad.c | 345 +++ arch/arm/mach-msm/board-trout-mmc.c | 437 ++++ arch/arm/mach-msm/board-trout-panel.c | 642 ++++++ arch/arm/mach-msm/board-trout-rfkill.c | 93 + arch/arm/mach-msm/board-trout-wifi.c | 74 + arch/arm/mach-msm/board-trout.c | 841 ++++++++ arch/arm/mach-msm/board-trout.h | 162 ++ arch/arm/mach-msm/clock-7x01a.c | 126 -- arch/arm/mach-msm/clock-7x30.c | 957 +++++++++ arch/arm/mach-msm/clock-7x30.h | 143 ++ arch/arm/mach-msm/clock-pcom.c | 130 ++ arch/arm/mach-msm/clock-pcom.h | 147 ++ arch/arm/mach-msm/clock.c | 332 +++- arch/arm/mach-msm/clock.h | 69 +- arch/arm/mach-msm/cpufreq.c | 126 ++ arch/arm/mach-msm/dal.c | 1363 ++++++++++++ arch/arm/mach-msm/dal_remotetest.c | 454 ++++ arch/arm/mach-msm/dal_remotetest.h | 187 ++ arch/arm/mach-msm/devices.c | 358 +++- arch/arm/mach-msm/devices.h | 24 +- arch/arm/mach-msm/devices_htc.c | 450 ++++ arch/arm/mach-msm/dma.c | 81 +- arch/arm/mach-msm/dma_test.c | 404 ++++ arch/arm/mach-msm/fiq_glue.S | 64 + arch/arm/mach-msm/generic_gpio.c | 274 +++ arch/arm/mach-msm/gpio.c | 746 +++++++ arch/arm/mach-msm/gpio.h | 35 + arch/arm/mach-msm/gpio_chip.h | 61 + arch/arm/mach-msm/gpio_hw-7x30.h | 112 + arch/arm/mach-msm/gpio_hw-7xxx.h | 73 + arch/arm/mach-msm/gpio_hw-8xxx.h | 112 + arch/arm/mach-msm/gpio_hw.h | 49 + arch/arm/mach-msm/htc_acoustic.c | 239 +++ arch/arm/mach-msm/htc_akm_cal.c | 64 + arch/arm/mach-msm/htc_battery.c | 769 +++++++ arch/arm/mach-msm/htc_headset.c | 1246 +++++++++++ arch/arm/mach-msm/htc_pwrsink.c | 281 +++ arch/arm/mach-msm/htc_wifi_nvs.c | 56 + arch/arm/mach-msm/idle-v6.S | 177 ++ arch/arm/mach-msm/idle-v7.S | 175 ++ arch/arm/mach-msm/idle.S | 36 - arch/arm/mach-msm/idle.h | 36 + arch/arm/mach-msm/include/mach/board.h | 30 +- arch/arm/mach-msm/include/mach/board_htc.h | 78 + arch/arm/mach-msm/include/mach/camera.h | 297 +++ arch/arm/mach-msm/include/mach/clk.h | 53 + arch/arm/mach-msm/include/mach/dal.h | 155 ++ arch/arm/mach-msm/include/mach/dma.h | 40 +- arch/arm/mach-msm/include/mach/dma_test.h | 67 + arch/arm/mach-msm/include/mach/fiq.h | 33 + arch/arm/mach-msm/include/mach/gpio.h | 167 ++ arch/arm/mach-msm/include/mach/htc_headset.h | 173 ++ arch/arm/mach-msm/include/mach/htc_pwrsink.h | 87 + .../mach-msm/include/mach/internal_power_rail.h | 46 + arch/arm/mach-msm/include/mach/io.h | 2 +- arch/arm/mach-msm/include/mach/irqs-7x30.h | 158 ++ arch/arm/mach-msm/include/mach/irqs-7xxx.h | 76 + arch/arm/mach-msm/include/mach/irqs-8xxx.h | 104 + arch/arm/mach-msm/include/mach/irqs.h | 81 +- arch/arm/mach-msm/include/mach/memory.h | 29 +- arch/arm/mach-msm/include/mach/mmc.h | 18 +- arch/arm/mach-msm/include/mach/mpp.h | 73 + arch/arm/mach-msm/include/mach/msm_handset.h | 34 + arch/arm/mach-msm/include/mach/msm_i2ckbd.h | 41 + arch/arm/mach-msm/include/mach/msm_iomap.h | 102 +- arch/arm/mach-msm/include/mach/msm_otg.h | 72 + arch/arm/mach-msm/include/mach/msm_rpcrouter.h | 296 +++ arch/arm/mach-msm/include/mach/msm_smd.h | 82 + arch/arm/mach-msm/include/mach/msm_touch.h | 26 + arch/arm/mach-msm/include/mach/msm_touchpad.h | 37 + arch/arm/mach-msm/include/mach/oem_rapi_client.h | 91 + arch/arm/mach-msm/include/mach/pmic.h | 557 +++++ arch/arm/mach-msm/include/mach/remote_spinlock.h | 165 ++ arch/arm/mach-msm/include/mach/rpc_hsusb.h | 45 + arch/arm/mach-msm/include/mach/sirc.h | 103 + arch/arm/mach-msm/include/mach/smem_log.h | 245 +++ arch/arm/mach-msm/include/mach/system.h | 5 + arch/arm/mach-msm/include/mach/uncompress.h | 1 - arch/arm/mach-msm/include/mach/usbdiag.h | 44 + arch/arm/mach-msm/include/mach/vmalloc.h | 7 +- arch/arm/mach-msm/include/mach/vreg.h | 2 +- arch/arm/mach-msm/internal_power_rail.c | 90 + arch/arm/mach-msm/io.c | 125 ++- arch/arm/mach-msm/irq.c | 535 +++++- arch/arm/mach-msm/irq.h | 43 + arch/arm/mach-msm/jtag-v7.S | 117 ++ arch/arm/mach-msm/keypad-surf-ffa.c | 316 +++ arch/arm/mach-msm/keypad-surf-ffa.h | 29 + arch/arm/mach-msm/memory.c | 86 + arch/arm/mach-msm/modem_notifier.c | 237 +++ arch/arm/mach-msm/modem_notifier.h | 48 + arch/arm/mach-msm/mpp.c | 176 ++ arch/arm/mach-msm/msm-keypad-devices.h | 22 + arch/arm/mach-msm/msm_vibrator.c | 137 ++ arch/arm/mach-msm/nand_partitions.c | 187 ++ arch/arm/mach-msm/nohlt.c | 86 + arch/arm/mach-msm/oem_rapi_client.c | 489 +++++ arch/arm/mach-msm/ping_mdm_rpc_client.c | 772 +++++++ arch/arm/mach-msm/pm.c | 954 +++++++++ arch/arm/mach-msm/pm.h | 42 + arch/arm/mach-msm/pm2.c | 1666 +++++++++++++++ arch/arm/mach-msm/pmic.c | 1095 ++++++++++ arch/arm/mach-msm/pmic8058-gpio.c | 150 ++ arch/arm/mach-msm/pmic8058-mpp.c | 105 + arch/arm/mach-msm/pmic_debugfs.c | 1200 +++++++++++ arch/arm/mach-msm/proc_comm.c | 93 +- arch/arm/mach-msm/proc_comm.h | 192 +- arch/arm/mach-msm/proc_comm_test.c | 169 ++ arch/arm/mach-msm/remote_spinlock.c | 85 + arch/arm/mach-msm/reset_modem.c | 226 ++ arch/arm/mach-msm/rpc_hsusb.c | 574 +++++ arch/arm/mach-msm/rpc_server_dog_keepalive.c | 77 + arch/arm/mach-msm/rpc_server_handset.c | 380 ++++ arch/arm/mach-msm/rpc_server_time_remote.c | 90 + arch/arm/mach-msm/rpc_server_time_remote.h | 21 + arch/arm/mach-msm/sirc.c | 239 +++ arch/arm/mach-msm/smd.c | 1960 +++++++++++++++++ arch/arm/mach-msm/smd_ctl2.c | 677 ++++++ arch/arm/mach-msm/smd_nmea.c | 249 +++ arch/arm/mach-msm/smd_private.h | 256 +++ arch/arm/mach-msm/smd_qmi.c | 843 ++++++++ arch/arm/mach-msm/smd_rpcrouter.c | 2197 ++++++++++++++++++++ arch/arm/mach-msm/smd_rpcrouter.h | 210 ++ arch/arm/mach-msm/smd_rpcrouter_clients.c | 607 ++++++ arch/arm/mach-msm/smd_rpcrouter_device.c | 380 ++++ arch/arm/mach-msm/smd_rpcrouter_servers.c | 434 ++++ arch/arm/mach-msm/smd_tty.c | 285 +++ arch/arm/mach-msm/smem_log.c | 2024 ++++++++++++++++++ arch/arm/mach-msm/socinfo.c | 430 ++++ arch/arm/mach-msm/socinfo.h | 97 + arch/arm/mach-msm/timer.c | 714 ++++++- arch/arm/mach-msm/timer.h | 38 + arch/arm/mach-msm/vreg.c | 170 ++- drivers/mmc/host/msm_sdcc.c | 4 +- include/linux/pm_qos_params.h | 3 +- kernel/pm_qos_params.c | 32 +- 163 files changed, 48344 insertions(+), 685 deletions(-) create mode 100644 arch/arm/mach-msm/acpuclock-8x50.c create mode 100644 arch/arm/mach-msm/acpuclock.c create mode 100644 arch/arm/mach-msm/acpuclock.h create mode 100644 arch/arm/mach-msm/avs.c create mode 100644 arch/arm/mach-msm/avs.h create mode 100644 arch/arm/mach-msm/avs_hw.S create mode 100644 arch/arm/mach-msm/board-comet.c create mode 100644 arch/arm/mach-msm/board-halibut-keypad.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-gpio.c create mode 100644 arch/arm/mach-msm/board-sapphire-h2w.c create mode 100644 arch/arm/mach-msm/board-sapphire-keypad.c create mode 100644 arch/arm/mach-msm/board-sapphire-mmc.c create mode 100644 arch/arm/mach-msm/board-sapphire-panel.c create mode 100644 arch/arm/mach-msm/board-sapphire-rfkill.c create mode 100644 arch/arm/mach-msm/board-sapphire-wifi.c create mode 100644 arch/arm/mach-msm/board-sapphire.c create mode 100644 arch/arm/mach-msm/board-sapphire.h create mode 100644 arch/arm/mach-msm/board-trout-gpio.c create mode 100644 arch/arm/mach-msm/board-trout-keypad.c create mode 100644 arch/arm/mach-msm/board-trout-mmc.c create mode 100644 arch/arm/mach-msm/board-trout-panel.c create mode 100644 arch/arm/mach-msm/board-trout-rfkill.c create mode 100644 arch/arm/mach-msm/board-trout-wifi.c create mode 100644 arch/arm/mach-msm/board-trout.c create mode 100644 arch/arm/mach-msm/board-trout.h delete mode 100644 arch/arm/mach-msm/clock-7x01a.c create mode 100644 arch/arm/mach-msm/clock-7x30.c create mode 100644 arch/arm/mach-msm/clock-7x30.h create mode 100644 arch/arm/mach-msm/clock-pcom.c create mode 100644 arch/arm/mach-msm/clock-pcom.h create mode 100644 arch/arm/mach-msm/cpufreq.c create mode 100644 arch/arm/mach-msm/dal.c create mode 100644 arch/arm/mach-msm/dal_remotetest.c create mode 100644 arch/arm/mach-msm/dal_remotetest.h create mode 100644 arch/arm/mach-msm/devices_htc.c create mode 100644 arch/arm/mach-msm/dma_test.c create mode 100644 arch/arm/mach-msm/fiq_glue.S create mode 100644 arch/arm/mach-msm/generic_gpio.c create mode 100644 arch/arm/mach-msm/gpio.c create mode 100644 arch/arm/mach-msm/gpio.h create mode 100644 arch/arm/mach-msm/gpio_chip.h create mode 100644 arch/arm/mach-msm/gpio_hw-7x30.h create mode 100644 arch/arm/mach-msm/gpio_hw-7xxx.h create mode 100644 arch/arm/mach-msm/gpio_hw-8xxx.h create mode 100644 arch/arm/mach-msm/gpio_hw.h create mode 100644 arch/arm/mach-msm/htc_acoustic.c create mode 100644 arch/arm/mach-msm/htc_akm_cal.c create mode 100644 arch/arm/mach-msm/htc_battery.c create mode 100644 arch/arm/mach-msm/htc_headset.c create mode 100644 arch/arm/mach-msm/htc_pwrsink.c create mode 100644 arch/arm/mach-msm/htc_wifi_nvs.c create mode 100644 arch/arm/mach-msm/idle-v6.S create mode 100644 arch/arm/mach-msm/idle-v7.S delete mode 100644 arch/arm/mach-msm/idle.S create mode 100644 arch/arm/mach-msm/idle.h create mode 100644 arch/arm/mach-msm/include/mach/board_htc.h create mode 100644 arch/arm/mach-msm/include/mach/camera.h create mode 100644 arch/arm/mach-msm/include/mach/clk.h create mode 100644 arch/arm/mach-msm/include/mach/dal.h create mode 100644 arch/arm/mach-msm/include/mach/dma_test.h create mode 100644 arch/arm/mach-msm/include/mach/fiq.h create mode 100644 arch/arm/mach-msm/include/mach/gpio.h create mode 100644 arch/arm/mach-msm/include/mach/htc_headset.h create mode 100644 arch/arm/mach-msm/include/mach/htc_pwrsink.h create mode 100644 arch/arm/mach-msm/include/mach/internal_power_rail.h create mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h create mode 100644 arch/arm/mach-msm/include/mach/irqs-7xxx.h create mode 100644 arch/arm/mach-msm/include/mach/irqs-8xxx.h create mode 100644 arch/arm/mach-msm/include/mach/mpp.h create mode 100644 arch/arm/mach-msm/include/mach/msm_handset.h create mode 100644 arch/arm/mach-msm/include/mach/msm_i2ckbd.h create mode 100644 arch/arm/mach-msm/include/mach/msm_otg.h create mode 100644 arch/arm/mach-msm/include/mach/msm_rpcrouter.h create mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h create mode 100644 arch/arm/mach-msm/include/mach/msm_touch.h create mode 100644 arch/arm/mach-msm/include/mach/msm_touchpad.h create mode 100644 arch/arm/mach-msm/include/mach/oem_rapi_client.h create mode 100644 arch/arm/mach-msm/include/mach/pmic.h create mode 100644 arch/arm/mach-msm/include/mach/remote_spinlock.h create mode 100644 arch/arm/mach-msm/include/mach/rpc_hsusb.h create mode 100644 arch/arm/mach-msm/include/mach/sirc.h create mode 100644 arch/arm/mach-msm/include/mach/smem_log.h create mode 100644 arch/arm/mach-msm/include/mach/usbdiag.h create mode 100644 arch/arm/mach-msm/internal_power_rail.c create mode 100644 arch/arm/mach-msm/irq.h create mode 100644 arch/arm/mach-msm/jtag-v7.S create mode 100644 arch/arm/mach-msm/keypad-surf-ffa.c create mode 100644 arch/arm/mach-msm/keypad-surf-ffa.h create mode 100644 arch/arm/mach-msm/memory.c create mode 100644 arch/arm/mach-msm/modem_notifier.c create mode 100644 arch/arm/mach-msm/modem_notifier.h create mode 100644 arch/arm/mach-msm/mpp.c create mode 100644 arch/arm/mach-msm/msm-keypad-devices.h create mode 100644 arch/arm/mach-msm/msm_vibrator.c create mode 100644 arch/arm/mach-msm/nand_partitions.c create mode 100644 arch/arm/mach-msm/nohlt.c create mode 100644 arch/arm/mach-msm/oem_rapi_client.c create mode 100644 arch/arm/mach-msm/ping_mdm_rpc_client.c create mode 100644 arch/arm/mach-msm/pm.c create mode 100644 arch/arm/mach-msm/pm.h create mode 100644 arch/arm/mach-msm/pm2.c create mode 100644 arch/arm/mach-msm/pmic.c create mode 100644 arch/arm/mach-msm/pmic8058-gpio.c create mode 100644 arch/arm/mach-msm/pmic8058-mpp.c create mode 100644 arch/arm/mach-msm/pmic_debugfs.c create mode 100644 arch/arm/mach-msm/proc_comm_test.c create mode 100644 arch/arm/mach-msm/remote_spinlock.c create mode 100644 arch/arm/mach-msm/reset_modem.c create mode 100644 arch/arm/mach-msm/rpc_hsusb.c create mode 100644 arch/arm/mach-msm/rpc_server_dog_keepalive.c create mode 100644 arch/arm/mach-msm/rpc_server_handset.c create mode 100644 arch/arm/mach-msm/rpc_server_time_remote.c create mode 100644 arch/arm/mach-msm/rpc_server_time_remote.h create mode 100644 arch/arm/mach-msm/sirc.c create mode 100644 arch/arm/mach-msm/smd.c create mode 100644 arch/arm/mach-msm/smd_ctl2.c create mode 100644 arch/arm/mach-msm/smd_nmea.c create mode 100644 arch/arm/mach-msm/smd_private.h create mode 100644 arch/arm/mach-msm/smd_qmi.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter.h create mode 100644 arch/arm/mach-msm/smd_rpcrouter_clients.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter_device.c create mode 100644 arch/arm/mach-msm/smd_rpcrouter_servers.c create mode 100644 arch/arm/mach-msm/smd_tty.c create mode 100644 arch/arm/mach-msm/smem_log.c create mode 100644 arch/arm/mach-msm/socinfo.c create mode 100644 arch/arm/mach-msm/socinfo.h create mode 100644 arch/arm/mach-msm/timer.h 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 Auto-merging drivers/usb/gadget/s3c-hsotg.c Auto-merging sound/soc/s3c24xx/s3c64xx-i2s.c Merge made by recursive. .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 32 +- .../s3c2440-pll-12000000.c | 2 +- .../s3c2440-pll-16934400.c | 2 +- arch/arm/mach-s3c2443/Kconfig | 1 + arch/arm/mach-s3c2443/clock.c | 817 +++++++------------- arch/arm/mach-s3c64xx/Makefile | 2 +- drivers/usb/gadget/s3c-hsotg.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- 8 files changed, 267 insertions(+), 595 deletions(-) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-12000000.c (98%) rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-16934400.c (99%) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. 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 a19a1a9] 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 Recorded preimage for 'drivers/i2c/busses/Kconfig' Recorded preimage for 'drivers/i2c/busses/Makefile' 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/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 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/pb1100/platform.c: needs merge arch/mips/alchemy/devboards/pb1200/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/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'. Recorded resolution for 'drivers/i2c/busses/Kconfig'. Recorded resolution for 'drivers/i2c/busses/Makefile'. [master 5a6b7fd] 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 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/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_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/perf_event_fsl_emb.c | 654 +++++++++++++++++++++++ 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/sysdev/cpm2_pic.h | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 10 +- 22 files changed, 1045 insertions(+), 174 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 s390/features $ git merge s390/features Merge made by recursive. arch/s390/kernel/time.c | 10 +++++----- arch/s390/lib/Makefile | 3 ++- drivers/char/hvc_iucv.c | 6 ++++-- drivers/s390/block/dasd.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/s390/block/dasd_3990_erp.c | 4 ++++ drivers/s390/block/dasd_devmap.c | 13 ++++++++----- drivers/s390/block/dasd_diag.c | 6 ++---- drivers/s390/block/dasd_eckd.c | 27 ++++++++++++++++++--------- drivers/s390/block/dasd_fba.c | 10 ++++++++-- drivers/s390/block/dasd_genhd.c | 3 ++- drivers/s390/block/dasd_int.h | 7 +++++++ drivers/s390/block/dasd_ioctl.c | 6 ++++-- drivers/s390/cio/device.c | 5 +++-- drivers/s390/cio/qdio_main.c | 3 ++- 14 files changed, 105 insertions(+), 34 deletions(-) Merging sh/master $ git merge sh/master Already up-to-date. 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 Recorded preimage for 'fs/gfs2/super.c' Recorded preimage for 'fs/ufs/inode.c' Recorded preimage for 'fs/xfs/linux-2.6/xfs_super.c' Resolved 'fs/nfs/inode.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 Recorded resolution for 'fs/gfs2/super.c'. Recorded resolution for 'fs/ufs/inode.c'. Recorded resolution for 'fs/xfs/linux-2.6/xfs_super.c'. [master 4c728a8] 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 | 2 +- fs/cifs/cifsglob.h | 1 + fs/cifs/cifsproto.h | 4 + fs/cifs/cifssmb.c | 133 ++++++++++++++++++++++++++++++++ fs/cifs/dir.c | 2 +- fs/cifs/file.c | 2 +- fs/cifs/inode.c | 211 ++++++++++++++++++++++++--------------------------- 8 files changed, 241 insertions(+), 117 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 Already up-to-date. 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 Already up-to-date. Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already up-to-date. 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 Auto-merging fs/udf/balloc.c Auto-merging fs/udf/inode.c 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 Recorded preimage for 'fs/namei.c' 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 Recorded resolution for 'fs/namei.c'. [master acaa0ab] 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 Merge made by recursive. Documentation/i2c/busses/i2c-i801 | 8 +++++- drivers/i2c/busses/i2c-i801.c | 45 ++++++++++++++++++++++++------------ drivers/i2c/busses/i2c-powermac.c | 25 ++++++++++++++----- drivers/i2c/busses/i2c-scmi.c | 34 +++++++++++++++++++++------ drivers/i2c/busses/scx200_acb.c | 2 +- 5 files changed, 82 insertions(+), 32 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Already up-to-date. 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/az6027.c' Recorded preimage for 'drivers/media/dvb/ngene/ngene-core.c' Recorded preimage for 'drivers/media/video/cx88/cx88-dvb.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-dvb.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-main.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-radio.c' Recorded preimage for 'drivers/media/video/tlg2300/pd-video.c' Recorded preimage for 'drivers/mfd/Kconfig' Recorded preimage for 'drivers/mfd/Makefile' 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/common/tuners/tuner-xc2028.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/firewire/firedtv-avc.c Auto-merging drivers/media/dvb/firewire/firedtv-fw.c 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/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/mt9v022.c Auto-merging drivers/media/video/rj54n1cb0c.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/az6027.c'. Recorded resolution for 'drivers/media/dvb/ngene/ngene-core.c'. Recorded resolution for 'drivers/media/video/cx88/cx88-dvb.c'. Recorded resolution for 'drivers/media/video/tlg2300/pd-dvb.c'. Recorded resolution for 'drivers/media/video/tlg2300/pd-main.c'. Recorded resolution for 'drivers/media/video/tlg2300/pd-radio.c'. Recorded resolution for 'drivers/media/video/tlg2300/pd-video.c'. Recorded resolution for 'drivers/mfd/Kconfig'. Recorded resolution for 'drivers/mfd/Makefile'. [master bf42d27] 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/dvb-usb/az6027.c | 19 +- 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/ngene/ngene-core.c | 20 +- drivers/media/video/cx88/cx88.h | 2 +- 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/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 | 86 ++ 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 +- 36 files changed, 5474 insertions(+), 72 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 | 53 +- 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 | 35 +- 102 files changed, 2863 insertions(+), 414 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 Recorded preimage for 'drivers/acpi/processor_core.c' 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 Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/acpi/processor_core.c'. [master 6a1740a] 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/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/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/power/power_supply_sysfs.c | 1 + include/acpi/apei.h | 13 + include/acpi/atomicio.h | 10 + include/acpi/processor.h | 10 +- include/linux/power_supply.h | 1 + 36 files changed, 3161 insertions(+), 1434 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 fa88239] 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 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/sd.c | 4 +- include/scsi/libiscsi.h | 3 +- 132 files changed, 7192 insertions(+), 3513 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 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 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 80c80d5] 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 | 188 ++- 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 | 1119 +++++++++++++++++ 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, 4921 insertions(+), 928 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 $ git am -3 ../patches/0001-mtd-nand-fix-name-space-clash.patch Applying: mtd: nand: fix name space clash $ git am -3 ../patches/0001-mtd-declare-inline-functions-static.patch Applying: mtd: declare inline functions static Merging crypto/master $ git merge crypto/master Already up-to-date. Merging sound/for-next $ git merge sound/for-next Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- include/sound/asound.h | 2 +- sound/core/timer.c | 2 +- sound/isa/opti9xx/miro.c | 2 +- sound/isa/opti9xx/opti92x-ad1848.c | 120 ++- sound/isa/sb/jazz16.c | 1 + sound/oss/coproc.h | 2 +- sound/oss/v_midi.h | 5 +- sound/pci/hda/Kconfig | 2 +- sound/pci/hda/Makefile | 4 +- sound/pci/hda/hda_codec.c | 69 +- sound/pci/hda/hda_eld.c | 6 + sound/pci/hda/hda_intel.c | 9 +- sound/pci/hda/patch_nvhdmi.c | 1038 +++++++++++++++++++++-- sound/pci/hda/patch_realtek.c | 10 +- sound/pci/oxygen/xonar_wm87x6.c | 2 +- sound/pci/riptide/riptide.c | 6 +- sound/soc/codecs/ak4104.c | 6 +- sound/soc/soc-core.c | 14 +- sound/usb/Kconfig | 6 +- sound/usb/caiaq/midi.h | 2 +- sound/usb/ua101.c | 100 +-- sound/usb/usbaudio.c | 57 +-- sound/usb/usbaudio.h | 3 +- sound/usb/usbquirks.h | 30 - 25 files changed, 1193 insertions(+), 307 deletions(-) Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Recorded preimage for 'drivers/char/virtio_console.c' Resolved 'MAINTAINERS' using previous resolution. Resolved 'drivers/char/hvc_console.c' using previous resolution. Resolved 'drivers/char/hvc_console.h' 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 Recorded resolution for 'drivers/char/virtio_console.c'. [master 556ff75] 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. $ git commit -v -a # On branch master nothing to commit (working directory clean) $ 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 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 Auto-merging drivers/leds/Kconfig Auto-merging drivers/leds/Makefile 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/video/backlight/Kconfig Auto-merging drivers/video/backlight/Makefile Merge made by recursive. drivers/video/backlight/Kconfig | 7 + drivers/video/backlight/Makefile | 1 + drivers/video/backlight/l4f00242t03.c | 257 +++++++++++++++++++++++++++++++++ drivers/video/backlight/progear_bl.c | 16 ++- include/linux/backlight.h | 8 +- include/linux/spi/l4f00242t03.h | 31 ++++ 6 files changed, 312 insertions(+), 8 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 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 Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Already up-to-date. 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 Already up-to-date. 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/bfin_wdt.c Merge made by recursive. arch/arm/mach-ep93xx/include/mach/ts72xx.h | 2 + arch/arm/mach-ep93xx/ts72xx.c | 21 ++ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- drivers/watchdog/Kconfig | 20 +- drivers/watchdog/Makefile | 2 + drivers/watchdog/acquirewdt.c | 2 +- drivers/watchdog/advantechwdt.c | 2 +- drivers/watchdog/adx_wdt.c | 2 +- drivers/watchdog/alim1535_wdt.c | 2 +- drivers/watchdog/alim7101_wdt.c | 2 +- drivers/watchdog/ar7_wdt.c | 2 +- drivers/watchdog/at32ap700x_wdt.c | 2 +- drivers/watchdog/at91rm9200_wdt.c | 2 +- drivers/watchdog/bcm47xx_wdt.c | 2 +- drivers/watchdog/bfin_wdt.c | 56 +-- drivers/watchdog/booke_wdt.c | 2 +- drivers/watchdog/coh901327_wdt.c | 2 +- drivers/watchdog/cpu5wdt.c | 2 +- drivers/watchdog/cpwd.c | 2 +- drivers/watchdog/davinci_wdt.c | 2 +- drivers/watchdog/ep93xx_wdt.c | 2 +- drivers/watchdog/eurotechwdt.c | 2 +- drivers/watchdog/gef_wdt.c | 16 +- drivers/watchdog/geodewdt.c | 2 +- drivers/watchdog/hpwdt.c | 2 +- drivers/watchdog/i6300esb.c | 2 +- drivers/watchdog/iTCO_wdt.c | 21 +- drivers/watchdog/ib700wdt.c | 2 +- drivers/watchdog/indydog.c | 2 +- drivers/watchdog/it8712f_wdt.c | 2 +- drivers/watchdog/it87_wdt.c | 2 +- drivers/watchdog/ixp2000_wdt.c | 2 +- drivers/watchdog/ixp4xx_wdt.c | 2 +- drivers/watchdog/ks8695_wdt.c | 2 +- drivers/watchdog/machzwd.c | 2 +- drivers/watchdog/max63xx_wdt.c | 397 +++++++++++++++++++++ drivers/watchdog/mixcomwd.c | 2 +- drivers/watchdog/mpc8xxx_wdt.c | 2 +- drivers/watchdog/mpcore_wdt.c | 2 +- drivers/watchdog/mv64x60_wdt.c | 2 +- drivers/watchdog/pc87413_wdt.c | 2 +- drivers/watchdog/pcwd.c | 2 +- drivers/watchdog/pcwd_pci.c | 2 +- drivers/watchdog/pcwd_usb.c | 2 +- drivers/watchdog/pika_wdt.c | 2 +- drivers/watchdog/pnx833x_wdt.c | 2 +- drivers/watchdog/rc32434_wdt.c | 2 +- drivers/watchdog/rdc321x_wdt.c | 2 +- drivers/watchdog/riowd.c | 2 +- drivers/watchdog/sbc_fitpc2_wdt.c | 2 +- drivers/watchdog/sch311x_wdt.c | 2 +- drivers/watchdog/stmp3xxx_wdt.c | 2 +- drivers/watchdog/ts72xx_wdt.c | 520 ++++++++++++++++++++++++++++ drivers/watchdog/txx9wdt.c | 25 +- drivers/watchdog/w83627hf_wdt.c | 2 +- drivers/watchdog/w83977f_wdt.c | 2 +- drivers/watchdog/wdrtas.c | 2 +- drivers/watchdog/wdt.c | 2 +- drivers/watchdog/wdt_pci.c | 2 +- drivers/watchdog/wm831x_wdt.c | 2 +- drivers/watchdog/wm8350_wdt.c | 2 +- 61 files changed, 1052 insertions(+), 130 deletions(-) create mode 100644 drivers/watchdog/max63xx_wdt.c create mode 100644 drivers/watchdog/ts72xx_wdt.c 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 ARecorded preimage for 'Documentation/filesystems/proc.txt' 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 Recorded resolution for 'Documentation/filesystems/proc.txt'. [master 71624ae] 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 1f0cad0] 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 45b3aab] 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 f49e6fe] 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 dc39f4e] 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 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 9faee4f] 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 als/for-next $ git merge als/for-next Auto-merging MAINTAINERS Auto-merging drivers/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/i2c/Kconfig Auto-merging drivers/i2c/Makefile Removing drivers/i2c/chips/Kconfig Removing drivers/i2c/chips/Makefile Auto-merging drivers/misc/Kconfig Auto-merging drivers/misc/Makefile Merge made by recursive. Documentation/ABI/testing/sysfs-class-als | 18 +++++ MAINTAINERS | 8 ++ drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/als/Kconfig | 34 +++++++++ drivers/als/Makefile | 9 ++ drivers/als/als_sys.c | 116 +++++++++++++++++++++++++++++ drivers/{misc => als}/isl29003.c | 46 ++++++++---- drivers/{i2c/chips => als}/tsl2550.c | 96 +++++++++++++++--------- drivers/i2c/Kconfig | 1 - drivers/i2c/Makefile | 2 +- drivers/i2c/chips/Kconfig | 19 ----- drivers/i2c/chips/Makefile | 18 ----- drivers/misc/Kconfig | 10 --- drivers/misc/Makefile | 1 - include/linux/als_sys.h | 35 +++++++++ 16 files changed, 314 insertions(+), 102 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-class-als create mode 100644 drivers/als/Kconfig create mode 100644 drivers/als/Makefile create mode 100644 drivers/als/als_sys.c rename drivers/{misc => als}/isl29003.c (90%) rename drivers/{i2c/chips => als}/tsl2550.c (82%) delete mode 100644 drivers/i2c/chips/Kconfig delete mode 100644 drivers/i2c/chips/Makefile create mode 100644 include/linux/als_sys.h 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 Auto-merging arch/s390/kernel/time.c Auto-merging arch/x86/kernel/cpu/mcheck/mce.c Auto-merging drivers/block/pktcdvd.c Auto-merging drivers/dma/ioat/dma.c Auto-merging drivers/dma/ioat/dma.h Auto-merging drivers/edac/edac_mc_sysfs.c Auto-merging drivers/firmware/memmap.c Auto-merging drivers/gpio/gpiolib.c Auto-merging drivers/i2c/busses/i2c-omap.c Auto-merging drivers/infiniband/core/uverbs_main.c Auto-merging drivers/mtd/ubi/build.c Auto-merging drivers/pci/pci.c Auto-merging drivers/staging/asus_oled/asus_oled.c Removing drivers/uio/uio_smx.c Auto-merging fs/ext4/super.c Auto-merging fs/gfs2/sys.c Auto-merging kernel/module.c Auto-merging kernel/params.c Auto-merging kernel/perf_event.c Auto-merging kernel/sched.c Auto-merging mm/slub.c Merge made by recursive. Documentation/HOWTO | 113 +++----- Documentation/kobject.txt | 2 +- arch/arm/mach-pxa/corgi_ssp.c | 2 +- arch/arm/mach-pxa/sharpsl_pm.c | 2 +- arch/arm/mach-s3c2410/h1940-bluetooth.c | 2 +- arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- arch/ia64/kernel/topology.c | 2 +- arch/mips/txx9/generic/7segled.c | 5 +- arch/powerpc/kernel/cacheinfo.c | 2 +- arch/s390/kernel/smp.c | 12 +- arch/s390/kernel/time.c | 49 +++- arch/sh/kernel/cpu/sh4/sq.c | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- arch/x86/kernel/cpu/mcheck/mce.c | 1 + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- block/blk-integrity.c | 2 +- block/blk-sysfs.c | 2 +- block/elevator.c | 2 +- drivers/acpi/system.c | 2 + drivers/auxdisplay/cfag12864bfb.c | 2 +- drivers/base/Kconfig | 55 +++- drivers/base/bus.c | 26 +- drivers/base/class.c | 16 +- drivers/base/core.c | 49 ++-- drivers/base/cpu.c | 105 +++---- drivers/base/dd.c | 38 ++-- drivers/base/devtmpfs.c | 13 + drivers/base/firmware_class.c | 11 +- drivers/base/memory.c | 20 +- drivers/base/node.c | 81 ++--- drivers/base/platform.c | 76 ++++- drivers/base/power/main.c | 20 +- drivers/base/sys.c | 17 +- drivers/block/osdblk.c | 12 +- drivers/block/pktcdvd.c | 14 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/cpuidle/sysfs.c | 8 +- drivers/dma/ioat/dma.c | 2 +- drivers/dma/ioat/dma.h | 2 +- drivers/edac/edac_device_sysfs.c | 6 +- drivers/edac/edac_mc_sysfs.c | 4 +- drivers/edac/edac_pci_sysfs.c | 4 +- drivers/firewire/core-device.c | 5 +- drivers/firmware/edd.c | 2 +- drivers/firmware/efivars.c | 2 +- drivers/firmware/iscsi_ibft.c | 2 +- drivers/firmware/memmap.c | 2 +- drivers/gpio/gpiolib.c | 8 +- drivers/gpu/drm/drm_sysfs.c | 18 +- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/ttm/ttm_memory.c | 2 +- drivers/i2c/busses/i2c-omap.c | 2 +- drivers/ieee1394/nodemgr.c | 5 +- drivers/infiniband/core/cm.c | 2 +- drivers/infiniband/core/sysfs.c | 2 +- drivers/infiniband/core/ucm.c | 13 +- drivers/infiniband/core/user_mad.c | 9 +- drivers/infiniband/core/uverbs_main.c | 9 +- drivers/macintosh/windfarm_core.c | 1 + drivers/macintosh/windfarm_smu_controls.c | 1 + drivers/md/dm-sysfs.c | 2 +- drivers/md/md.c | 4 +- drivers/media/video/omap24xxcam.c | 2 +- drivers/misc/phantom.c | 13 +- drivers/mtd/ubi/build.c | 3 +- drivers/net/bonding/bond_sysfs.c | 5 +- drivers/net/ibmveth.c | 2 +- drivers/net/iseries_veth.c | 4 +- drivers/net/mlx4/mlx4.h | 1 + drivers/parisc/pdc_stable.c | 2 +- drivers/pci/bus.c | 4 +- drivers/pci/hotplug/fakephp.c | 2 +- drivers/pci/pci-sysfs.c | 5 + drivers/pci/pci.c | 4 +- drivers/pci/slot.c | 2 +- drivers/pcmcia/ds.c | 8 +- drivers/platform/x86/Kconfig | 1 + drivers/platform/x86/hp-wmi.c | 4 +- drivers/platform/x86/msi-laptop.c | 360 +++++++++++++++++++++- drivers/scsi/sgiwd93.c | 2 +- drivers/scsi/sni_53c710.c | 2 +- drivers/staging/asus_oled/asus_oled.c | 13 +- drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + drivers/uio/Kconfig | 24 +- drivers/uio/Makefile | 2 +- drivers/uio/uio.c | 4 +- drivers/uio/uio_netx.c | 172 +++++++++++ drivers/uio/uio_smx.c | 140 --------- drivers/usb/core/driver.c | 4 +- drivers/usb/core/usb.c | 2 +- drivers/uwb/driver.c | 5 +- drivers/uwb/umc-bus.c | 4 +- drivers/uwb/uwb-internal.h | 4 +- drivers/uwb/wlp/sysfs.c | 3 +- drivers/video/acornfb.c | 2 +- drivers/video/arcfb.c | 2 +- drivers/video/cobalt_lcdfb.c | 2 +- drivers/video/efifb.c | 2 +- drivers/video/epson1355fb.c | 2 +- drivers/video/gbefb.c | 2 +- drivers/video/hgafb.c | 2 +- drivers/video/hitfb.c | 2 +- drivers/video/omap2/dss/manager.c | 2 +- drivers/video/omap2/dss/overlay.c | 2 +- drivers/video/q40fb.c | 2 +- drivers/video/s3c2410fb.c | 4 +- drivers/video/sa1100fb.c | 2 +- drivers/video/sgivwfb.c | 2 +- drivers/video/sh_mobile_lcdcfb.c | 2 +- drivers/video/vesafb.c | 2 +- drivers/video/vfb.c | 2 +- drivers/video/vga16fb.c | 2 +- drivers/video/w100fb.c | 2 +- drivers/w1/masters/omap_hdq.c | 4 +- drivers/xen/sys-hypervisor.c | 2 +- fs/btrfs/sysfs.c | 4 +- fs/dlm/lockspace.c | 2 +- fs/ext4/super.c | 2 +- fs/gfs2/sys.c | 4 +- fs/ocfs2/cluster/masklog.c | 2 +- fs/sysfs/bin.c | 50 ++-- fs/sysfs/dir.c | 132 ++++---- fs/sysfs/file.c | 47 ++- fs/sysfs/inode.c | 13 +- fs/sysfs/mount.c | 4 +- fs/sysfs/symlink.c | 38 +++ fs/sysfs/sysfs.h | 17 +- include/linux/device.h | 43 +++- include/linux/kobject.h | 14 +- include/linux/platform_device.h | 9 +- include/linux/sysdev.h | 21 ++- include/linux/sysfs.h | 61 ++++ include/linux/usb.h | 6 +- kernel/module.c | 3 + kernel/params.c | 5 +- kernel/perf_event.c | 13 +- kernel/sched.c | 4 + lib/kobject.c | 6 +- lib/kobject_uevent.c | 2 +- mm/slub.c | 4 +- net/bluetooth/l2cap.c | 4 +- net/bluetooth/rfcomm/core.c | 4 +- net/bluetooth/rfcomm/sock.c | 4 +- net/bluetooth/sco.c | 4 +- net/bridge/br_private.h | 2 +- net/bridge/br_sysfs_if.c | 2 +- samples/kobject/kobject-example.c | 4 +- samples/kobject/kset-example.c | 6 +- 148 files changed, 1472 insertions(+), 798 deletions(-) create mode 100644 drivers/uio/uio_netx.c delete mode 100644 drivers/uio/uio_smx.c $ git am -3 ../patches/0001-i2c-update-for-semaphore-to-mutex-conversion-of-devi.patch Applying: i2c: update for semaphore to mutex conversion of devices $ git reset HEAD^ Unstaged changes after reset: M drivers/i2c/i2c-smbus.c $ git add . $ git commit -v -a --amend [master 0d446c5] Merge branch 'quilt/driver-core' $ 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 92540c7] Merge branch 'quilt/driver-core' 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 Recorded preimage for 'drivers/staging/comedi/drivers/ni_660x.c' Recorded preimage for 'drivers/staging/comedi/drivers/ni_labpc.c' Recorded preimage for 'drivers/staging/comedi/drivers/pcmad.c' Recorded preimage for 'drivers/staging/comedi/drivers/poc.c' Recorded preimage for 'drivers/staging/dream/camera/msm_camera.c' Recorded preimage for 'drivers/staging/dream/camera/s5k3e2fx.c' Recorded preimage for 'drivers/staging/wlan-ng/hfa384x_usb.c' Recorded preimage for 'drivers/staging/wlan-ng/p80211conv.c' Recorded preimage for 'drivers/staging/wlan-ng/p80211metadef.h' Recorded preimage for 'drivers/staging/wlan-ng/p80211wext.c' Recorded preimage for 'drivers/staging/wlan-ng/prism2fw.c' Recorded preimage for 'drivers/staging/wlan-ng/prism2mib.c' Renaming drivers/staging/batman-adv/log.h->drivers/staging/batman-adv/originator.h Auto-merging drivers/staging/batman-adv/originator.h Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/Makefile Auto-merging drivers/staging/comedi/comedi_fops.c Auto-merging drivers/staging/comedi/drivers/ni_660x.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_660x.c Auto-merging drivers/staging/comedi/drivers/ni_labpc.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c Auto-merging drivers/staging/comedi/drivers/pcmad.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/pcmad.c Auto-merging drivers/staging/comedi/drivers/poc.c CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/poc.c Auto-merging drivers/staging/dream/camera/msm_camera.c CONFLICT (content): Merge conflict in drivers/staging/dream/camera/msm_camera.c Auto-merging drivers/staging/dream/camera/s5k3e2fx.c CONFLICT (content): Merge conflict in drivers/staging/dream/camera/s5k3e2fx.c Auto-merging drivers/staging/pohmelfs/inode.c Auto-merging drivers/staging/winbond/wbusb.c Auto-merging drivers/staging/wlan-ng/hfa384x.h Auto-merging drivers/staging/wlan-ng/hfa384x_usb.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/hfa384x_usb.c Auto-merging drivers/staging/wlan-ng/p80211conv.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211conv.c Auto-merging drivers/staging/wlan-ng/p80211metadef.h CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211metadef.h Auto-merging drivers/staging/wlan-ng/p80211wext.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c Auto-merging drivers/staging/wlan-ng/prism2fw.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2fw.c Auto-merging drivers/staging/wlan-ng/prism2mgmt.c Auto-merging drivers/staging/wlan-ng/prism2mib.c CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2mib.c Auto-merging drivers/staging/wlan-ng/prism2sta.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/staging/comedi/drivers/ni_660x.c'. Recorded resolution for 'drivers/staging/comedi/drivers/ni_labpc.c'. Recorded resolution for 'drivers/staging/comedi/drivers/pcmad.c'. Recorded resolution for 'drivers/staging/comedi/drivers/poc.c'. Recorded resolution for 'drivers/staging/dream/camera/msm_camera.c'. Recorded resolution for 'drivers/staging/dream/camera/s5k3e2fx.c'. Recorded resolution for 'drivers/staging/wlan-ng/hfa384x_usb.c'. Recorded resolution for 'drivers/staging/wlan-ng/p80211conv.c'. Recorded resolution for 'drivers/staging/wlan-ng/p80211metadef.h'. Recorded resolution for 'drivers/staging/wlan-ng/p80211wext.c'. Recorded resolution for 'drivers/staging/wlan-ng/prism2fw.c'. Recorded resolution for 'drivers/staging/wlan-ng/prism2mib.c'. [master a9388f0] Merge branch 'quilt/staging' $ git diff -M --stat --summary HEAD^.. Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date. $ git revert e1d5b6598cdc33257fe68302ae9db81d2f7bb883 Finished one revert. [master 492fe5d] Revert "i2c: Add support for Xilinx XPS IIC Bus Interface" 3 files changed, 0 insertions(+), 835 deletions(-) delete mode 100644 drivers/i2c/busses/i2c-xiic.c