$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at c6f7afa Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd Merging origin/master $ git merge origin/master Updating c6f7afa..2c1f189 Fast forward arch/arm/Kconfig | 1 + arch/arm/mach-davinci/board-dm355-evm.c | 1 + arch/arm/mach-davinci/board-dm365-evm.c | 11 +- arch/arm/mach-davinci/board-dm644x-evm.c | 1 + arch/arm/mach-davinci/cp_intc.c | 11 + arch/arm/mach-davinci/devices-da8xx.c | 9 +- arch/arm/mach-davinci/dm365.c | 1 - arch/blackfin/include/asm/page.h | 5 + arch/frv/include/asm/page.h | 2 - drivers/gpu/drm/ati_pcigart.c | 10 +- drivers/gpu/drm/drm_bufs.c | 4 +- drivers/gpu/drm/drm_edid.c | 14 +- drivers/gpu/drm/drm_fb_helper.c | 2 +- drivers/gpu/drm/drm_pci.c | 8 +- drivers/gpu/drm/i915/i915_debugfs.c | 31 +-- drivers/gpu/drm/i915/i915_dma.c | 28 +- drivers/gpu/drm/i915/i915_drv.c | 174 +++++++++++- drivers/gpu/drm/i915/i915_drv.h | 123 ++++----- drivers/gpu/drm/i915/i915_gem.c | 251 +++++++++++++---- drivers/gpu/drm/i915/i915_gem_tiling.c | 46 ++-- drivers/gpu/drm/i915/i915_irq.c | 32 ++- drivers/gpu/drm/i915/i915_reg.h | 11 +- drivers/gpu/drm/i915/i915_suspend.c | 12 - drivers/gpu/drm/i915/intel_crt.c | 2 + drivers/gpu/drm/i915/intel_display.c | 414 ++++++++++++---------------- drivers/gpu/drm/i915/intel_dp.c | 6 + drivers/gpu/drm/i915/intel_hdmi.c | 5 + drivers/gpu/drm/i915/intel_lvds.c | 83 ++----- drivers/gpu/drm/i915/intel_sdvo.c | 3 + drivers/gpu/drm/i915/intel_tv.c | 2 + drivers/gpu/drm/radeon/radeon_atombios.c | 2 + drivers/gpu/drm/radeon/radeon_combios.c | 50 +++- drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- drivers/gpu/drm/radeon/radeon_cp.c | 1 + drivers/gpu/drm/radeon/radeon_device.c | 6 +- drivers/gpu/drm/radeon/radeon_display.c | 5 +- drivers/gpu/drm/radeon/radeon_fence.c | 9 +- drivers/gpu/drm/radeon/radeon_irq.c | 10 +- drivers/gpu/drm/radeon/rs600.c | 2 +- drivers/scsi/cxgb3i/cxgb3i_offload.c | 34 +++- drivers/scsi/lpfc/lpfc_els.c | 4 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 25 ++- drivers/scsi/lpfc/lpfc_hw4.h | 3 +- drivers/scsi/lpfc/lpfc_init.c | 14 +- drivers/scsi/lpfc/lpfc_sli.c | 48 ++-- drivers/scsi/lpfc/lpfc_sli4.h | 2 +- drivers/scsi/lpfc/lpfc_version.h | 2 +- drivers/scsi/lpfc/lpfc_vport.c | 4 +- drivers/scsi/pmcraid.c | 8 +- drivers/scsi/qla2xxx/qla_attr.c | 32 ++- drivers/scsi/qla2xxx/qla_dbg.h | 9 +- drivers/scsi/qla2xxx/qla_def.h | 2 + drivers/scsi/qla2xxx/qla_gbl.h | 1 + drivers/scsi/qla2xxx/qla_init.c | 22 ++ drivers/scsi/qla2xxx/qla_isr.c | 9 +- drivers/scsi/qla2xxx/qla_mbx.c | 64 ++++- drivers/scsi/qla2xxx/qla_mid.c | 2 + drivers/scsi/qla2xxx/qla_os.c | 90 ++++++- drivers/scsi/qla2xxx/qla_version.h | 2 +- drivers/scsi/stex.c | 5 + fs/binfmt_elf_fdpic.c | 13 +- fs/nfsd/vfs.c | 5 +- include/drm/drmP.h | 2 +- include/drm/i915_drm.h | 54 ++++ include/linux/mm_types.h | 2 + mm/nommu.c | 17 +- net/sunrpc/svc_xprt.c | 3 +- 67 files changed, 1206 insertions(+), 662 deletions(-) mode change 100644 => 100755 drivers/scsi/lpfc/lpfc_hw4.h Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. 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 Resolved 'drivers/scsi/cxgb3i/cxgb3i_offload.c' using previous resolution. Auto-merging drivers/net/pcmcia/pcnet_cs.c Auto-merging drivers/scsi/cxgb3i/cxgb3i_offload.c CONFLICT (content): Merge conflict in drivers/scsi/cxgb3i/cxgb3i_offload.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 79fa82b] Merge remote branch 'net-current/master' $ git diff -M --stat --summary HEAD^.. drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +- drivers/net/atarilance.c | 2 +- drivers/net/atlx/atl2.c | 7 +- drivers/net/can/mcp251x.c | 2 +- drivers/net/cs89x0.c | 3 +- drivers/net/fsl_pq_mdio.c | 30 ++++- drivers/net/hamradio/bpqether.c | 4 +- drivers/net/ll_temac_main.c | 2 +- drivers/net/mv643xx_eth.c | 6 +- drivers/net/netxen/netxen_nic_ethtool.c | 195 +++++++++++-------------------- drivers/net/netxen/netxen_nic_main.c | 8 +- drivers/net/niu.c | 2 +- drivers/net/pcmcia/nmclan_cs.c | 1 - drivers/net/pcmcia/pcnet_cs.c | 4 +- drivers/net/phy/broadcom.c | 4 +- drivers/net/phy/mdio_bus.c | 72 ++++++++++-- drivers/net/phy/phy_device.c | 30 +++--- drivers/net/rrunner.c | 2 +- drivers/net/sh_eth.c | 2 +- drivers/net/ucc_geth.c | 3 +- drivers/net/ucc_geth.h | 13 +- drivers/net/usb/hso.c | 105 ++++++++++++----- drivers/net/usb/rtl8150.c | 4 +- drivers/net/via-velocity.c | 8 +- drivers/s390/net/claw.c | 2 +- drivers/serial/serial_cs.c | 15 +++- firmware/Makefile | 3 +- firmware/WHENCE | 1 + firmware/cis/PE520.cis.ihex | 9 ++ include/linux/phy.h | 1 + include/net/ip.h | 16 +++ net/ipv4/ip_output.c | 2 +- net/ipv6/ip6_output.c | 3 +- net/rose/rose_loopback.c | 2 +- net/sctp/socket.c | 3 +- 35 files changed, 336 insertions(+), 232 deletions(-) create mode 100644 firmware/cis/PE520.cis.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 Merge made by recursive. drivers/net/sky2.c | 1 + drivers/pci/pci-sysfs.c | 6 ++++-- drivers/pci/pci.c | 19 +++++++++++++++---- drivers/pci/pcie/aer/aer_inject.c | 28 ++++++++++++++++++++++++++-- drivers/pci/pcie/portdrv_core.c | 16 +++++++--------- drivers/pci/pcie/portdrv_pci.c | 17 ++++++++--------- include/linux/pci.h | 1 + 7 files changed, 62 insertions(+), 26 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c Merge made by recursive. drivers/net/wireless/ath/ath5k/eeprom.c | 32 +++++++++- drivers/net/wireless/ath/ath5k/eeprom.h | 8 +++ drivers/net/wireless/ath/ath9k/Kconfig | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 6 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- drivers/net/wireless/mwl8k.c | 4 +- drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- drivers/net/wireless/rt2x00/rt2x00.h | 6 ++ drivers/net/wireless/rt2x00/rt2x00dev.c | 12 +++- drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- drivers/net/wireless/zd1211rw/zd_mac.c | 13 ++-- net/mac80211/iface.c | 43 ++++++++++++- net/mac80211/mlme.c | 4 +- net/mac80211/rx.c | 4 +- net/mac80211/scan.c | 10 ++-- net/mac80211/tx.c | 5 +- net/mac80211/util.c | 12 ++++ net/mac80211/wme.c | 96 +++++++++++++++++++++-------- net/mac80211/wme.h | 8 ++- net/wireless/reg.c | 2 +- 20 files changed, 215 insertions(+), 62 deletions(-) Merging kbuild-current/for-linus $ git merge kbuild-current/for-linus Merge made by recursive. scripts/Makefile.lib | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) Merging quilt/driver-core.current $ git merge quilt/driver-core.current Already up-to-date. Merging quilt/tty.current $ git merge quilt/tty.current Merge made by recursive. drivers/serial/imx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging quilt/usb.current $ git merge quilt/usb.current Merge made by recursive. drivers/usb/serial/generic.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Merging quilt/staging.current $ git merge quilt/staging.current Merge made by recursive. drivers/staging/asus_oled/asus_oled.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c Merge made by recursive. Documentation/cpu-freq/governors.txt | 4 ++-- arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 3 ++- drivers/cpufreq/cpufreq.c | 19 ++++++++++--------- drivers/cpufreq/cpufreq_ondemand.c | 3 +++ 4 files changed, 17 insertions(+), 12 deletions(-) Merging input-current/for-linus $ git merge input-current/for-linus Merge made by recursive. arch/arm/mach-davinci/include/mach/keyscan.h | 1 + drivers/input/evdev.c | 3 +- drivers/input/joystick/gf2k.c | 2 +- drivers/input/keyboard/atkbd.c | 69 ++++++++++++------------- drivers/input/keyboard/davinci_keyscan.c | 8 +++ drivers/input/mouse/bcm5974.c | 44 ++++++++++++++++- drivers/input/mouse/psmouse-base.c | 41 ++++----------- drivers/input/mouse/synaptics.c | 10 ++++ drivers/input/mouse/synaptics.h | 1 + include/linux/serio.h | 19 ------- 10 files changed, 110 insertions(+), 88 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 arch/arm/Kconfig Merge made by recursive. arch/arm/Kconfig | 1 + arch/arm/common/dmabounce.c | 4 +- arch/arm/configs/raumfeld_defconfig | 1898 +++++++++++++++++++++++++++ arch/arm/include/asm/cacheflush.h | 56 +- arch/arm/include/asm/dma-mapping.h | 79 +- arch/arm/include/asm/io.h | 11 +- arch/arm/include/asm/page.h | 7 +- arch/arm/include/asm/smp_plat.h | 5 + arch/arm/kernel/asm-offsets.c | 5 + arch/arm/mach-davinci/io.c | 2 +- arch/arm/mach-iop13xx/io.c | 7 +- arch/arm/mach-msm/io.c | 3 +- arch/arm/mach-pnx4008/clock.c | 176 ++-- arch/arm/mach-pnx4008/clock.h | 6 +- arch/arm/mach-pnx4008/i2c.c | 108 +-- arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 + arch/arm/mach-pnx4008/include/mach/timex.h | 54 - arch/arm/mach-pnx4008/pm.c | 2 + arch/arm/mach-pnx4008/time.c | 2 + arch/arm/mach-pnx4008/time.h | 70 + arch/arm/mach-pxa/Kconfig | 18 + arch/arm/mach-pxa/Makefile | 3 + arch/arm/mach-pxa/raumfeld.c | 1100 ++++++++++++++++ arch/arm/mm/cache-fa.S | 32 +- arch/arm/mm/cache-v3.S | 43 +- arch/arm/mm/cache-v4.S | 43 +- arch/arm/mm/cache-v4wb.S | 32 +- arch/arm/mm/cache-v4wt.S | 40 +- arch/arm/mm/cache-v6.S | 34 +- arch/arm/mm/cache-v7.S | 34 +- arch/arm/mm/copypage-feroceon.c | 3 +- arch/arm/mm/copypage-v3.c | 2 +- arch/arm/mm/copypage-v4mc.c | 2 +- arch/arm/mm/copypage-v4wb.c | 3 +- arch/arm/mm/copypage-v4wt.c | 2 +- arch/arm/mm/copypage-v6.c | 4 +- arch/arm/mm/copypage-xsc3.c | 3 +- arch/arm/mm/copypage-xscale.c | 2 +- arch/arm/mm/dma-mapping.c | 159 ++-- arch/arm/mm/flush.c | 51 +- arch/arm/mm/ioremap.c | 57 +- arch/arm/mm/nommu.c | 12 + arch/arm/mm/proc-arm1020.S | 32 +- arch/arm/mm/proc-arm1020e.S | 32 +- arch/arm/mm/proc-arm1022.S | 32 +- arch/arm/mm/proc-arm1026.S | 32 +- arch/arm/mm/proc-arm920.S | 32 +- arch/arm/mm/proc-arm922.S | 32 +- arch/arm/mm/proc-arm925.S | 32 +- arch/arm/mm/proc-arm926.S | 32 +- arch/arm/mm/proc-arm940.S | 32 +- arch/arm/mm/proc-arm946.S | 32 +- arch/arm/mm/proc-feroceon.S | 54 +- arch/arm/mm/proc-mohawk.S | 32 +- arch/arm/mm/proc-xsc3.S | 32 +- arch/arm/mm/proc-xscale.S | 49 +- arch/arm/plat-iop/io.c | 3 +- arch/arm/plat-omap/io.c | 2 +- drivers/i2c/busses/i2c-pnx.c | 285 +++-- drivers/watchdog/pnx4008_wdt.c | 39 +- include/linux/i2c-pnx.h | 19 +- 61 files changed, 4292 insertions(+), 725 deletions(-) create mode 100644 arch/arm/configs/raumfeld_defconfig create mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h create mode 100644 arch/arm/mach-pnx4008/time.h create mode 100644 arch/arm/mach-pxa/raumfeld.c Merging davinci/davinci-next $ git merge davinci/davinci-next Auto-merging arch/arm/mach-davinci/devices-da8xx.c Auto-merging arch/arm/mach-davinci/dm365.c Merge made by recursive. arch/arm/mach-davinci/Kconfig | 4 + arch/arm/mach-davinci/Makefile | 3 +- arch/arm/mach-davinci/board-da830-evm.c | 4 +- arch/arm/mach-davinci/board-da850-evm.c | 34 +++- arch/arm/mach-davinci/board-dm646x-evm.c | 143 +++++++--- arch/arm/mach-davinci/cdce949.c | 289 ++++++++++++++++++++ arch/arm/mach-davinci/clock.c | 143 ++++------ arch/arm/mach-davinci/clock.h | 29 ++- arch/arm/mach-davinci/common.c | 2 +- arch/arm/mach-davinci/cpuidle.c | 38 +--- arch/arm/mach-davinci/da830.c | 10 +- arch/arm/mach-davinci/da850.c | 86 +++++- arch/arm/mach-davinci/devices-da8xx.c | 210 +++++++++++++- arch/arm/mach-davinci/dm355.c | 12 +- arch/arm/mach-davinci/dm365.c | 6 +- arch/arm/mach-davinci/dm644x.c | 18 +- arch/arm/mach-davinci/dm646x.c | 44 ++- arch/arm/mach-davinci/dma.c | 101 ++++++- arch/arm/mach-davinci/include/mach/cdce949.h | 19 ++ arch/arm/mach-davinci/include/mach/cpuidle.h | 1 + arch/arm/mach-davinci/include/mach/da8xx.h | 18 +- arch/arm/mach-davinci/include/mach/dm365.h | 2 +- arch/arm/mach-davinci/include/mach/dm644x.h | 2 +- arch/arm/mach-davinci/include/mach/dm646x.h | 4 +- arch/arm/mach-davinci/include/mach/edma.h | 4 +- arch/arm/mach-davinci/include/mach/memory.h | 5 + arch/arm/mach-davinci/include/mach/mux.h | 1 + arch/arm/mach-davinci/include/mach/pm.h | 54 ++++ arch/arm/mach-davinci/include/mach/psc.h | 15 + arch/arm/mach-davinci/include/mach/timex.h | 7 +- arch/arm/mach-davinci/pm.c | 158 +++++++++++ arch/arm/mach-davinci/psc.c | 17 +- arch/arm/mach-davinci/sleep.S | 224 +++++++++++++++ drivers/net/Kconfig | 2 +- drivers/net/davinci_emac.c | 55 +++-- .../mach/emac.h => include/linux/davinci_emac.h | 7 +- 36 files changed, 1460 insertions(+), 311 deletions(-) create mode 100644 arch/arm/mach-davinci/cdce949.c create mode 100644 arch/arm/mach-davinci/include/mach/cdce949.h create mode 100644 arch/arm/mach-davinci/include/mach/pm.h create mode 100644 arch/arm/mach-davinci/pm.c create mode 100644 arch/arm/mach-davinci/sleep.S rename arch/arm/mach-davinci/include/mach/emac.h => include/linux/davinci_emac.h (83%) 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 | 10 +- arch/arm/mach-msm/Kconfig | 671 ++++++- arch/arm/mach-msm/Makefile | 75 +- 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-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 | 115 + 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 | 844 ++++++++ arch/arm/mach-msm/smd_rpcrouter.c | 2199 ++++++++++++++++++++ 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 | 284 +++ 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 ++- include/linux/pm_qos_params.h | 3 +- kernel/pm_qos_params.c | 32 +- 161 files changed, 48299 insertions(+), 679 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/plat-omap/io.c Merge made by recursive. arch/arm/mach-omap1/Makefile | 2 +- arch/arm/mach-omap1/board-fsample.c | 9 +- arch/arm/mach-omap1/board-h2.c | 9 +- arch/arm/mach-omap1/board-h3.c | 9 +- arch/arm/mach-omap1/board-innovator.c | 9 +- arch/arm/mach-omap1/board-osk.c | 9 +- arch/arm/mach-omap1/board-palmte.c | 9 +- arch/arm/mach-omap1/board-palmtt.c | 9 +- arch/arm/mach-omap1/board-palmz71.c | 10 +- arch/arm/mach-omap1/board-perseus2.c | 9 +- arch/arm/mach-omap1/board-sx1.c | 11 +- arch/arm/mach-omap1/board-voiceblue.c | 9 +- arch/arm/mach-omap1/clock_data.c | 10 +- arch/arm/mach-omap1/devices.c | 35 +++++ arch/arm/mach-omap1/flash.c | 33 +++++ arch/arm/mach-omap1/mux.c | 8 + arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-omap2/board-2430sdp.c | 7 +- arch/arm/mach-omap2/board-h4.c | 7 +- arch/arm/mach-omap2/board-zoom-peripherals.c | 8 +- arch/arm/mach-omap2/clock2xxx.c | 57 +++++++-- arch/arm/mach-omap2/clock34xx.c | 1 - arch/arm/mach-omap2/clock34xx_data.c | 6 +- arch/arm/mach-omap2/clockdomain.c | 4 +- arch/arm/mach-omap2/io.c | 19 ++-- arch/arm/mach-omap2/mux.c | 6 +- arch/arm/mach-omap2/opp2420_data.c | 38 +++--- arch/arm/mach-omap2/opp2430_data.c | 30 ++-- arch/arm/mach-omap2/pm34xx.c | 4 +- arch/arm/mach-omap2/serial.c | 12 ++- arch/arm/plat-omap/clock.c | 16 ++- arch/arm/plat-omap/cpu-omap.c | 1 + arch/arm/plat-omap/gpio.c | 63 +++++++++- arch/arm/plat-omap/include/plat/board.h | 1 - arch/arm/plat-omap/include/plat/clock.h | 2 + arch/arm/plat-omap/include/plat/control.h | 2 +- arch/arm/plat-omap/include/plat/flash.h | 16 +++ arch/arm/plat-omap/include/plat/io.h | 36 +++--- arch/arm/plat-omap/include/plat/mux.h | 8 + arch/arm/plat-omap/include/plat/omap7xx.h | 3 + arch/arm/plat-omap/io.c | 12 +- arch/arm/plat-omap/iommu.c | 2 +- arch/arm/plat-omap/mcbsp.c | 20 +++- drivers/mtd/maps/Kconfig | 9 -- drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/omap_nor.c | 188 -------------------------- drivers/video/backlight/omap1_bl.c | 2 - 47 files changed, 408 insertions(+), 364 deletions(-) create mode 100644 arch/arm/mach-omap1/flash.c create mode 100644 arch/arm/plat-omap/include/plat/flash.h Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Merge made by recursive. arch/arm/include/asm/entry-macro-vic2.S | 57 +++ arch/arm/mach-s3c2412/clock.c | 52 ++- arch/arm/mach-s3c2440/clock.c | 6 +- arch/arm/mach-s3c2442/clock.c | 6 +- arch/arm/mach-s3c2443/clock.c | 97 +++-- arch/arm/mach-s3c6400/include/mach/entry-macro.S | 28 +- arch/arm/mach-s3c6400/include/mach/map.h | 4 +- arch/arm/mach-s3c6400/include/mach/tick.h | 2 +- arch/arm/plat-s3c/Kconfig | 75 --- arch/arm/plat-s3c/Makefile | 17 +- arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- arch/arm/plat-s3c64xx/Kconfig | 3 + arch/arm/plat-s3c64xx/clock.c | 10 +- arch/arm/plat-s3c64xx/cpu.c | 4 +- arch/arm/plat-s3c64xx/include/plat/irqs.h | 8 +- arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 71 +--- arch/arm/plat-s3c64xx/irq.c | 209 +-------- arch/arm/plat-s3c64xx/s3c6400-clock.c | 518 ++++++-------------- arch/arm/plat-s5pc1xx/clock.c | 20 +- arch/arm/plat-s5pc1xx/s5pc100-clock.c | 126 ++--- arch/arm/plat-samsung/Kconfig | 94 ++++ arch/arm/plat-samsung/Makefile | 22 + arch/arm/plat-samsung/clock-clksrc.c | 203 ++++++++ arch/arm/{plat-s3c => plat-samsung}/clock.c | 53 ++- 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 .../arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c | 0 arch/arm/{plat-s3c => plat-samsung}/dev-usb.c | 0 arch/arm/{plat-s3c => plat-samsung}/gpio-config.c | 0 arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 ++++ .../include/plat/clock.h | 31 +- arch/arm/plat-samsung/include/plat/irq-uart.h | 20 + arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 13 + arch/arm/plat-samsung/irq-uart.c | 143 ++++++ arch/arm/plat-samsung/irq-vic-timer.c | 86 ++++ arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 112 ++--- 42 files changed, 1190 insertions(+), 1009 deletions(-) create mode 100644 arch/arm/include/asm/entry-macro-vic2.S create mode 100644 arch/arm/plat-samsung/clock-clksrc.c rename arch/arm/{plat-s3c => plat-samsung}/clock.c (85%) 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%) rename arch/arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/dev-usb.c (100%) rename arch/arm/{plat-s3c => plat-samsung}/gpio-config.c (100%) create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (76%) create mode 100644 arch/arm/plat-samsung/include/plat/irq-uart.h create mode 100644 arch/arm/plat-samsung/include/plat/irq-vic-timer.h 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}/pwm-clock.c (82%) Merging avr32/avr32-arch $ git merge avr32/avr32-arch Merge made by recursive. arch/avr32/mach-at32ap/at32ap700x.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) Merging blackfin/for-linus $ git merge blackfin/for-linus Already up-to-date. Merging cris/for-next $ git merge cris/for-next Auto-merging arch/cris/kernel/irq.c Merge made by recursive. arch/cris/arch-v10/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/irq.c | 2 +- arch/cris/arch-v32/kernel/pinmux.c | 4 ++-- arch/cris/arch-v32/mach-a3/pinmux.c | 2 +- arch/cris/arch-v32/mach-fs/pinmux.c | 4 ++-- arch/cris/kernel/irq.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) Merging ia64/test $ git merge ia64/test Merge made by recursive. arch/ia64/include/asm/ftrace.h | 1 - arch/ia64/include/asm/kprobes.h | 5 ----- arch/ia64/include/asm/tlb.h | 2 +- arch/ia64/include/asm/topology.h | 4 +++- arch/ia64/include/asm/types.h | 5 +++++ arch/ia64/kernel/mca.c | 5 ++++- arch/ia64/kernel/perfmon.c | 2 +- arch/ia64/mm/init.c | 2 +- arch/ia64/mm/tlb.c | 32 +++++++++++++++++++------------- 9 files changed, 34 insertions(+), 24 deletions(-) Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Already up-to-date. Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/include/asm/ptrace.h | 14 ++++++++++++++ arch/microblaze/include/asm/unistd.h | 7 ++++--- arch/microblaze/kernel/syscall_table.S | 2 +- 3 files changed, 19 insertions(+), 4 deletions(-) Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Removing arch/mips/alchemy/common/puts.c Removing arch/mips/alchemy/common/reset.c Removing arch/mips/alchemy/devboards/db1x00/irqmap.c Removing arch/mips/alchemy/devboards/pb1200/irqmap.c Removing arch/mips/alchemy/mtx-1/irqmap.c Removing arch/mips/alchemy/xxs1500/irqmap.c Removing arch/mips/include/asm/mach-pb1x00/pb1100.h Removing arch/mips/include/asm/mach-pb1x00/pb1500.h Auto-merging drivers/mtd/maps/Kconfig Auto-merging drivers/mtd/maps/Makefile Removing drivers/mtd/maps/alchemy-flash.c Removing drivers/pcmcia/au1000_db1x00.c Removing drivers/pcmcia/au1000_xxs1500.c Removing sound/soc/au1x/sample-ac97.c Merge made by recursive. arch/mips/alchemy/Kconfig | 28 +- arch/mips/alchemy/common/Makefile | 7 +- arch/mips/alchemy/common/dbdma.c | 74 +- arch/mips/alchemy/common/dma.c | 36 +- arch/mips/alchemy/common/gpiolib-au1000.c | 10 +- arch/mips/alchemy/common/irq.c | 436 ++++---- arch/mips/alchemy/common/platform.c | 152 ++- arch/mips/alchemy/common/puts.c | 68 - arch/mips/alchemy/common/reset.c | 188 --- arch/mips/alchemy/common/setup.c | 12 +- arch/mips/alchemy/common/time.c | 35 +- arch/mips/alchemy/devboards/Makefile | 6 +- arch/mips/alchemy/devboards/bcsr.c | 148 +++ arch/mips/alchemy/devboards/db1200/Makefile | 1 + arch/mips/alchemy/devboards/db1200/platform.c | 561 ++++++++ arch/mips/alchemy/devboards/db1200/setup.c | 118 ++ arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- arch/mips/alchemy/devboards/db1x00/board_setup.c | 185 +++- arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 -- arch/mips/alchemy/devboards/db1x00/platform.c | 118 ++ arch/mips/alchemy/devboards/pb1000/board_setup.c | 30 +- arch/mips/alchemy/devboards/pb1100/Makefile | 3 +- arch/mips/alchemy/devboards/pb1100/board_setup.c | 32 +- arch/mips/alchemy/devboards/pb1100/platform.c | 50 + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- arch/mips/alchemy/devboards/pb1200/board_setup.c | 84 +- arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 -- arch/mips/alchemy/devboards/pb1200/platform.c | 63 +- arch/mips/alchemy/devboards/pb1500/Makefile | 3 +- arch/mips/alchemy/devboards/pb1500/board_setup.c | 40 +- arch/mips/alchemy/devboards/pb1500/platform.c | 49 + arch/mips/alchemy/devboards/pb1550/Makefile | 3 +- arch/mips/alchemy/devboards/pb1550/board_setup.c | 45 +- arch/mips/alchemy/devboards/pb1550/platform.c | 69 + arch/mips/alchemy/devboards/platform.c | 222 ++++ arch/mips/alchemy/devboards/platform.h | 21 + arch/mips/alchemy/devboards/prom.c | 5 + arch/mips/alchemy/mtx-1/Makefile | 2 +- arch/mips/alchemy/mtx-1/board_setup.c | 39 +- arch/mips/alchemy/mtx-1/init.c | 6 + arch/mips/alchemy/mtx-1/irqmap.c | 56 - arch/mips/alchemy/xxs1500/Makefile | 4 +- arch/mips/alchemy/xxs1500/board_setup.c | 52 +- arch/mips/alchemy/xxs1500/init.c | 6 + arch/mips/alchemy/xxs1500/irqmap.c | 52 - arch/mips/alchemy/xxs1500/platform.c | 63 + arch/mips/configs/db1200_defconfig | 1481 +++++++++++++--------- arch/mips/include/asm/mach-au1x00/au1000.h | 884 ++++++------- arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- arch/mips/include/asm/mach-au1x00/au1xxx_eth.h | 18 + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 164 ++-- arch/mips/include/asm/mach-au1x00/gpio.h | 2 +- arch/mips/include/asm/mach-db1x00/bcsr.h | 238 ++++ arch/mips/include/asm/mach-db1x00/db1200.h | 156 +--- arch/mips/include/asm/mach-db1x00/db1x00.h | 100 -- arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 -- arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +-- arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 - arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 -- arch/mips/include/asm/page.h | 12 - arch/mips/include/asm/pgalloc.h | 4 +- arch/mips/include/asm/pgtable-64.h | 36 +- arch/mips/include/asm/pgtable.h | 2 +- arch/mips/kernel/asm-offsets.c | 4 + arch/mips/kernel/linux32.c | 1 - arch/mips/kernel/rtlx.c | 1 - arch/mips/kernel/vpe.c | 1 - arch/mips/mm/init.c | 2 +- arch/mips/mm/pgtable-64.c | 44 +- arch/mips/mm/tlbex.c | 2 + arch/mips/sibyte/common/sb_tbprof.c | 1 - drivers/ide/au1xxx-ide.c | 21 +- drivers/mmc/host/au1xmmc.c | 8 +- drivers/mtd/maps/Kconfig | 6 - drivers/mtd/maps/Makefile | 1 - drivers/mtd/maps/alchemy-flash.c | 166 --- drivers/mtd/nand/au1550nd.c | 4 +- drivers/net/au1000_eth.c | 449 ++++---- drivers/net/au1000_eth.h | 9 + drivers/net/irda/au1k_ir.c | 14 +- drivers/pcmcia/Kconfig | 21 + drivers/pcmcia/Makefile | 12 +- drivers/pcmcia/au1000_db1x00.c | 305 ----- drivers/pcmcia/au1000_generic.h | 12 +- drivers/pcmcia/au1000_pb1x00.c | 119 +-- drivers/pcmcia/au1000_xxs1500.c | 188 --- drivers/pcmcia/db1xxx_ss.c | 630 +++++++++ drivers/pcmcia/xxs1500_ss.c | 357 ++++++ drivers/serial/8250.c | 15 +- drivers/spi/au1550_spi.c | 6 +- drivers/video/tdfxfb.c | 4 +- sound/oss/au1550_ac97.c | 16 +- sound/soc/au1x/Kconfig | 10 +- sound/soc/au1x/Makefile | 4 +- sound/soc/au1x/db1200.c | 141 ++ sound/soc/au1x/dbdma2.c | 14 +- sound/soc/au1x/sample-ac97.c | 144 --- 97 files changed, 5452 insertions(+), 4162 deletions(-) delete mode 100644 arch/mips/alchemy/common/puts.c delete mode 100644 arch/mips/alchemy/common/reset.c create mode 100644 arch/mips/alchemy/devboards/bcsr.c create mode 100644 arch/mips/alchemy/devboards/db1200/Makefile create mode 100644 arch/mips/alchemy/devboards/db1200/platform.c create mode 100644 arch/mips/alchemy/devboards/db1200/setup.c delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c create mode 100644 arch/mips/alchemy/devboards/platform.c create mode 100644 arch/mips/alchemy/devboards/platform.h delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c create mode 100644 arch/mips/alchemy/xxs1500/platform.c create mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx_eth.h create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h delete mode 100644 drivers/mtd/maps/alchemy-flash.c delete mode 100644 drivers/pcmcia/au1000_db1x00.c delete mode 100644 drivers/pcmcia/au1000_xxs1500.c create mode 100644 drivers/pcmcia/db1xxx_ss.c create mode 100644 drivers/pcmcia/xxs1500_ss.c create mode 100644 sound/soc/au1x/db1200.c delete mode 100644 sound/soc/au1x/sample-ac97.c Merging parisc/next $ git merge parisc/next Merge made by recursive. arch/parisc/include/asm/unistd.h | 4 +++- arch/parisc/kernel/syscall_table.S | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) 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 Merge made by recursive. arch/powerpc/configs/52xx/cm5200_defconfig | 75 ++++++++++++++---- arch/powerpc/configs/52xx/lite5200b_defconfig | 90 +++++++++++++++++----- arch/powerpc/configs/52xx/motionpro_defconfig | 79 ++++++++++++++++--- arch/powerpc/configs/52xx/pcm030_defconfig | 83 +++++++++++++++----- arch/powerpc/configs/52xx/tqm5200_defconfig | 79 +++++++++++++++---- arch/powerpc/configs/mpc5200_defconfig | 105 ++++++++++++++++++++----- 6 files changed, 412 insertions(+), 99 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Already up-to-date. Merging sh/master $ git merge sh/master Merge made by recursive. arch/sh/include/asm/pgalloc.h | 32 ++++++------------- arch/sh/include/asm/pgtable.h | 26 ++++----------- arch/sh/include/asm/pgtable_64.h | 11 ------- arch/sh/include/asm/pgtable_nopmd.h | 22 +++++++++++++ arch/sh/include/asm/pgtable_pmd.h | 55 +++++++++++++++++++++++++++++++++ arch/sh/mm/Kconfig | 20 +++++++++++- arch/sh/mm/Makefile | 2 +- arch/sh/mm/cache-sh4.c | 13 ++------ arch/sh/mm/fault_32.c | 3 ++ arch/sh/mm/init.c | 6 ++++ arch/sh/mm/nommu.c | 4 ++ arch/sh/mm/pgtable.c | 57 +++++++++++++++++++++++++++++++++++ mm/Kconfig | 2 +- 13 files changed, 188 insertions(+), 65 deletions(-) create mode 100644 arch/sh/include/asm/pgtable_nopmd.h create mode 100644 arch/sh/include/asm/pgtable_pmd.h create mode 100644 arch/sh/mm/pgtable.c 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 Auto-merging MAINTAINERS Auto-merging fs/Kconfig Merge made by recursive. Documentation/filesystems/ceph.txt | 139 ++ Documentation/ioctl/ioctl-number.txt | 1 + MAINTAINERS | 9 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/ceph/Kconfig | 26 + fs/ceph/Makefile | 37 + fs/ceph/README | 20 + fs/ceph/addr.c | 1115 +++++++++++++ fs/ceph/auth.c | 225 +++ fs/ceph/auth.h | 77 + fs/ceph/auth_none.c | 120 ++ fs/ceph/auth_none.h | 28 + fs/ceph/buffer.c | 61 + fs/ceph/buffer.h | 37 + fs/ceph/caps.c | 2863 ++++++++++++++++++++++++++++++++ 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 | 648 ++++++++ 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/debugfs.c | 450 +++++ fs/ceph/decode.h | 159 ++ fs/ceph/dir.c | 1222 ++++++++++++++ fs/ceph/export.c | 223 +++ fs/ceph/file.c | 904 +++++++++++ fs/ceph/inode.c | 1627 +++++++++++++++++++ fs/ceph/ioctl.c | 160 ++ fs/ceph/ioctl.h | 40 + fs/ceph/mds_client.c | 2975 ++++++++++++++++++++++++++++++++++ fs/ceph/mds_client.h | 332 ++++ fs/ceph/mdsmap.c | 170 ++ fs/ceph/mdsmap.h | 54 + fs/ceph/messenger.c | 2092 ++++++++++++++++++++++++ fs/ceph/messenger.h | 256 +++ fs/ceph/mon_client.c | 751 +++++++++ fs/ceph/mon_client.h | 115 ++ fs/ceph/msgpool.c | 181 ++ fs/ceph/msgpool.h | 27 + fs/ceph/msgr.h | 167 ++ fs/ceph/osd_client.c | 1363 ++++++++++++++++ fs/ceph/osd_client.h | 155 ++ fs/ceph/osdmap.c | 916 +++++++++++ fs/ceph/osdmap.h | 124 ++ fs/ceph/rados.h | 370 +++++ fs/ceph/snap.c | 887 ++++++++++ fs/ceph/super.c | 984 +++++++++++ fs/ceph/super.h | 895 ++++++++++ fs/ceph/types.h | 29 + fs/ceph/xattr.c | 844 ++++++++++ 59 files changed, 25541 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/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/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/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/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/CHANGES | 4 ++++ fs/cifs/cifsfs.h | 2 +- fs/cifs/cifsglob.h | 1 + fs/cifs/connect.c | 30 ++++++++++++++++++++++++++---- 4 files changed, 32 insertions(+), 5 deletions(-) Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Auto-merging fs/ecryptfs/inode.c Merge made by recursive. fs/ecryptfs/file.c | 14 +++--- fs/ecryptfs/inode.c | 118 +++++++++++++++++++++++++++++++++++---------------- 2 files changed, 88 insertions(+), 44 deletions(-) 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 Already up-to-date. 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 Already up-to-date. Merging logfs/master $ git merge logfs/master Auto-merging Documentation/filesystems/00-INDEX Auto-merging MAINTAINERS Auto-merging fs/Kconfig Auto-merging fs/Makefile Auto-merging lib/Kconfig Auto-merging lib/Makefile Merge made by recursive. Documentation/filesystems/00-INDEX | 2 + Documentation/filesystems/logfs.txt | 241 ++++ MAINTAINERS | 7 + fs/Kconfig | 1 + fs/Makefile | 1 + fs/logfs/Kconfig | 17 + fs/logfs/Makefile | 13 + fs/logfs/compr.c | 95 ++ fs/logfs/dev_bdev.c | 263 ++++ fs/logfs/dev_mtd.c | 253 ++++ fs/logfs/dir.c | 827 +++++++++++++ fs/logfs/file.c | 263 ++++ fs/logfs/gc.c | 730 ++++++++++++ fs/logfs/inode.c | 417 +++++++ fs/logfs/journal.c | 879 ++++++++++++++ fs/logfs/logfs.h | 722 +++++++++++ fs/logfs/logfs_abi.h | 627 ++++++++++ fs/logfs/readwrite.c | 2246 +++++++++++++++++++++++++++++++++++ fs/logfs/segment.c | 924 ++++++++++++++ fs/logfs/super.c | 634 ++++++++++ include/linux/btree-128.h | 109 ++ include/linux/btree-type.h | 147 +++ include/linux/btree.h | 243 ++++ lib/Kconfig | 3 + lib/Makefile | 1 + lib/btree.c | 797 +++++++++++++ 26 files changed, 10462 insertions(+), 0 deletions(-) create mode 100644 Documentation/filesystems/logfs.txt 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 include/linux/btree-128.h create mode 100644 include/linux/btree-type.h create mode 100644 include/linux/btree.h create mode 100644 lib/btree.c Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/fs-writeback.c | 31 +++++++++++++++++++++++++- fs/nfs/client.c | 1 + fs/nfs/dir.c | 1 + fs/nfs/file.c | 1 + fs/nfs/inode.c | 16 ------------- fs/nfs/internal.h | 3 +- fs/nfs/super.c | 2 - fs/nfs/write.c | 39 +++++++++++++++++++++++++++++--- include/linux/backing-dev.h | 9 ++++++- include/linux/fs.h | 9 +++++++ include/linux/writeback.h | 5 ++++ mm/backing-dev.c | 6 +++- mm/filemap.c | 2 +- mm/page-writeback.c | 30 ++++++++++++++++++++----- mm/truncate.c | 2 +- net/sunrpc/auth_gss/auth_gss.c | 17 +++++++++++++- net/sunrpc/auth_gss/gss_krb5_mech.c | 4 ++- net/sunrpc/auth_gss/gss_mech_switch.c | 2 +- 18 files changed, 142 insertions(+), 38 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already uptodate! Merge made by recursive. 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 Auto-merging lib/Kconfig Auto-merging lib/Makefile Merge made by recursive. fs/squashfs/Kconfig | 6 ++ fs/squashfs/Makefile | 3 +- fs/squashfs/block.c | 76 +--------------- fs/squashfs/cache.c | 1 - fs/squashfs/decompressor.c | 72 ++++++++++++++++ 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/lzma_wrapper.c | 151 +++++++++++++++++++++++++++++++++ fs/squashfs/namei.c | 1 - fs/squashfs/squashfs.h | 11 ++- fs/squashfs/squashfs_fs.h | 4 +- fs/squashfs/squashfs_fs_sb.h | 41 +++++----- fs/squashfs/super.c | 49 ++++++----- fs/squashfs/symlink.c | 1 - fs/squashfs/zlib_wrapper.c | 150 ++++++++++++++++++++++++++++++++ include/linux/decompress/bunzip2_mm.h | 13 +++ include/linux/decompress/inflate_mm.h | 13 +++ include/linux/decompress/mm.h | 4 - include/linux/decompress/unlzma_mm.h | 20 +++++ lib/Kconfig | 3 + lib/Makefile | 2 +- lib/decompress_bunzip2.c | 1 + lib/decompress_inflate.c | 1 + lib/decompress_unlzma.c | 88 ++++++++++--------- 29 files changed, 600 insertions(+), 172 deletions(-) create mode 100644 fs/squashfs/decompressor.c create mode 100644 fs/squashfs/decompressor.h create mode 100644 fs/squashfs/lzma_wrapper.c create mode 100644 fs/squashfs/zlib_wrapper.c create mode 100644 include/linux/decompress/bunzip2_mm.h create mode 100644 include/linux/decompress/inflate_mm.h create mode 100644 include/linux/decompress/unlzma_mm.h Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Resolved 'fs/9p/cache.c' using previous resolution. Auto-merging fs/9p/cache.c CONFLICT (add/add): Merge conflict in fs/9p/cache.c Auto-merging fs/9p/vfs_inode.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0b63238] Merge remote branch 'v9fs/for-next' $ git diff -M --stat --summary HEAD^.. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Resolved 'fs/xfs/linux-2.6/xfs_trace.h' using previous resolution. Resolved 'include/linux/fs.h' using previous resolution. Auto-merging fs/xfs/linux-2.6/xfs_acl.c Auto-merging fs/xfs/linux-2.6/xfs_aops.c Auto-merging fs/xfs/linux-2.6/xfs_iops.c Auto-merging fs/xfs/linux-2.6/xfs_lrw.c Auto-merging fs/xfs/linux-2.6/xfs_trace.h CONFLICT (add/add): Merge conflict in fs/xfs/linux-2.6/xfs_trace.h Auto-merging fs/xfs/quota/xfs_dquot.h Auto-merging fs/xfs/xfs_iget.c Auto-merging fs/xfs/xfs_log_recover.c Auto-merging fs/xfs/xfs_mount.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c0f234d] Merge remote branch 'xfs/master' $ git diff -M --stat --summary HEAD^.. fs/xfs/linux-2.6/xfs_trace.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Merging reiserfs-bkl/reiserfs/kill-bkl $ git merge reiserfs-bkl/reiserfs/kill-bkl Auto-merging fs/reiserfs/inode.c Auto-merging fs/reiserfs/xattr.c Auto-merging fs/reiserfs/xattr_acl.c Merge made by recursive. fs/reiserfs/inode.c | 19 +++++++++++++++---- fs/reiserfs/ioctl.c | 3 ++- fs/reiserfs/xattr.c | 18 ++++++++++++++---- fs/reiserfs/xattr_acl.c | 2 ++ 4 files changed, 33 insertions(+), 9 deletions(-) Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. $ git am -3 ../patches/0001-ceph-update-for-BDI_RECLAIMABLE-change.patch Applying: ceph: update for BDI_RECLAIMABLE change Merging pci/linux-next $ git merge pci/linux-next Merge made by recursive. drivers/pci/Makefile | 4 +- drivers/pci/hotplug/acpiphp_core.c | 2 - drivers/pci/hotplug/cpqphp.h | 2 - drivers/pci/hotplug/cpqphp_core.c | 57 +++------- drivers/pci/hotplug/cpqphp_ctrl.c | 27 +++-- drivers/pci/hotplug/ibmphp_core.c | 106 +++++------------- drivers/pci/hotplug/pci_hotplug_core.c | 132 ---------------------- drivers/pci/hotplug/pciehp_core.c | 25 ---- drivers/pci/hotplug/pciehp_hpc.c | 72 ++---------- drivers/pci/hotplug/rpaphp_core.c | 24 ++-- drivers/pci/hotplug/shpchp.h | 2 - drivers/pci/hotplug/shpchp_core.c | 35 ------ drivers/pci/hotplug/shpchp_ctrl.c | 13 +-- drivers/pci/hotplug/shpchp_hpc.c | 149 +++++++++++++------------ drivers/pci/pci.c | 7 +- drivers/pci/pci.h | 7 + drivers/pci/probe.c | 194 ++++++++++++++++++++++++++++++-- drivers/pci/quirks.c | 14 +-- drivers/pci/slot.c | 55 +++++++++ include/linux/pci.h | 36 ++++++- include/linux/pci_hotplug.h | 41 +------- 21 files changed, 455 insertions(+), 549 deletions(-) Merging hid/for-next $ git merge hid/for-next Merge made by recursive. drivers/hid/Kconfig | 12 ++ drivers/hid/Makefile | 2 + drivers/hid/hid-3m-pct.c | 291 +++++++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-apple.c | 24 +++- drivers/hid/hid-core.c | 11 ++- drivers/hid/hid-ids.h | 16 ++- drivers/hid/hid-input.c | 7 +- drivers/hid/hid-samsung.c | 25 +++- drivers/hid/hid-stantum.c | 283 +++++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-wacom.c | 3 + include/linux/input.h | 42 +++++++ 11 files changed, 697 insertions(+), 19 deletions(-) create mode 100644 drivers/hid/hid-3m-pct.c create mode 100644 drivers/hid/hid-stantum.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/busses/i2c-piix4.c | 4 ++-- drivers/i2c/busses/i2c-scmi.c | 33 +++++++++++++++++++++++++-------- drivers/i2c/busses/i2c-viapro.c | 4 ++-- drivers/i2c/i2c-core.c | 2 +- 4 files changed, 30 insertions(+), 13 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 Merge made by recursive. Documentation/hwmon/k10temp | 17 ++- drivers/hwmon/Kconfig | 2 +- drivers/hwmon/adt7462.c | 2 +- drivers/hwmon/asus_atk0110.c | 289 ++++++++++++++++++++++++++++++++++-------- drivers/hwmon/coretemp.c | 16 ++- drivers/hwmon/k10temp.c | 38 +++++- 6 files changed, 294 insertions(+), 70 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Merge made by recursive. Documentation/video4linux/gspca.txt | 1 + drivers/media/IR/Makefile | 2 +- drivers/media/IR/ir-functions.c | 2 +- drivers/media/IR/ir-keytable.c | 45 +- drivers/media/IR/ir-sysfs.c | 210 +++ drivers/media/common/tuners/tuner-xc2028.c | 20 +- drivers/media/common/tuners/tuner-xc2028.h | 2 + drivers/media/dvb/Kconfig | 4 + drivers/media/dvb/Makefile | 14 +- drivers/media/dvb/dm1105/dm1105.c | 4 +- drivers/media/dvb/dvb-usb/cxusb.c | 3 + drivers/media/dvb/dvb-usb/dw2102.c | 94 ++- drivers/media/dvb/frontends/Kconfig | 19 + drivers/media/dvb/frontends/Makefile | 2 + drivers/media/dvb/frontends/atbm8830.c | 16 + drivers/media/dvb/frontends/dib8000.c | 2 + drivers/media/dvb/frontends/dib8000.h | 2 +- drivers/media/dvb/frontends/lgdt3305.h | 6 +- drivers/media/dvb/frontends/mb86a16.c | 1878 +++++++++++++++++++++++++++ drivers/media/dvb/frontends/mb86a16.h | 52 + drivers/media/dvb/frontends/mb86a16_priv.h | 151 +++ drivers/media/dvb/frontends/stv0900.h | 2 + drivers/media/dvb/frontends/stv0900_core.c | 87 ++- drivers/media/dvb/frontends/stv0900_priv.h | 11 + drivers/media/dvb/frontends/stv0900_reg.h | 6 + drivers/media/dvb/frontends/stv0900_sw.c | 44 +- drivers/media/dvb/frontends/tda10021.c | 4 + drivers/media/dvb/frontends/tda665x.c | 257 ++++ drivers/media/dvb/frontends/tda665x.h | 52 + drivers/media/dvb/mantis/Kconfig | 32 + drivers/media/dvb/mantis/Makefile | 28 + drivers/media/dvb/mantis/hopper_cards.c | 275 ++++ drivers/media/dvb/mantis/hopper_vp3028.c | 88 ++ drivers/media/dvb/mantis/hopper_vp3028.h | 30 + drivers/media/dvb/mantis/mantis_ca.c | 207 +++ drivers/media/dvb/mantis/mantis_ca.h | 27 + drivers/media/dvb/mantis/mantis_cards.c | 305 +++++ drivers/media/dvb/mantis/mantis_common.h | 179 +++ drivers/media/dvb/mantis/mantis_core.c | 238 ++++ drivers/media/dvb/mantis/mantis_core.h | 57 + drivers/media/dvb/mantis/mantis_dma.c | 256 ++++ drivers/media/dvb/mantis/mantis_dma.h | 30 + drivers/media/dvb/mantis/mantis_dvb.c | 296 +++++ drivers/media/dvb/mantis/mantis_dvb.h | 35 + drivers/media/dvb/mantis/mantis_evm.c | 117 ++ drivers/media/dvb/mantis/mantis_hif.c | 240 ++++ drivers/media/dvb/mantis/mantis_hif.h | 29 + drivers/media/dvb/mantis/mantis_i2c.c | 267 ++++ drivers/media/dvb/mantis/mantis_i2c.h | 30 + drivers/media/dvb/mantis/mantis_input.c | 148 +++ drivers/media/dvb/mantis/mantis_ioc.c | 130 ++ drivers/media/dvb/mantis/mantis_ioc.h | 51 + drivers/media/dvb/mantis/mantis_link.h | 83 ++ drivers/media/dvb/mantis/mantis_pci.c | 177 +++ drivers/media/dvb/mantis/mantis_pci.h | 27 + drivers/media/dvb/mantis/mantis_pcmcia.c | 120 ++ drivers/media/dvb/mantis/mantis_reg.h | 197 +++ drivers/media/dvb/mantis/mantis_uart.c | 186 +++ drivers/media/dvb/mantis/mantis_uart.h | 58 + drivers/media/dvb/mantis/mantis_vp1033.c | 212 +++ drivers/media/dvb/mantis/mantis_vp1033.h | 30 + drivers/media/dvb/mantis/mantis_vp1034.c | 119 ++ drivers/media/dvb/mantis/mantis_vp1034.h | 33 + drivers/media/dvb/mantis/mantis_vp1041.c | 358 +++++ drivers/media/dvb/mantis/mantis_vp1041.h | 33 + drivers/media/dvb/mantis/mantis_vp2033.c | 187 +++ drivers/media/dvb/mantis/mantis_vp2033.h | 30 + drivers/media/dvb/mantis/mantis_vp2040.c | 186 +++ drivers/media/dvb/mantis/mantis_vp2040.h | 32 + drivers/media/dvb/mantis/mantis_vp3028.c | 38 + drivers/media/dvb/mantis/mantis_vp3028.h | 33 + drivers/media/dvb/mantis/mantis_vp3030.c | 105 ++ drivers/media/dvb/mantis/mantis_vp3030.h | 30 + drivers/media/dvb/siano/sms-cards.c | 1 + drivers/media/dvb/siano/smscoreapi.h | 77 ++- drivers/media/dvb/siano/smsdvb.c | 318 +++++- drivers/media/dvb/ttpci/budget-ci.c | 2 +- drivers/media/video/bt8xx/bttv-input.c | 4 +- drivers/media/video/cx231xx/cx231xx-input.c | 2 +- drivers/media/video/cx23885/cx23885-dvb.c | 6 + drivers/media/video/cx23885/cx23885-input.c | 2 +- drivers/media/video/cx88/cx88-input.c | 4 +- drivers/media/video/em28xx/em28xx-input.c | 83 +- drivers/media/video/gspca/gspca.c | 2 + drivers/media/video/gspca/ov534.c | 2 +- drivers/media/video/gspca/sunplus.c | 1 + drivers/media/video/ir-kbd-i2c.c | 4 +- drivers/media/video/saa7134/saa7134-input.c | 4 +- drivers/media/video/uvc/uvc_ctrl.c | 2 +- drivers/media/video/uvc/uvc_driver.c | 65 +- drivers/media/video/uvc/uvc_queue.c | 14 +- drivers/media/video/uvc/uvc_video.c | 55 +- drivers/media/video/uvc/uvcvideo.h | 9 +- drivers/staging/tm6000/Kconfig | 32 + drivers/staging/tm6000/Makefile | 15 + drivers/staging/tm6000/README | 11 + drivers/staging/tm6000/hack.c | 252 ++++ drivers/staging/tm6000/hack.h | 45 + drivers/staging/tm6000/tm6000-alsa.c | 413 ++++++ drivers/staging/tm6000/tm6000-cards.c | 662 ++++++++++ drivers/staging/tm6000/tm6000-core.c | 511 ++++++++ drivers/staging/tm6000/tm6000-dvb.c | 322 +++++ drivers/staging/tm6000/tm6000-i2c.c | 245 ++++ 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 | 278 ++++ include/linux/videodev2.h | 1 + include/media/ir-common.h | 4 +- include/media/ir-core.h | 42 +- include/media/ir-kbd-i2c.h | 2 +- 112 files changed, 14250 insertions(+), 165 deletions(-) create mode 100644 drivers/media/IR/ir-sysfs.c create mode 100644 drivers/media/dvb/frontends/mb86a16.c create mode 100644 drivers/media/dvb/frontends/mb86a16.h create mode 100644 drivers/media/dvb/frontends/mb86a16_priv.h create mode 100644 drivers/media/dvb/frontends/tda665x.c create mode 100644 drivers/media/dvb/frontends/tda665x.h create mode 100644 drivers/media/dvb/mantis/Kconfig create mode 100644 drivers/media/dvb/mantis/Makefile create mode 100644 drivers/media/dvb/mantis/hopper_cards.c create mode 100644 drivers/media/dvb/mantis/hopper_vp3028.c create mode 100644 drivers/media/dvb/mantis/hopper_vp3028.h create mode 100644 drivers/media/dvb/mantis/mantis_ca.c create mode 100644 drivers/media/dvb/mantis/mantis_ca.h create mode 100644 drivers/media/dvb/mantis/mantis_cards.c create mode 100644 drivers/media/dvb/mantis/mantis_common.h create mode 100644 drivers/media/dvb/mantis/mantis_core.c create mode 100644 drivers/media/dvb/mantis/mantis_core.h create mode 100644 drivers/media/dvb/mantis/mantis_dma.c create mode 100644 drivers/media/dvb/mantis/mantis_dma.h create mode 100644 drivers/media/dvb/mantis/mantis_dvb.c create mode 100644 drivers/media/dvb/mantis/mantis_dvb.h create mode 100644 drivers/media/dvb/mantis/mantis_evm.c create mode 100644 drivers/media/dvb/mantis/mantis_hif.c create mode 100644 drivers/media/dvb/mantis/mantis_hif.h create mode 100644 drivers/media/dvb/mantis/mantis_i2c.c create mode 100644 drivers/media/dvb/mantis/mantis_i2c.h create mode 100644 drivers/media/dvb/mantis/mantis_input.c create mode 100644 drivers/media/dvb/mantis/mantis_ioc.c create mode 100644 drivers/media/dvb/mantis/mantis_ioc.h create mode 100644 drivers/media/dvb/mantis/mantis_link.h create mode 100644 drivers/media/dvb/mantis/mantis_pci.c create mode 100644 drivers/media/dvb/mantis/mantis_pci.h create mode 100644 drivers/media/dvb/mantis/mantis_pcmcia.c create mode 100644 drivers/media/dvb/mantis/mantis_reg.h create mode 100644 drivers/media/dvb/mantis/mantis_uart.c create mode 100644 drivers/media/dvb/mantis/mantis_uart.h create mode 100644 drivers/media/dvb/mantis/mantis_vp1033.c create mode 100644 drivers/media/dvb/mantis/mantis_vp1033.h create mode 100644 drivers/media/dvb/mantis/mantis_vp1034.c create mode 100644 drivers/media/dvb/mantis/mantis_vp1034.h create mode 100644 drivers/media/dvb/mantis/mantis_vp1041.c create mode 100644 drivers/media/dvb/mantis/mantis_vp1041.h create mode 100644 drivers/media/dvb/mantis/mantis_vp2033.c create mode 100644 drivers/media/dvb/mantis/mantis_vp2033.h create mode 100644 drivers/media/dvb/mantis/mantis_vp2040.c create mode 100644 drivers/media/dvb/mantis/mantis_vp2040.h create mode 100644 drivers/media/dvb/mantis/mantis_vp3028.c create mode 100644 drivers/media/dvb/mantis/mantis_vp3028.h create mode 100644 drivers/media/dvb/mantis/mantis_vp3030.c create mode 100644 drivers/media/dvb/mantis/mantis_vp3030.h 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/hack.c create mode 100644 drivers/staging/tm6000/hack.h 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 Makefile Merge made by recursive. Makefile | 3 + init/Kconfig | 8 + scripts/Makefile.build | 2 +- scripts/decodecode | 48 +- scripts/genksyms/genksyms.c | 4 +- scripts/kconfig/Makefile | 16 +- scripts/kconfig/expr.c | 27 +- 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/util.c | 2 + scripts/kconfig/zconf.tab.c_shipped | 2 +- scripts/kconfig/zconf.y | 2 +- 17 files changed, 2397 insertions(+), 37 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 Auto-merging Documentation/dontdiff Removing scripts/binoffset.c Merge made by recursive. Documentation/dontdiff | 1 - scripts/.gitignore | 1 - scripts/binoffset.c | 163 ---------------------------------------------- scripts/extract-ikconfig | 127 ++++++++++++----------------------- 4 files changed, 44 insertions(+), 248 deletions(-) delete mode 100644 scripts/binoffset.c 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 | 221 ++++++++++++++++++++++++++++++++++++++++---- drivers/ata/pata_hpt366.c | 21 +--- drivers/ata/pata_hpt37x.c | 187 +++++++++++++++++-------------------- drivers/ata/pata_hpt3x2n.c | 118 +++++++++++------------- 4 files changed, 347 insertions(+), 200 deletions(-) Merging infiniband/for-next $ git merge infiniband/for-next Merge made by recursive. drivers/infiniband/core/cma.c | 2 +- drivers/infiniband/hw/mlx4/qp.c | 2 +- drivers/infiniband/hw/mlx4/srq.c | 6 ++++++ drivers/net/mlx4/main.c | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) Merging acpi/test $ git merge acpi/test Merge made by recursive. Documentation/acpi/apei/einj.txt | 49 +++ Documentation/kernel-parameters.txt | 5 + arch/x86/kernel/reboot.c | 2 +- drivers/acpi/Kconfig | 2 + drivers/acpi/Makefile | 3 + drivers/acpi/acpi_pad.c | 37 ++- 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/bus.c | 10 +- drivers/acpi/ec.c | 126 +++++--- drivers/acpi/sbshc.c | 2 +- drivers/acpi/video.c | 43 +++ drivers/platform/x86/hp-wmi.c | 2 - drivers/platform/x86/sony-laptop.c | 91 +++--- include/acpi/apei.h | 13 + include/acpi/atomicio.h | 10 + include/acpi/platform/aclinux.h | 2 +- 22 files changed, 1964 insertions(+), 117 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 include/acpi/apei.h create mode 100644 include/acpi/atomicio.h Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-device.c | 127 +++++--- drivers/firewire/sbp2.c | 5 +- drivers/media/dvb/firewire/firedtv-1394.c | 19 +- drivers/media/dvb/firewire/firedtv-avc.c | 514 ++++++++++++++++------------- drivers/media/dvb/firewire/firedtv-dvb.c | 1 - drivers/media/dvb/firewire/firedtv-fw.c | 43 +-- drivers/media/dvb/firewire/firedtv.h | 6 +- include/linux/firewire.h | 11 +- 8 files changed, 397 insertions(+), 329 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Merge made by recursive. arch/powerpc/kvm/Kconfig | 2 +- arch/x86/kvm/lapic.c | 11 ++++++----- arch/x86/kvm/mmu.c | 6 ++---- 3 files changed, 9 insertions(+), 10 deletions(-) Merging dlm/next $ git merge dlm/next Already up-to-date. Merging scsi/master $ git merge scsi/master Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already uptodate! Merge made by recursive. Merging net/master $ git merge net/master Resolved 'net/mac80211/iface.c' using previous resolution. Resolved 'net/mac80211/scan.c' using previous resolution. Auto-merging drivers/net/igbvf/netdev.c Auto-merging drivers/net/netxen/netxen_nic_main.c Auto-merging drivers/net/sh_eth.c Auto-merging drivers/net/sky2.c Auto-merging drivers/net/usb/rtl8150.c Auto-merging drivers/net/via-velocity.c Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c Auto-merging drivers/net/wireless/libertas/mesh.c Auto-merging drivers/net/wireless/mwl8k.c Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c Auto-merging drivers/net/wireless/rt2x00/rt2x00.h Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c Auto-merging net/mac80211/iface.c CONFLICT (content): Merge conflict in net/mac80211/iface.c Auto-merging net/mac80211/mlme.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/scan.c CONFLICT (content): Merge conflict in net/mac80211/scan.c Auto-merging net/mac80211/tx.c Auto-merging net/mac80211/util.c Auto-merging net/wireless/reg.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f992288] Merge remote branch 'net/master' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 21 - Documentation/networking/regulatory.txt | 24 + drivers/misc/iwmc3200top/fw-download.c | 50 +- drivers/misc/iwmc3200top/iwmc3200top.h | 4 +- drivers/misc/iwmc3200top/log.h | 31 +- drivers/misc/iwmc3200top/main.c | 59 +- drivers/net/8139too.c | 2 +- drivers/net/bonding/bond_main.c | 11 + drivers/net/cxgb3/cxgb3_offload.c | 2 +- drivers/net/enic/enic.h | 5 +- drivers/net/enic/enic_main.c | 192 +++-- drivers/net/enic/enic_res.c | 16 +- drivers/net/enic/vnic_dev.c | 1 - drivers/net/enic/vnic_enet.h | 5 + drivers/net/enic/vnic_intr.c | 8 +- drivers/net/enic/vnic_intr.h | 3 + drivers/net/enic/vnic_nic.h | 12 +- drivers/net/igbvf/netdev.c | 13 +- drivers/net/lib82596.c | 8 +- drivers/net/mac8390.c | 632 ++++++++------- drivers/net/myri_sbus.c | 6 +- drivers/net/netxen/netxen_nic.h | 2 +- drivers/net/netxen/netxen_nic_hdr.h | 3 +- drivers/net/netxen/netxen_nic_init.c | 3 + drivers/net/netxen/netxen_nic_main.c | 205 ++++-- drivers/net/octeon/octeon_mgmt.c | 7 +- drivers/net/pci-skeleton.c | 2 +- drivers/net/pcmcia/axnet_cs.c | 3 - drivers/net/phy/smsc.c | 21 +- drivers/net/qlge/qlge.h | 19 +- drivers/net/qlge/qlge_main.c | 320 ++++++++- drivers/net/r8169.c | 9 +- drivers/net/sh_eth.c | 10 +- drivers/net/sky2.c | 96 ++-- drivers/net/smc911x.c | 6 +- drivers/net/sunvnet.c | 5 +- drivers/net/usb/catc.c | 6 +- drivers/net/usb/rtl8150.c | 7 +- drivers/net/via-velocity.c | 6 +- drivers/net/wireless/adm8211.c | 12 +- drivers/net/wireless/at76c50x-usb.c | 6 +- drivers/net/wireless/ath/ar9170/ar9170.h | 9 +- drivers/net/wireless/ath/ar9170/hw.h | 1 + drivers/net/wireless/ath/ar9170/mac.c | 2 +- drivers/net/wireless/ath/ar9170/main.c | 110 ++-- drivers/net/wireless/ath/ar9170/usb.c | 2 + drivers/net/wireless/ath/ath5k/base.c | 18 +- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/debug.c | 38 +- drivers/net/wireless/ath/ath9k/hw.c | 40 +- drivers/net/wireless/ath/ath9k/hw.h | 2 +- drivers/net/wireless/ath/ath9k/main.c | 49 +- drivers/net/wireless/ath/ath9k/rc.h | 4 + drivers/net/wireless/b43/Kconfig | 17 +- drivers/net/wireless/b43/Makefile | 2 +- drivers/net/wireless/b43/b43.h | 13 - drivers/net/wireless/b43/dma.c | 2 - drivers/net/wireless/b43/main.c | 35 +- drivers/net/wireless/b43/pio.h | 40 - drivers/net/wireless/b43legacy/main.c | 24 +- drivers/net/wireless/hostap/hostap_hw.c | 9 + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 3 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 3 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 10 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 8 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 251 +++++- drivers/net/wireless/iwlwifi/iwl-calib.c | 7 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 2 +- drivers/net/wireless/iwlwifi/iwl-core.c | 148 +++- drivers/net/wireless/iwlwifi/iwl-core.h | 14 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 105 +++- drivers/net/wireless/iwlwifi/iwl-dev.h | 30 + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 44 + drivers/net/wireless/iwlwifi/iwl3945-base.c | 101 ++- drivers/net/wireless/iwmc3200wifi/rx.c | 71 ++- drivers/net/wireless/libertas/Kconfig | 6 + drivers/net/wireless/libertas/Makefile | 2 +- drivers/net/wireless/libertas/assoc.c | 17 +- drivers/net/wireless/libertas/cmd.c | 22 +- drivers/net/wireless/libertas/cmd.h | 12 - drivers/net/wireless/libertas/cmdresp.c | 16 +- drivers/net/wireless/libertas/defs.h | 7 - drivers/net/wireless/libertas/dev.h | 7 +- drivers/net/wireless/libertas/ethtool.c | 2 + drivers/net/wireless/libertas/main.c | 42 +- drivers/net/wireless/libertas/mesh.c | 29 +- drivers/net/wireless/libertas/mesh.h | 32 + drivers/net/wireless/libertas/scan.c | 2 +- drivers/net/wireless/libertas/tx.c | 2 +- drivers/net/wireless/libertas/wext.c | 26 +- drivers/net/wireless/libertas_tf/main.c | 10 +- drivers/net/wireless/mac80211_hwsim.c | 114 +++- drivers/net/wireless/mwl8k.c | 1010 +++++++++++------------ drivers/net/wireless/p54/main.c | 12 +- drivers/net/wireless/rndis_wlan.c | 42 +- drivers/net/wireless/rt2x00/Kconfig | 4 +- drivers/net/wireless/rt2x00/rt2400pci.c | 5 +- drivers/net/wireless/rt2x00/rt2500pci.c | 39 +- drivers/net/wireless/rt2x00/rt2500usb.c | 38 +- drivers/net/wireless/rt2x00/rt2800lib.c | 94 +-- drivers/net/wireless/rt2x00/rt2800pci.c | 31 +- drivers/net/wireless/rt2x00/rt2800usb.c | 49 +- drivers/net/wireless/rt2x00/rt2800usb.h | 90 ++- drivers/net/wireless/rt2x00/rt2x00.h | 34 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 26 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 3 + drivers/net/wireless/rt2x00/rt2x00queue.c | 79 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +- drivers/net/wireless/rt2x00/rt61pci.c | 29 +- drivers/net/wireless/rt2x00/rt73usb.c | 37 +- drivers/net/wireless/rtl818x/rtl8180.h | 1 - drivers/net/wireless/rtl818x/rtl8180_dev.c | 26 +- drivers/net/wireless/rtl818x/rtl8187.h | 2 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 15 +- drivers/net/wireless/rtl818x/rtl8187_leds.c | 4 +- drivers/net/wireless/wl12xx/wl1251.h | 1 + drivers/net/wireless/wl12xx/wl1251_acx.c | 69 ++ drivers/net/wireless/wl12xx/wl1251_acx.h | 87 ++ drivers/net/wireless/wl12xx/wl1251_debugfs.c | 23 + drivers/net/wireless/wl12xx/wl1251_init.c | 5 + drivers/net/wireless/wl12xx/wl1251_init.h | 47 ++ drivers/net/wireless/wl12xx/wl1251_main.c | 64 ++- drivers/net/wireless/wl12xx/wl1251_ps.c | 9 +- drivers/net/wireless/wl12xx/wl1251_rx.c | 2 +- drivers/net/wireless/wl12xx/wl1251_tx.c | 9 +- drivers/net/wireless/wl12xx/wl1251_tx.h | 17 + drivers/net/wireless/wl12xx/wl1271.h | 35 +- drivers/net/wireless/wl12xx/wl1271_acx.c | 134 ++-- drivers/net/wireless/wl12xx/wl1271_acx.h | 37 +- drivers/net/wireless/wl12xx/wl1271_boot.c | 8 +- drivers/net/wireless/wl12xx/wl1271_cmd.c | 67 +- drivers/net/wireless/wl12xx/wl1271_cmd.h | 33 +- drivers/net/wireless/wl12xx/wl1271_conf.h | 100 ++- drivers/net/wireless/wl12xx/wl1271_debugfs.c | 62 ++ drivers/net/wireless/wl12xx/wl1271_event.c | 20 +- drivers/net/wireless/wl12xx/wl1271_event.h | 2 +- drivers/net/wireless/wl12xx/wl1271_init.c | 12 +- drivers/net/wireless/wl12xx/wl1271_main.c | 492 +++++++----- drivers/net/wireless/wl12xx/wl1271_ps.c | 15 +- drivers/net/wireless/wl12xx/wl1271_tx.c | 43 +- drivers/net/wireless/zd1211rw/zd_mac.c | 10 +- drivers/net/wireless/zd1211rw/zd_usb.c | 14 +- drivers/net/xilinx_emaclite.c | 6 +- drivers/s390/net/qeth_l2_main.c | 24 +- include/linux/can/netlink.h | 1 + include/linux/ieee80211.h | 69 ++- include/linux/llc.h | 7 + include/linux/nl80211.h | 36 + include/linux/rtnetlink.h | 2 + include/net/cfg80211.h | 81 ++- include/net/dst.h | 2 - include/net/llc.h | 39 +- include/net/llc_conn.h | 2 + include/net/mac80211.h | 164 +++-- include/net/phonet/pep.h | 3 + include/net/tcp.h | 19 +- net/8021q/vlan_core.c | 2 + net/8021q/vlan_dev.c | 7 +- net/can/af_can.c | 118 +-- net/can/af_can.h | 4 +- net/can/proc.c | 93 ++- net/core/dev.c | 27 +- net/ethernet/eth.c | 6 +- net/ipv4/syncookies.c | 3 +- net/ipv4/tcp.c | 30 +- net/ipv4/tcp_output.c | 22 +- net/ipv6/syncookies.c | 3 +- net/llc/af_llc.c | 64 ++- net/llc/llc_conn.c | 143 +++- net/llc/llc_core.c | 53 +- net/llc/llc_output.c | 45 +- net/llc/llc_proc.c | 69 +- net/llc/llc_sap.c | 111 ++- net/mac80211/Kconfig | 12 - net/mac80211/Makefile | 4 +- net/mac80211/agg-rx.c | 15 +- net/mac80211/agg-tx.c | 25 +- net/mac80211/cfg.c | 142 +++- net/mac80211/debugfs_key.c | 2 +- net/mac80211/debugfs_netdev.c | 168 +++-- net/mac80211/debugfs_netdev.h | 9 +- net/mac80211/debugfs_sta.c | 64 ++- net/mac80211/driver-ops.h | 100 ++- net/mac80211/driver-trace.h | 63 +- net/mac80211/ht.c | 53 ++- net/mac80211/ibss.c | 81 +- net/mac80211/ieee80211_i.h | 162 +++- net/mac80211/iface.c | 93 ++- net/mac80211/key.c | 10 +- net/mac80211/key.h | 8 +- net/mac80211/main.c | 61 ++- net/mac80211/mesh.c | 6 +- net/mac80211/mesh_hwmp.c | 20 +- net/mac80211/mesh_pathtbl.c | 6 +- net/mac80211/mesh_plink.c | 6 +- net/mac80211/mlme.c | 1113 ++++++-------------------- net/mac80211/offchannel.c | 168 ++++ net/mac80211/pm.c | 10 +- net/mac80211/rx.c | 302 +++----- net/mac80211/scan.c | 210 +---- net/mac80211/spectmgmt.c | 4 +- net/mac80211/sta_info.c | 39 +- net/mac80211/sta_info.h | 29 +- net/mac80211/status.c | 48 +- net/mac80211/tkip.c | 38 +- net/mac80211/tx.c | 44 +- net/mac80211/util.c | 253 +++++- net/mac80211/work.c | 1086 +++++++++++++++++++++++++ net/phonet/datagram.c | 6 +- net/phonet/pep-gprs.c | 4 +- net/phonet/pep.c | 29 +- net/tipc/Kconfig | 8 +- net/tipc/core.c | 10 +- net/wireless/.gitignore | 1 + net/wireless/Kconfig | 13 +- net/wireless/Makefile | 6 + net/wireless/chan.c | 41 +- net/wireless/core.h | 5 + net/wireless/db.txt | 17 + net/wireless/genregdb.awk | 118 +++ net/wireless/mlme.c | 48 ++- net/wireless/nl80211.c | 282 ++++++- net/wireless/nl80211.h | 15 + net/wireless/reg.c | 209 +++--- net/wireless/regdb.h | 7 + net/wireless/util.c | 132 +++- net/wireless/wext-compat.c | 5 +- 232 files changed, 8490 insertions(+), 4703 deletions(-) create mode 100644 net/mac80211/offchannel.c create mode 100644 net/mac80211/work.c create mode 100644 net/wireless/.gitignore create mode 100644 net/wireless/db.txt create mode 100644 net/wireless/genregdb.awk create mode 100644 net/wireless/regdb.h Merging wireless/master $ git merge wireless/master Resolved 'drivers/net/wireless/iwlwifi/iwl-core.h' using previous resolution. Auto-merging drivers/net/wireless/iwlwifi/iwl-core.h CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h Auto-merging net/mac80211/iface.c Auto-merging net/mac80211/scan.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master bfb2f03] Merge remote branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. drivers/net/wireless/iwlwifi/iwl-core.h | 4 +- drivers/net/wireless/mwl8k.c | 499 +++++++++++++++++++++--------- drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +- net/mac80211/agg-tx.c | 2 +- net/mac80211/iface.c | 5 +- net/mac80211/main.c | 1 - net/mac80211/offchannel.c | 6 +- net/mac80211/scan.c | 1 - net/mac80211/util.c | 3 +- net/mac80211/wme.c | 2 +- net/mac80211/work.c | 12 +- net/wireless/reg.c | 32 +- 12 files changed, 393 insertions(+), 177 deletions(-) Merging mtd/master $ git merge mtd/master Auto-merging drivers/mtd/nand/Kconfig Auto-merging drivers/mtd/nand/Makefile Auto-merging drivers/mtd/nand/au1550nd.c Removing drivers/mtd/nand/ts7250.c Auto-merging kernel/kexec.c Auto-merging kernel/printk.c Merge made by recursive. arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 -- arch/arm/mach-ep93xx/ts72xx.c | 188 ++++++++++++------ drivers/mtd/maps/physmap_of.c | 2 +- drivers/mtd/mtdoops.c | 2 +- drivers/mtd/nand/Kconfig | 12 +- drivers/mtd/nand/Makefile | 3 +- drivers/mtd/nand/au1550nd.c | 12 +- drivers/mtd/nand/davinci_nand.c | 4 +- drivers/mtd/nand/fsl_elbc_nand.c | 2 +- drivers/mtd/nand/fsl_upm.c | 2 +- drivers/mtd/nand/gpio.c | 12 +- drivers/mtd/nand/nomadik_nand.c | 6 +- drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 +++++++------- drivers/mtd/nand/orion_nand.c | 10 +- drivers/mtd/nand/s3c2410.c | 2 +- drivers/mtd/nand/sh_flctl.c | 2 +- drivers/mtd/nand/tmio_nand.c | 14 +- drivers/mtd/nand/ts7250.c | 207 -------------------- include/linux/kmsg_dump.h | 1 + kernel/kexec.c | 4 + kernel/panic.c | 3 +- kernel/printk.c | 1 + 22 files changed, 251 insertions(+), 401 deletions(-) rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) delete mode 100644 drivers/mtd/nand/ts7250.c Merging crypto/master $ git merge crypto/master Auto-merging init/Kconfig Merge made by recursive. arch/arm/mach-nomadik/cpu-8815.c | 8 + crypto/Kconfig | 10 + crypto/Makefile | 1 + crypto/pcrypt.c | 445 ++++++++++++++++++++++ crypto/testmgr.c | 84 ++++ drivers/char/hw_random/Kconfig | 12 + drivers/char/hw_random/Makefile | 1 + drivers/char/hw_random/nomadik-rng.c | 103 +++++ include/crypto/pcrypt.h | 51 +++ include/linux/padata.h | 88 +++++ init/Kconfig | 4 + kernel/Makefile | 1 + kernel/padata.c | 690 ++++++++++++++++++++++++++++++++++ 13 files changed, 1498 insertions(+), 0 deletions(-) create mode 100644 crypto/pcrypt.c create mode 100644 drivers/char/hw_random/nomadik-rng.c create mode 100644 include/crypto/pcrypt.h create mode 100644 include/linux/padata.h create mode 100644 kernel/padata.c Merging sound/for-next $ git merge sound/for-next Removing sound/isa/dt019x.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 22 + include/sound/cs46xx_dsp_spos.h | 6 +- include/sound/pcm.h | 38 + include/sound/sb.h | 1 + include/sound/soc.h | 3 + include/sound/version.h | 2 +- include/sound/wm8904.h | 57 + include/sound/wm8955.h | 26 + sound/core/pcm_lib.c | 20 +- sound/core/pcm_memory.c | 55 + sound/drivers/vx/vx_pcm.c | 59 +- sound/isa/Kconfig | 37 +- sound/isa/Makefile | 2 - sound/isa/als100.c | 121 +- sound/isa/dt019x.c | 321 --- sound/isa/opti9xx/opti92x-ad1848.c | 93 + sound/isa/sb/Makefile | 2 + sound/isa/sb/jazz16.c | 404 ++++ sound/isa/sb/sb8_main.c | 118 +- sound/isa/sb/sb_common.c | 3 + sound/isa/sb/sb_mixer.c | 333 ++-- sound/isa/wss/wss_lib.c | 80 +- sound/mips/sgio2audio.c | 31 +- sound/pci/atiixp.c | 1 + sound/pci/cs46xx/cs46xx_lib.c | 2 +- sound/pci/cs46xx/dsp_spos.c | 42 +- sound/pci/cs46xx/dsp_spos.h | 4 + sound/pci/cs46xx/dsp_spos_scb_lib.c | 33 +- sound/pci/hda/hda_codec.c | 75 +- sound/pci/hda/hda_codec.h | 2 + sound/pci/hda/hda_generic.c | 3 +- sound/pci/hda/hda_hwdep.c | 7 +- sound/pci/hda/hda_intel.c | 30 +- sound/pci/hda/hda_local.h | 14 +- sound/pci/hda/hda_proc.c | 31 +- sound/pci/hda/patch_analog.c | 104 +- sound/pci/hda/patch_cirrus.c | 14 +- sound/pci/hda/patch_cmedia.c | 11 +- sound/pci/hda/patch_conexant.c | 1 + sound/pci/hda/patch_realtek.c | 194 ++- sound/pci/hda/patch_si3054.c | 1 + sound/pci/hda/patch_sigmatel.c | 120 +- sound/pci/hda/patch_via.c | 274 ++- sound/pci/riptide/riptide.c | 2 +- sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 51 +- sound/soc/codecs/Kconfig | 12 + sound/soc/codecs/Makefile | 10 +- sound/soc/codecs/cs4270.c | 43 +- sound/soc/codecs/da7210.c | 589 ++++++ sound/soc/codecs/da7210.h | 24 + sound/soc/codecs/tlv320aic3x.c | 75 +- sound/soc/codecs/tlv320dac33.c | 92 +- sound/soc/codecs/tpa6130a2.c | 87 +- sound/soc/codecs/wm8727.c | 66 +- sound/soc/codecs/wm8904.c | 2556 +++++++++++++++++++++++ sound/soc/codecs/wm8904.h | 1681 +++++++++++++++ sound/soc/codecs/wm8955.c | 1151 ++++++++++ sound/soc/codecs/wm8955.h | 489 +++++ sound/soc/davinci/davinci-mcasp.c | 18 +- sound/soc/davinci/davinci-mcasp.h | 1 + sound/soc/davinci/davinci-pcm.c | 2 +- sound/soc/s3c24xx/s3c64xx-i2s.c | 120 +- sound/soc/sh/Kconfig | 8 + sound/soc/sh/Makefile | 2 + sound/soc/sh/fsi-da7210.c | 83 + sound/soc/sh/fsi.c | 115 +- sound/soc/soc-core.c | 7 +- sound/soc/soc-dapm.c | 37 +- sound/usb/Kconfig | 12 + sound/usb/Makefile | 2 + sound/usb/ua101.c | 1419 +++++++++++++ sound/usb/usbaudio.c | 256 ++-- sound/usb/usbaudio.h | 16 +- sound/usb/usbmixer.c | 75 +- sound/usb/usbquirks.h | 145 +- 75 files changed, 10598 insertions(+), 1445 deletions(-) create mode 100644 include/sound/wm8904.h create mode 100644 include/sound/wm8955.h delete mode 100644 sound/isa/dt019x.c create mode 100644 sound/isa/sb/jazz16.c create mode 100644 sound/soc/codecs/da7210.c create mode 100644 sound/soc/codecs/da7210.h create mode 100644 sound/soc/codecs/wm8904.c create mode 100644 sound/soc/codecs/wm8904.h create mode 100644 sound/soc/codecs/wm8955.c create mode 100644 sound/soc/codecs/wm8955.h create mode 100644 sound/soc/sh/fsi-da7210.c create mode 100644 sound/usb/ua101.c Merging cpufreq/next $ git merge cpufreq/next Auto-merging drivers/acpi/processor_core.c Merge made by recursive. Documentation/cpu-freq/pcc-cpufreq.txt | 207 ++++++++++ arch/x86/kernel/cpu/cpufreq/Kconfig | 14 + arch/x86/kernel/cpu/cpufreq/Makefile | 1 + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 620 +++++++++++++++++++++++++++++ drivers/acpi/processor_core.c | 2 + 5 files changed, 844 insertions(+), 0 deletions(-) create mode 100644 Documentation/cpu-freq/pcc-cpufreq.txt create mode 100644 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c Merging quilt/rr $ git merge quilt/rr Merge made by recursive. Documentation/lguest/lguest.c | 1 - drivers/virtio/virtio_balloon.c | 108 ++++++++++++++++++++++++++++++++++++--- include/linux/gfp.h | 2 +- include/linux/kernel.h | 80 ++++++++++++++++++----------- include/linux/kmemcheck.h | 2 +- include/linux/virtio_balloon.h | 15 +++++ include/linux/virtio_config.h | 5 ++- 7 files changed, 170 insertions(+), 43 deletions(-) Merging mmc/next $ git merge mmc/next Already up-to-date. Merging tmio-mmc/linux-next $ git merge tmio-mmc/linux-next Auto-merging drivers/mfd/Makefile Auto-merging drivers/mfd/asic3.c Auto-merging drivers/mmc/core/core.c Auto-merging drivers/mmc/core/core.h Auto-merging drivers/mmc/host/tmio_mmc.c Merge made by recursive. drivers/mfd/Makefile | 6 +- drivers/mfd/asic3.c | 43 +++++++++++++++---- drivers/mfd/t7l66xb.c | 31 +++++++++++-- drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++-------- drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++---- drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++ drivers/mmc/core/core.c | 4 +- drivers/mmc/core/core.h | 10 ++++ drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++-------------------- drivers/mmc/host/tmio_mmc.h | 46 +++------------------ include/linux/mfd/tmio.h | 40 ++++++++++++++++++ 11 files changed, 342 insertions(+), 131 deletions(-) create mode 100644 drivers/mfd/tmio_core.c Merging input/next $ git merge input/next Auto-merging drivers/input/keyboard/atkbd.c Auto-merging drivers/input/mouse/hgpk.c Auto-merging drivers/input/serio/serio.c Auto-merging include/linux/serio.h Merge made by recursive. drivers/input/gameport/gameport.c | 98 +++++-------- drivers/input/input.c | 36 ++++- drivers/input/joystick/xpad.c | 200 ++++++++++++++++---------- drivers/input/keyboard/atkbd.c | 283 +++++++++++++++++++------------------ drivers/input/mouse/hgpk.c | 4 - drivers/input/serio/serio.c | 131 ++++++++---------- drivers/input/touchscreen/elo.c | 225 ++++++++++++++++-------------- include/linux/gameport.h | 1 - include/linux/serio.h | 1 - 9 files changed, 515 insertions(+), 464 deletions(-) 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. drivers/block/drbd/Kconfig | 2 +- drivers/block/drbd/drbd_main.c | 1 + drivers/block/drbd/drbd_nl.c | 2 +- drivers/block/drbd/drbd_receiver.c | 9 +++++---- 4 files changed, 8 insertions(+), 6 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. 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 Auto-merging drivers/pcmcia/Kconfig Auto-merging drivers/pcmcia/Makefile Auto-merging drivers/pcmcia/cardbus.c Merge made by recursive. drivers/net/pcmcia/smc91c92_cs.c | 6 +- drivers/pcmcia/Kconfig | 7 +- drivers/pcmcia/Makefile | 4 +- drivers/pcmcia/cardbus.c | 175 +------------ drivers/pcmcia/cistpl.c | 524 +++++++++++++++++++------------------ drivers/pcmcia/cs.c | 89 +++---- drivers/pcmcia/cs_internal.h | 68 ++---- drivers/pcmcia/ds.c | 35 +++- drivers/pcmcia/m32r_cfc.c | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 2 +- drivers/pcmcia/pcmcia_resource.c | 33 +++ drivers/pcmcia/rsrc_mgr.c | 44 ---- drivers/pcmcia/rsrc_nonstatic.c | 188 +++++++++----- drivers/pcmcia/socket_sysfs.c | 150 +----------- include/pcmcia/ss.h | 19 +- 15 files changed, 550 insertions(+), 796 deletions(-) Merging battery/master $ git merge battery/master Merge made by recursive. drivers/power/pmu_battery.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Merging leds/for-mm $ git merge leds/for-mm Already up-to-date. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Auto-merging MAINTAINERS Auto-merging drivers/gpu/drm/drm_fb_helper.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/input/input.c Auto-merging drivers/serial/8250.c Auto-merging include/linux/input.h Auto-merging kernel/Makefile Removing kernel/kgdb.c Auto-merging kernel/panic.c Auto-merging kernel/printk.c Merge made by recursive. MAINTAINERS | 6 +- arch/arm/include/asm/kgdb.h | 11 + arch/arm/include/asm/kmap_types.h | 1 + arch/arm/kernel/kgdb.c | 13 + arch/arm/kernel/traps.c | 5 + arch/blackfin/kernel/kgdb.c | 206 +--- arch/blackfin/mm/Makefile | 2 +- arch/blackfin/mm/maccess.c | 97 ++ arch/mips/include/asm/kgdb.h | 2 + arch/mips/kernel/kgdb.c | 27 +- arch/mips/kernel/traps.c | 14 + arch/powerpc/include/asm/kmap_types.h | 1 + arch/powerpc/kernel/kgdb.c | 12 +- 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/kernel/hw_breakpoint.c | 5 +- arch/x86/kernel/kgdb.c | 247 ++- arch/x86/kernel/traps.c | 6 + drivers/char/Makefile | 1 + drivers/char/kdb_keyboard.c | 204 +++ drivers/char/kdb_keyboard.h | 143 ++ drivers/char/keyboard.c | 30 +- drivers/gpu/drm/drm_fb_helper.c | 93 +- drivers/gpu/drm/i915/intel_display.c | 114 ++- drivers/input/input.c | 15 + drivers/misc/kgdbts.c | 6 + drivers/serial/8250.c | 4 +- drivers/serial/amba-pl011.c | 6 +- drivers/serial/kgdboc.c | 117 ++- drivers/serial/sh-sci.c | 6 +- drivers/serial/sunzilog.c | 50 + drivers/video/console/fbcon.c | 7 + fs/proc/internal.h | 4 +- fs/proc/meminfo.c | 15 +- fs/proc/mmu.c | 8 +- include/asm-generic/kmap_types.h | 3 +- include/drm/drm_crtc_helper.h | 2 + include/drm/drm_fb_helper.h | 4 + include/linux/input.h | 10 + include/linux/kdb.h | 118 ++ include/linux/kgdb.h | 74 +- include/linux/sched.h | 4 + include/linux/serial_core.h | 1 + include/linux/swap.h | 2 + include/linux/uaccess.h | 4 +- init/main.c | 6 + kernel/Makefile | 2 +- kernel/debug/Makefile | 8 + kernel/debug/debug_core.c | 986 ++++++++++++ kernel/debug/debug_core.h | 82 + kernel/debug/gdbstub.c | 1022 ++++++++++++ kernel/debug/kdb/.gitignore | 1 + kernel/debug/kdb/Makefile | 24 + kernel/debug/kdb/kdb_bp.c | 567 +++++++ kernel/debug/kdb/kdb_bt.c | 217 +++ kernel/debug/kdb/kdb_cmds | 32 + kernel/debug/kdb/kdb_debugger.c | 167 ++ kernel/debug/kdb/kdb_io.c | 825 ++++++++++ kernel/debug/kdb/kdb_main.c | 2857 +++++++++++++++++++++++++++++++++ kernel/debug/kdb/kdb_private.h | 399 +++++ kernel/debug/kdb/kdb_support.c | 1007 ++++++++++++ kernel/debug/kms_hooks.c | 62 + kernel/kallsyms.c | 21 + kernel/kgdb.c | 1760 -------------------- kernel/module.c | 4 + kernel/panic.c | 7 +- kernel/printk.c | 25 + kernel/sched.c | 7 +- kernel/signal.c | 42 + kernel/softlockup.c | 16 + kernel/trace/Makefile | 3 + kernel/trace/trace.c | 34 +- kernel/trace/trace.h | 17 + kernel/trace/trace_kdb.c | 118 ++ lib/Kconfig.kgdb | 22 + mm/maccess.c | 11 +- mm/swapfile.c | 10 +- 80 files changed, 9947 insertions(+), 2150 deletions(-) create mode 100644 arch/blackfin/mm/maccess.c create mode 100644 drivers/char/kdb_keyboard.c create mode 100644 drivers/char/kdb_keyboard.h 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_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 create mode 100644 kernel/trace/trace_kdb.c Merging slab/for-next $ git merge slab/for-next Merge made by recursive. include/linux/slub_def.h | 27 ++--- mm/slub.c | 303 +++++++++++---------------------------------- 2 files changed, 86 insertions(+), 244 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 Resolved 'drivers/mfd/asic3.c' using previous resolution. Resolved 'drivers/mfd/t7l66xb.c' using previous resolution. Resolved 'drivers/mfd/tc6387xb.c' using previous resolution. Resolved 'drivers/mfd/tc6393xb.c' using previous resolution. Resolved 'drivers/mfd/tmio_core.c' using previous resolution. Resolved 'drivers/mmc/host/tmio_mmc.c' using previous resolution. Resolved 'drivers/mmc/host/tmio_mmc.h' using previous resolution. Resolved 'include/linux/mfd/tmio.h' using previous resolution. Auto-merging drivers/mfd/asic3.c CONFLICT (content): Merge conflict in drivers/mfd/asic3.c Auto-merging drivers/mfd/t7l66xb.c CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c Auto-merging drivers/mfd/tc6387xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c Auto-merging drivers/mfd/tc6393xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c Auto-merging drivers/mfd/tmio_core.c CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c Auto-merging drivers/mmc/host/tmio_mmc.c CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c Auto-merging drivers/mmc/host/tmio_mmc.h CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h Auto-merging include/linux/mfd/tmio.h CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ef2db9a] Merge remote branch 'mfd/for-next' $ git diff -M --stat --summary HEAD^.. drivers/mfd/Kconfig | 6 +- drivers/mfd/asic3.c | 9 +- drivers/mfd/sm501.c | 7 +- drivers/mfd/t7l66xb.c | 40 ++++----- drivers/mfd/tc6387xb.c | 36 ++++---- drivers/mfd/tc6393xb.c | 14 ++-- drivers/mfd/tmio_core.c | 20 +---- drivers/mfd/wm8350-irq.c | 155 +++++++++++++++++++--------------- drivers/mmc/host/tmio_mmc.c | 6 +- drivers/mmc/host/tmio_mmc.h | 2 +- drivers/power/wm8350_power.c | 24 +++--- drivers/regulator/wm8350-regulator.c | 2 +- drivers/rtc/rtc-wm8350.c | 11 ++- include/linux/mfd/tmio.h | 15 ++-- include/linux/mfd/wm8350/core.h | 45 +++++++--- include/linux/mfd/wm8350/pmic.h | 28 +++--- include/linux/mfd/wm8350/rtc.h | 1 + sound/soc/codecs/wm8350.c | 4 +- 18 files changed, 228 insertions(+), 197 deletions(-) Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Merge made by recursive. Merging voltage/for-next $ git merge voltage/for-next Auto-merging drivers/regulator/wm8350-regulator.c Merge made by recursive. drivers/regulator/core.c | 48 ++++- drivers/regulator/lp3971.c | 10 +- drivers/regulator/mc13783-regulator.c | 345 ++++++++++++++++++++++++++++++--- drivers/regulator/wm8350-regulator.c | 46 +++++ include/linux/regulator/consumer.h | 4 +- include/linux/regulator/driver.h | 6 + 6 files changed, 415 insertions(+), 44 deletions(-) Merging security-testing/next $ git merge security-testing/next Auto-merging security/selinux/ss/services.c Auto-merging security/tomoyo/file.c Merge made by recursive. kernel/capability.c | 4 +- security/security.c | 30 ++++---- security/selinux/ss/mls.c | 4 +- security/selinux/ss/services.c | 4 +- security/tomoyo/common.c | 151 +++++++++++++++++--------------------- security/tomoyo/common.h | 40 ++++++++--- security/tomoyo/domain.c | 63 ++++++++++------- security/tomoyo/file.c | 157 ++++++++++++++++++++++++++++------------ security/tomoyo/realpath.c | 11 ++- security/tomoyo/tomoyo.c | 81 ++++++++++++++++++++- security/tomoyo/tomoyo.h | 12 +++- 11 files changed, 362 insertions(+), 195 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Auto-merging drivers/char/agp/amd64-agp.c Merge made by recursive. drivers/char/agp/amd64-agp.c | 2 ++ drivers/char/agp/backend.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) $ git revert e85c5c6542528aba88a5d811652cf0e2d44f7f07 Finished one revert. [master 5d9eaa6] Revert "drivers/char/agp/amd64-agp.c: squish warning" 1 files changed, 0 insertions(+), 2 deletions(-) Merging uwb/for-upstream $ git merge uwb/for-upstream Already up-to-date. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/ixp2000_wdt.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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 Merge made by recursive. drivers/scsi/osd/osd_initiator.c | 4 ++++ drivers/scsi/scsi_lib.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) Merging jc_docs/docs-next $ git merge jc_docs/docs-next Merge made by recursive. Documentation/video4linux/videobuf | 341 ++++++++++++++++++++++++++++++++++++ 1 files changed, 341 insertions(+), 0 deletions(-) create mode 100644 Documentation/video4linux/videobuf Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c Auto-merging arch/x86/kernel/apic/apic_flat_64.c Auto-merging drivers/gpu/drm/radeon/atombios.h Auto-merging drivers/isdn/mISDN/l1oip_core.c Auto-merging drivers/net/cs89x0.c Auto-merging drivers/net/davinci_emac.c Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c Auto-merging fs/namei.c Auto-merging mm/slub.c Merge made by recursive. Documentation/driver-model/platform.txt | 2 +- .../networking/timestamping/timestamping.c | 2 +- arch/arm/mach-davinci/include/mach/i2c.h | 2 +- arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 2 +- arch/arm/mach-s5pc100/setup-sdhci.c | 4 ++-- arch/arm/plat-s3c/include/plat/nand.h | 2 +- arch/blackfin/include/asm/nand.h | 4 ++-- arch/powerpc/kernel/legacy_serial.c | 2 +- arch/x86/kernel/apic/apic_flat_64.c | 2 +- arch/x86/kernel/ptrace.c | 2 +- arch/x86/kernel/vmiclock_32.c | 2 +- arch/x86/xen/smp.c | 2 +- drivers/acpi/proc.c | 2 +- drivers/ata/libata-core.c | 2 +- drivers/block/ataflop.c | 2 -- drivers/char/random.c | 2 +- drivers/gpu/drm/radeon/atombios.h | 2 +- drivers/gpu/drm/radeon/radeon_state.c | 2 +- drivers/ieee1394/pcilynx.c | 2 +- drivers/input/serio/i8042.c | 2 +- drivers/input/tablet/aiptek.c | 2 +- drivers/isdn/hardware/mISDN/mISDNisar.c | 4 ++-- drivers/isdn/mISDN/dsp_core.c | 4 ++-- drivers/isdn/mISDN/l1oip_core.c | 2 +- drivers/media/dvb/bt8xx/bt878.c | 4 ++-- drivers/mmc/card/sdio_uart.c | 2 +- drivers/mtd/maps/plat-ram.c | 2 +- drivers/net/cs89x0.c | 2 +- drivers/net/cxgb3/sge.c | 4 ++-- drivers/net/davinci_emac.c | 2 +- drivers/net/sfc/mcdi_pcol.h | 2 +- drivers/net/typhoon.c | 6 +++--- 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/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +- drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- drivers/uwb/i1480/i1480-est.c | 4 ++-- drivers/video/mbx/mbxfb.c | 2 +- drivers/video/omap/lcd_htcherald.c | 4 ++-- drivers/video/sstfb.c | 2 +- drivers/w1/w1.c | 4 ++-- fs/buffer.c | 2 +- fs/dlm/member.c | 2 +- fs/locks.c | 2 +- fs/mpage.c | 2 +- fs/namei.c | 2 +- fs/qnx4/inode.c | 3 ++- include/linux/dm9000.h | 2 +- include/linux/mmzone.h | 2 +- include/math-emu/op-common.h | 2 +- kernel/audit.c | 2 +- kernel/sched_cpupri.c | 2 +- kernel/trace/ring_buffer.c | 4 ++-- mm/slub.c | 2 +- 58 files changed, 79 insertions(+), 80 deletions(-) mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c mode change 100755 => 100644 drivers/mtd/inftlcore.c mode change 100755 => 100644 drivers/scsi/lpfc/lpfc_hbadisc.c 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 Resolved 'drivers/input/serio/serio.c' using previous resolution. Auto-merging drivers/input/serio/i8042.c Auto-merging drivers/input/serio/serio.c CONFLICT (content): Merge conflict in drivers/input/serio/serio.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f391b1c] Merge remote branch 'suspend/linux-next' $ git diff -M --stat --summary HEAD^.. drivers/base/power/main.c | 136 ++++++++++++++++++++++++++++++++++++++---- drivers/base/power/power.h | 6 +- drivers/base/power/sysfs.c | 47 ++++++++++++++ drivers/input/serio/i8042.c | 2 + drivers/input/serio/serio.c | 2 + include/linux/device.h | 11 ++++ include/linux/pm.h | 3 + include/linux/resume-trace.h | 7 ++ kernel/power/Kconfig | 14 ++++ kernel/power/main.c | 31 +++++++++- 10 files changed, 244 insertions(+), 15 deletions(-) Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. drivers/bluetooth/Kconfig | 13 +++- drivers/bluetooth/Makefile | 1 + drivers/bluetooth/ath3k.c | 187 +++++++++++++++++++++++++++++++++++++++ drivers/bluetooth/btmrvl_sdio.c | 4 +- 4 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 drivers/bluetooth/ath3k.c Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging Documentation/feature-removal-schedule.txt Auto-merging fs/nfsd/vfs.c Removing fs/notify/inotify/inotify.c Auto-merging include/linux/fs.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/Makefile Auto-merging kernel/audit.c Auto-merging security/security.c Merge made by recursive. 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/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 | 140 ++++- 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 | 116 +++- fs/notify/inotify/inotify_user.c | 307 ++++++---- fs/notify/mark.c | 325 ++++++++++ fs/notify/notification.c | 176 +++--- 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/fanotify.h | 105 ++++ include/linux/fs.h | 13 +- include/linux/fsnotify.h | 153 +++--- include/linux/fsnotify_backend.h | 162 ++++-- include/linux/inotify.h | 174 ------ 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 + security/security.c | 16 +- 54 files changed, 3077 insertions(+), 2235 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 0461f7e] 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 3769124] 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_int.h | 2 +- drivers/block/drbd/drbd_receiver.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging 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 c6b9ce9] 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 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 Auto-merging arch/arm/include/asm/io.h Merge made by recursive. arch/arm/include/asm/io.h | 4 ++++ drivers/spi/xilinx_spi.c | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) 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 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 include/linux/security.h Auto-merging include/linux/syscalls.h Auto-merging security/security.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 770ae65] Merge remote branch 'limits/writable_limits' $ git diff -M --stat --summary HEAD^.. 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 ++- 16 files changed, 335 insertions(+), 78 deletions(-) Merging omap_dss2/for-next $ git merge omap_dss2/for-next Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging arch/x86/Kconfig Auto-merging include/linux/kernel.h Auto-merging include/linux/syscalls.h Auto-merging init/Kconfig Auto-merging kernel/sched.c Auto-merging kernel/trace/Makefile Removing tools/perf/util/data_map.c Merge made by recursive. arch/x86/Kconfig | 5 + arch/x86/include/asm/nmi.h | 1 - arch/x86/include/asm/uv/bios.h | 7 +- arch/x86/kernel/apic/x2apic_uv_x.c | 6 +- arch/x86/kernel/bios_uv.c | 20 ++- arch/x86/kernel/cpu/perfctr-watchdog.c | 11 -- drivers/char/nvram.c | 3 - include/linux/ftrace_event.h | 2 +- include/linux/kernel.h | 5 +- include/linux/perf_event.h | 14 +- include/linux/poison.h | 16 ++- include/linux/syscalls.h | 4 +- include/trace/ftrace.h | 12 +- include/trace/syscall.h | 4 +- init/Kconfig | 13 -- kernel/futex_compat.c | 6 +- kernel/perf_event.c | 31 ++-- kernel/sched.c | 8 +- kernel/trace/Makefile | 4 +- kernel/trace/trace_events_filter.c | 4 +- kernel/trace/trace_kprobe.c | 14 +- kernel/trace/trace_syscalls.c | 5 +- lib/hweight.c | 7 + tools/perf/Makefile | 3 +- tools/perf/builtin-annotate.c | 8 +- tools/perf/builtin-diff.c | 14 +- tools/perf/builtin-help.c | 3 +- tools/perf/builtin-kmem.c | 39 ++---- tools/perf/builtin-report.c | 32 ++-- tools/perf/builtin-sched.c | 25 +--- tools/perf/builtin-timechart.c | 25 +-- tools/perf/builtin-trace.c | 20 +-- tools/perf/perf.c | 2 +- tools/perf/util/data_map.c | 252 ------------------------------- tools/perf/util/debug.c | 1 + tools/perf/util/debugfs.c | 17 +- tools/perf/util/debugfs.h | 2 +- tools/perf/util/event.h | 65 +-------- tools/perf/util/header.c | 82 ++++++++++- tools/perf/util/map.h | 73 +++++++++ tools/perf/util/probe-finder.h | 2 + tools/perf/util/session.c | 253 ++++++++++++++++++++++++++++++++ tools/perf/util/session.h | 24 ++-- tools/perf/util/symbol.c | 17 ++- tools/perf/util/symbol.h | 5 +- tools/perf/util/trace-event-info.c | 62 +++----- tools/perf/util/util.c | 69 +++++++++ tools/perf/util/util.h | 3 + 48 files changed, 710 insertions(+), 590 deletions(-) delete mode 100644 tools/perf/util/data_map.c create mode 100644 tools/perf/util/map.h create mode 100644 tools/perf/util/util.c 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 Auto-merging arch/sparc/kernel/nmi.c Auto-merging include/linux/mmzone.h Auto-merging kernel/module.c Auto-merging kernel/trace/ring_buffer.c Auto-merging kernel/trace/trace.c Merge made by recursive. arch/alpha/include/asm/local.h | 17 --- arch/blackfin/mach-common/entry.S | 4 +- arch/cris/arch-v10/kernel/entry.S | 2 +- arch/cris/arch-v32/mm/mmu.S | 2 +- arch/ia64/include/asm/percpu.h | 4 +- arch/ia64/kernel/ia64_ksyms.c | 4 +- arch/ia64/mm/discontig.c | 2 +- arch/m32r/include/asm/local.h | 25 ---- arch/microblaze/include/asm/entry.h | 2 +- arch/mips/include/asm/local.h | 25 ---- arch/parisc/lib/fixup.S | 8 +- arch/powerpc/include/asm/local.h | 25 ---- arch/sparc/kernel/nmi.c | 7 +- arch/sparc/kernel/rtrap_64.S | 8 +- arch/x86/include/asm/local.h | 37 ------ arch/x86/include/asm/percpu.h | 119 +++++++++++++++------ arch/x86/include/asm/system.h | 8 +- arch/x86/kernel/apic/nmi.c | 6 +- arch/x86/kernel/head_32.S | 6 +- arch/x86/kernel/vmlinux.lds.S | 4 +- arch/x86/xen/xen-asm_32.S | 4 +- include/asm-generic/local.h | 19 --- include/asm-generic/percpu.h | 18 ++- include/linux/compiler.h | 4 +- include/linux/mm.h | 4 - include/linux/mmzone.h | 12 +-- include/linux/module.h | 37 +++---- include/linux/percpu-defs.h | 40 ++++--- include/linux/percpu.h | 44 +++++--- include/linux/vmstat.h | 8 +- kernel/module.c | 29 +++--- kernel/rcutorture.c | 8 +- kernel/trace/ring_buffer.c | 1 + kernel/trace/ring_buffer_benchmark.c | 1 + kernel/trace/trace.c | 6 +- kernel/trace/trace_functions_graph.c | 4 +- mm/page_alloc.c | 202 ++++++++++++---------------------- mm/percpu.c | 18 ++-- mm/vmstat.c | 15 ++- 39 files changed, 322 insertions(+), 467 deletions(-) $ git am -3 ../patches/0001-slab-update-for-percpu-API-change.patch Applying: slab: update for percpu API change $ git reset HEAD^ Unstaged changes after reset: M mm/slub.c $ git add . $ git commit -v -a --amend [master 1bba33e] Merge remote branch 'percpu/for-next' Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging quilt/driver-core $ git merge quilt/driver-core Merge made by recursive. samples/kobject/kobject-example.c | 4 ++-- samples/kobject/kset-example.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) Merging quilt/tty $ git merge quilt/tty Auto-merging drivers/serial/8250.c Auto-merging drivers/serial/serial_cs.c Auto-merging include/linux/pci_ids.h Merge made by recursive. drivers/char/cyclades.c | 15 +- drivers/char/hvc_console.c | 2 +- drivers/char/ip2/ip2main.c | 11 +- drivers/char/isicom.c | 49 ++-- drivers/char/moxa.c | 17 +- drivers/char/mxser.c | 3 +- drivers/char/synclink_gt.c | 186 ++++++----- drivers/parport/parport_pc.c | 6 + drivers/serial/68328serial.c | 8 +- drivers/serial/8250.c | 28 +- drivers/serial/8250_pci.c | 31 ++- drivers/serial/8250_pnp.c | 10 +- drivers/serial/Kconfig | 52 ++-- drivers/serial/atmel_serial.c | 22 ++ drivers/serial/bfin_sport_uart.c | 701 +++++++++++++++++++++++++------------- drivers/serial/bfin_sport_uart.h | 38 +-- drivers/serial/imx.c | 6 +- drivers/serial/msm_serial.c | 6 +- drivers/serial/serial_core.c | 88 ++--- drivers/serial/serial_cs.c | 3 +- drivers/serial/timbuart.c | 7 +- include/linux/pci_ids.h | 3 + 22 files changed, 786 insertions(+), 506 deletions(-) Merging quilt/usb $ git merge quilt/usb Merge made by recursive. Documentation/networking/00-INDEX | 2 + Documentation/networking/cxacru-cf.py | 48 + Documentation/networking/cxacru.txt | 16 + Documentation/usb/error-codes.txt | 6 +- arch/arm/mach-mx2/devices.c | 80 +- arch/arm/mach-mx2/devices.h | 1 + arch/arm/plat-mxc/include/mach/mx21-usbhost.h | 38 + drivers/usb/Kconfig | 1 + drivers/usb/Makefile | 1 + drivers/usb/atm/cxacru.c | 192 ++- drivers/usb/atm/usbatm.c | 1 + drivers/usb/atm/usbatm.h | 15 + drivers/usb/class/cdc-acm.c | 68 +- drivers/usb/class/cdc-acm.h | 2 +- drivers/usb/core/devio.c | 22 +- drivers/usb/core/hcd.h | 1 + drivers/usb/core/hub.c | 19 +- drivers/usb/core/quirks.c | 3 +- drivers/usb/core/sysfs.c | 31 + drivers/usb/core/urb.c | 7 + drivers/usb/gadget/at91_udc.c | 10 +- drivers/usb/gadget/atmel_usba_udc.c | 4 +- drivers/usb/gadget/epautoconf.c | 19 + drivers/usb/gadget/pxa27x_udc.c | 21 +- drivers/usb/host/Kconfig | 11 + drivers/usb/host/Makefile | 2 + drivers/usb/host/ehci-atmel.c | 2 +- drivers/usb/host/ehci-au1xxx.c | 6 +- drivers/usb/host/ehci-fsl.c | 97 ++- drivers/usb/host/ehci-mxc.c | 18 +- drivers/usb/host/ehci-orion.c | 8 +- drivers/usb/host/ehci-sched.c | 12 +- drivers/usb/host/imx21-dbg.c | 527 ++++++++ drivers/usb/host/imx21-hcd.c | 1789 +++++++++++++++++++++++++ drivers/usb/host/imx21-hcd.h | 436 ++++++ drivers/usb/host/isp1362-hcd.c | 2 +- drivers/usb/host/sl811-hcd.c | 5 +- drivers/usb/host/xhci-dbg.c | 19 + drivers/usb/host/xhci-hcd.c | 150 ++- drivers/usb/host/xhci-hub.c | 65 +- drivers/usb/host/xhci-mem.c | 43 +- drivers/usb/host/xhci-pci.c | 1 + drivers/usb/host/xhci-ring.c | 41 +- drivers/usb/host/xhci.h | 11 +- drivers/usb/mon/mon_bin.c | 7 +- drivers/usb/mon/mon_text.c | 4 +- drivers/usb/musb/musb_core.c | 63 +- drivers/usb/musb/musb_core.h | 16 +- drivers/usb/otg/twl4030-usb.c | 35 +- drivers/usb/serial/cypress_m8.c | 21 +- drivers/usb/serial/ftdi_sio.c | 18 +- drivers/usb/serial/generic.c | 5 +- drivers/usb/serial/mct_u232.c | 57 +- drivers/usb/serial/mct_u232.h | 2 + drivers/usb/serial/usb-serial.c | 2 +- drivers/usb/storage/transport.c | 6 + drivers/usb/wusbcore/mmc.c | 2 +- include/linux/usb/otg.h | 25 + include/linux/usb/quirks.h | 3 + 59 files changed, 3783 insertions(+), 336 deletions(-) create mode 100644 Documentation/networking/cxacru-cf.py create mode 100644 arch/arm/plat-mxc/include/mach/mx21-usbhost.h create mode 100644 drivers/usb/host/imx21-dbg.c create mode 100644 drivers/usb/host/imx21-hcd.c create mode 100644 drivers/usb/host/imx21-hcd.h Merging quilt/staging $ git merge quilt/staging Removing drivers/staging/altpciechdma/Kconfig Removing drivers/staging/altpciechdma/Makefile Removing drivers/staging/altpciechdma/TODO Removing drivers/staging/altpciechdma/altpciechdma.c Removing drivers/staging/b3dfg/Kconfig Removing drivers/staging/b3dfg/Makefile Removing drivers/staging/b3dfg/TODO Removing drivers/staging/b3dfg/b3dfg.c Removing drivers/staging/batman-adv/compat.h Removing drivers/staging/batman-adv/log.c Removing drivers/staging/p9auth/Kconfig Removing drivers/staging/p9auth/Makefile Removing drivers/staging/p9auth/p9auth.c Merge made by recursive. drivers/staging/Kconfig | 10 +- drivers/staging/Makefile | 5 +- drivers/staging/altpciechdma/Kconfig | 10 - drivers/staging/altpciechdma/Makefile | 2 - drivers/staging/altpciechdma/TODO | 15 - drivers/staging/altpciechdma/altpciechdma.c | 1182 -- drivers/staging/asus_oled/asus_oled.c | 14 +- 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 | 4 +- drivers/staging/batman-adv/Makefile | 2 +- drivers/staging/batman-adv/README | 52 +- 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 | 40 +- drivers/staging/batman-adv/hard-interface.c | 200 +- 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 | 53 +- drivers/staging/batman-adv/main.h | 45 +- 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 | 484 +- drivers/staging/batman-adv/proc.h | 13 +- drivers/staging/batman-adv/routing.c | 1319 +-- drivers/staging/batman-adv/routing.h | 20 +- drivers/staging/batman-adv/send.c | 169 +- 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 | 167 +- drivers/staging/batman-adv/vis.h | 11 +- .../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 | 2 +- .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- .../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 | 2 +- .../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 | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- drivers/staging/comedi/drivers/pcmad.c | 21 +- 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 | 115 + drivers/staging/crystalhd/bcm_70012_regs.h |12299 ++++++++++++++++++++ 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 | 780 ++ drivers/staging/crystalhd/crystalhd_lnx.h | 95 + drivers/staging/crystalhd/crystalhd_misc.c | 1029 ++ drivers/staging/crystalhd/crystalhd_misc.h | 229 + drivers/staging/dream/camera/Kconfig | 2 +- drivers/staging/dream/camera/Makefile | 1 + drivers/staging/dream/camera/msm_camera.c | 4 +- drivers/staging/dream/camera/s5k3e2fx.c | 10 +- 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/qdsp5/Makefile | 1 + 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 | 296 + drivers/staging/dt3155/allocator.h | 28 + drivers/staging/dt3155/dt3155.h | 171 + drivers/staging/dt3155/dt3155.sysvinit | 60 + drivers/staging/dt3155/dt3155_drv.c | 1204 ++ drivers/staging/dt3155/dt3155_drv.h | 50 + drivers/staging/dt3155/dt3155_io.c | 236 + drivers/staging/dt3155/dt3155_io.h | 397 + drivers/staging/dt3155/dt3155_isr.c | 545 + drivers/staging/dt3155/dt3155_isr.h | 77 + drivers/staging/dt3155/pci-compat.h | 97 + drivers/staging/dt3155/sysdep.h | 820 ++ drivers/staging/iio/ring_sw.c | 1 - drivers/staging/mimio/mimio.c | 124 +- drivers/staging/otus/80211core/ctxrx.c | 3 +- drivers/staging/otus/apdbg.c | 53 +- drivers/staging/p9auth/Kconfig | 9 - drivers/staging/p9auth/Makefile | 1 - drivers/staging/p9auth/p9auth.c | 408 - drivers/staging/ramzswap/ramzswap_drv.c | 1 - drivers/staging/rt2860/common/rtmp_mcu.c | 2 +- drivers/staging/rt2860/sta/connect.c | 4 +- drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 - .../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 +- drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 4 +- drivers/staging/rtl8192e/Makefile | 9 +- drivers/staging/rtl8192e/dot11d.h | 138 +- drivers/staging/rtl8192e/ieee80211.h | 3 - drivers/staging/rtl8192e/ieee80211/ieee80211.h | 159 +- .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 18 +- .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 27 +- 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 | 4 +- .../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.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 | 763 ++- 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_firmware.c | 81 +- 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/ieee80211/ieee80211.h | 4 - .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 20 +- drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 48 +- .../rtl8192su/ieee80211/ieee80211_softmac.c | 2 +- drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 +- drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 4 +- .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 21 +- .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +- .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192su/r8192U_core.c | 4 +- drivers/staging/rtl8192su/r8192U_dm.c | 2 +- drivers/staging/rtl8192u/ieee80211.h | 3 - drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 - .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 21 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 20 +- 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 | 2 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +- drivers/staging/rtl8192u/r8192U_core.c | 6 +- drivers/staging/slicoss/slic.h | 9 - drivers/staging/slicoss/slicoss.c | 104 +- drivers/staging/udlfb/udlfb.c | 652 +- drivers/staging/udlfb/udlfb.h | 156 +- drivers/staging/vme/bridges/vme_ca91cx42.c | 46 +- drivers/staging/vme/bridges/vme_tsi148.c | 45 +- drivers/staging/vme/devices/vme_user.c | 4 +- drivers/staging/vme/vme.c | 222 +- drivers/staging/vme/vme.h | 23 +- drivers/staging/vme/vme_bridge.h | 40 +- 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 | 8 +- drivers/staging/wlags49_h2/wl_netdev.c | 2 +- drivers/staging/wlags49_h2/wl_pci.c | 1 - drivers/staging/wlan-ng/Kconfig | 3 +- drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- drivers/staging/wlan-ng/p80211wext.c | 15 + 231 files changed, 35195 insertions(+), 6807 deletions(-) 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 create mode 100644 drivers/staging/dt3155/pci-compat.h create mode 100644 drivers/staging/dt3155/sysdep.h delete mode 100644 drivers/staging/p9auth/Kconfig delete mode 100644 drivers/staging/p9auth/Makefile delete mode 100644 drivers/staging/p9auth/p9auth.c Merging scsi-post-merge/master $ git merge scsi-post-merge/master Already up-to-date.