$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at aaa119a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 Merging origin/master $ git merge origin/master Updating aaa119a..85f2e68 Fast-forward arch/avr32/include/asm/setup.h | 9 +++ arch/avr32/kernel/setup.c | 15 +++++ arch/avr32/kernel/traps.c | 22 ------- arch/avr32/mach-at32ap/clock.c | 24 +++++--- arch/avr32/mach-at32ap/extint.c | 22 +++--- arch/avr32/mach-at32ap/pio.c | 2 +- arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 +- arch/m68k/include/asm/unistd.h | 6 ++- arch/m68k/kernel/entry_mm.S | 4 + arch/m68k/kernel/syscalltable.S | 4 + drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/nouveau/nouveau_bios.c | 53 +++++++++++++++- drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- drivers/gpu/drm/nouveau/nouveau_mem.c | 76 +++++++++++++++-------- drivers/gpu/drm/nouveau/nouveau_perf.c | 2 +- drivers/gpu/drm/nouveau/nouveau_state.c | 12 +--- drivers/gpu/drm/nouveau/nv04_dfp.c | 13 ++-- drivers/gpu/drm/nouveau/nv50_crtc.c | 3 - drivers/gpu/drm/nouveau/nv50_evo.c | 1 + drivers/gpu/drm/nouveau/nv50_graph.c | 2 +- drivers/gpu/drm/nouveau/nvc0_vm.c | 24 +++++--- drivers/gpu/drm/radeon/atom.c | 6 ++- drivers/gpu/drm/radeon/atombios_crtc.c | 6 ++ drivers/gpu/drm/radeon/evergreen.c | 17 +++--- drivers/gpu/drm/radeon/r600.c | 6 +-- drivers/gpu/drm/radeon/radeon.h | 12 +++- drivers/gpu/drm/radeon/radeon_asic.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 30 ++++++--- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_gart.c | 2 + drivers/gpu/drm/radeon/radeon_i2c.c | 4 +- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 11 +++- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 6 +-- drivers/gpu/drm/ttm/ttm_page_alloc.c | 26 +------- drivers/gpu/stub/Kconfig | 1 + drivers/platform/x86/intel_pmic_gpio.c | 2 +- kernel/sched.c | 20 +++--- mm/mmap.c | 13 +++-- 41 files changed, 286 insertions(+), 185 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging kbuild-current/rc-fixes $ git merge kbuild-current/rc-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 Merge made by recursive. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging 52xx-and-virtex-current/powerpc/merge $ git merge 52xx-and-virtex-current/powerpc/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 Merge made by recursive. drivers/connector/connector.c | 1 + drivers/net/bonding/bond_alb.c | 6 ++-- drivers/net/bonding/bond_alb.h | 4 +-- drivers/net/can/mscan/mpc5xxx_can.c | 2 +- drivers/net/natsemi.c | 3 ++ drivers/net/netxen/netxen_nic.h | 4 +- drivers/net/netxen/netxen_nic_main.c | 17 +++++++++++ drivers/net/qlcnic/qlcnic.h | 1 + drivers/net/qlcnic/qlcnic_main.c | 14 +++++++++ drivers/net/sfc/efx.c | 6 ++- drivers/net/sfc/io.h | 2 + drivers/net/sfc/net_driver.h | 2 - drivers/net/sfc/nic.c | 22 +++++++++---- drivers/net/sfc/nic.h | 1 + drivers/net/sfc/selftest.c | 25 ++++------------ drivers/net/sfc/tx.c | 3 +- drivers/net/sis900.c | 23 ++++++++++++-- drivers/net/stmmac/dwmac_lib.c | 28 +++++++++--------- drivers/net/stmmac/stmmac_main.c | 49 +++++++++++++++++------------- drivers/net/tokenring/3c359.c | 4 +- drivers/net/tokenring/lanstreamer.c | 2 +- drivers/net/tokenring/olympic.c | 2 +- drivers/net/wireless/ath/ath9k/main.c | 12 ++++++- drivers/net/wireless/ath/regd_common.h | 1 + drivers/net/wireless/iwlegacy/Kconfig | 9 +++-- drivers/net/wireless/iwlwifi/iwl-5000.c | 3 ++ drivers/net/wireless/mwl8k.c | 9 +++++- drivers/net/wireless/p54/txrx.c | 2 +- net/bridge/br_netfilter.c | 6 +-- net/caif/cfdgml.c | 6 +++- net/caif/cfmuxl.c | 4 +- net/core/dev.c | 10 ++++-- net/ieee802154/Makefile | 2 - net/ipv4/inetpeer.c | 13 ++++---- net/ipv4/sysctl_net_ipv4.c | 3 -- net/irda/af_irda.c | 3 +- net/llc/llc_input.c | 3 +- net/sctp/associola.c | 4 ++ 38 files changed, 195 insertions(+), 116 deletions(-) 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/pci/Kconfig | 4 +++- drivers/pci/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Auto-merging drivers/net/wireless/iwlegacy/iwl-core.c Merge made by recursive. drivers/net/wireless/ath/ath9k/hif_usb.c | 4 ++-- drivers/net/wireless/ath/ath9k/hw.c | 9 --------- drivers/net/wireless/ath/ath9k/mac.c | 25 ++++++++++++++++++++++--- drivers/net/wireless/ath/ath9k/mac.h | 2 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +++--- drivers/net/wireless/iwlegacy/iwl-3945-hw.h | 2 -- drivers/net/wireless/iwlegacy/iwl-4965-hw.h | 3 --- drivers/net/wireless/iwlegacy/iwl-core.c | 17 +++++++++++------ drivers/net/wireless/iwlegacy/iwl-eeprom.c | 7 ------- drivers/net/wireless/iwlegacy/iwl3945-base.c | 4 ---- drivers/net/wireless/iwlegacy/iwl4965-base.c | 6 ------ 11 files changed, 39 insertions(+), 46 deletions(-) Merging driver-core.current/driver-core-linus $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus $ git merge usb.current/usb-linus Merge made by recursive. arch/microblaze/Kconfig | 1 - drivers/usb/Kconfig | 1 + drivers/usb/core/devices.c | 10 ++- drivers/usb/gadget/f_audio.c | 1 + drivers/usb/gadget/f_eem.c | 8 ++- drivers/usb/gadget/fsl_qe_udc.c | 20 ++++++- drivers/usb/gadget/inode.c | 4 +- drivers/usb/gadget/pch_udc.c | 8 ++- drivers/usb/gadget/r8a66597-udc.c | 2 + drivers/usb/host/ehci-q.c | 15 +++-- drivers/usb/host/isp1760-hcd.c | 6 +- drivers/usb/host/ohci-au1xxx.c | 2 +- drivers/usb/host/pci-quirks.c | 117 +++++++++++++++++++++++-------------- drivers/usb/musb/Kconfig | 6 +- drivers/usb/musb/blackfin.c | 24 ++++++++ drivers/usb/musb/cppi_dma.c | 27 +++++---- drivers/usb/musb/musb_core.c | 2 + drivers/usb/musb/musb_core.h | 5 ++ drivers/usb/musb/musb_gadget.c | 4 +- drivers/usb/musb/musbhsdma.c | 8 +++ drivers/usb/musb/omap2430.c | 3 +- drivers/usb/musb/ux500.c | 2 + drivers/usb/serial/ftdi_sio.c | 5 ++ drivers/usb/serial/ftdi_sio_ids.h | 12 ++++ drivers/usb/serial/option.c | 5 ++ drivers/usb/serial/qcserial.c | 31 ++++++++-- 26 files changed, 240 insertions(+), 89 deletions(-) Merging staging.current/staging-linus $ git merge staging.current/staging-linus Already up-to-date. Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Auto-merging include/linux/input.h Merge made by recursive. Documentation/input/event-codes.txt | 262 ++++++++++++++++++++++++++++ drivers/input/evdev.c | 33 +++-- drivers/input/keyboard/twl4030_keypad.c | 6 +- drivers/input/touchscreen/h3600_ts_input.c | 17 +- include/linux/input.h | 10 +- 5 files changed, 303 insertions(+), 25 deletions(-) create mode 100644 Documentation/input/event-codes.txt 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 sh-current/sh-fixes-for-linus $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging rmobile-current/rmobile-fixes-for-linus $ git merge rmobile-current/rmobile-fixes-for-linus Already up-to-date. Merging fbdev-current/fbdev-fixes-for-linus $ git merge fbdev-current/fbdev-fixes-for-linus Merge made by recursive. drivers/video/s3c-fb.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) Merging devicetree-current/devicetree/merge $ git merge devicetree-current/devicetree/merge Removing arch/powerpc/boot/dtc-src/.gitignore Merge made by recursive. arch/powerpc/boot/.gitignore | 1 - arch/powerpc/boot/dtc-src/.gitignore | 3 --- 2 files changed, 0 insertions(+), 4 deletions(-) delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore Merging spi-current/spi/merge $ git merge spi-current/spi/merge Already up-to-date. Merging arm/for-next $ git merge arm/for-next Merge made by recursive. arch/arm/Kconfig | 3 ++- arch/arm/common/Makefile | 1 - arch/arm/include/asm/thread_notify.h | 1 + arch/arm/kernel/Makefile | 2 +- arch/arm/kernel/hw_breakpoint.c | 7 +++++++ arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/process.c | 2 ++ arch/arm/mm/proc-arm920.S | 2 +- arch/arm/mm/proc-arm926.S | 2 +- arch/arm/mm/proc-sa1100.S | 2 +- arch/arm/mm/proc-v6.S | 2 +- arch/arm/mm/proc-v7.S | 2 +- arch/arm/mm/proc-xsc3.S | 2 +- arch/arm/mm/proc-xscale.S | 2 +- arch/arm/vfp/vfpmodule.c | 34 +++++++++++++++++++++++++++------- 15 files changed, 48 insertions(+), 18 deletions(-) Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Auto-merging arch/arm/mach-imx/clock-imx31.c Auto-merging arch/arm/mach-imx/clock-imx35.c Auto-merging arch/arm/mach-imx/cpu-imx31.c Auto-merging arch/arm/mach-imx/devices-imx31.h Auto-merging arch/arm/mach-imx/devices-imx35.h Auto-merging arch/arm/mach-imx/ehci-imx31.c Auto-merging arch/arm/mach-imx/ehci-imx35.c Auto-merging arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c Auto-merging arch/arm/mach-imx/mach-armadillo5x0.c Auto-merging arch/arm/mach-imx/mach-bug.c Auto-merging arch/arm/mach-imx/mach-cpuimx35.c Auto-merging arch/arm/mach-imx/mach-kzm_arm11_01.c Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c Auto-merging arch/arm/mach-imx/mach-mx31ads.c Auto-merging arch/arm/mach-imx/mach-mx31lilly.c Auto-merging arch/arm/mach-imx/mach-mx31lite.c Auto-merging arch/arm/mach-imx/mach-mx31moboard.c Auto-merging arch/arm/mach-imx/mach-mx35_3ds.c Auto-merging arch/arm/mach-imx/mach-pcm037.c Auto-merging arch/arm/mach-imx/mach-pcm037_eet.c Auto-merging arch/arm/mach-imx/mach-pcm043.c Auto-merging arch/arm/mach-imx/mach-qong.c Auto-merging arch/arm/mach-imx/mach-vpr200.c Auto-merging arch/arm/mach-imx/mx31lilly-db.c Auto-merging arch/arm/mach-imx/mx31lite-db.c Auto-merging arch/arm/mach-imx/mx31moboard-devboard.c Auto-merging arch/arm/mach-imx/mx31moboard-marxbot.c Auto-merging arch/arm/mach-imx/mx31moboard-smartbot.c Removing arch/arm/mach-mx3/Kconfig Removing arch/arm/mach-mx3/Makefile Removing arch/arm/mach-mx3/Makefile.boot Removing arch/arm/mach-mx3/devices.c Removing arch/arm/mach-mx3/devices.h Removing arch/arm/mach-mx3/mm.c Removing arch/arm/mach-mxc91231/Kconfig Removing arch/arm/mach-mxc91231/Makefile Removing arch/arm/mach-mxc91231/Makefile.boot Removing arch/arm/mach-mxc91231/clock.c Removing arch/arm/mach-mxc91231/crm_regs.h Removing arch/arm/mach-mxc91231/devices.c Removing arch/arm/mach-mxc91231/devices.h Removing arch/arm/mach-mxc91231/iomux.c Removing arch/arm/mach-mxc91231/magx-zn5.c Removing arch/arm/mach-mxc91231/mm.c Removing arch/arm/mach-mxc91231/system.c Removing arch/arm/plat-mxc/include/mach/iomux-mxc91231.h Removing arch/arm/plat-mxc/include/mach/mxc91231.h Merge made by recursive. arch/arm/Makefile | 3 +- arch/arm/configs/mx1_defconfig | 11 +- arch/arm/configs/mx21_defconfig | 10 +- arch/arm/configs/mx27_defconfig | 46 ++- arch/arm/configs/mx3_defconfig | 43 +- arch/arm/configs/mx51_defconfig | 57 ++- arch/arm/mach-imx/Kconfig | 305 +++++++++- arch/arm/mach-imx/Makefile | 37 +- arch/arm/mach-imx/Makefile.boot | 4 + arch/arm/mach-imx/cache-l2x0.c | 56 ++ arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c | 3 +- arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c | 1 - arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} | 38 +-- arch/arm/mach-imx/cpu-imx35.c | 44 ++ .../crm_regs.h => mach-imx/crmregs-imx31.h} | 0 arch/arm/mach-imx/devices-imx1.h | 8 +- arch/arm/mach-imx/devices-imx21.h | 22 +- arch/arm/mach-imx/devices-imx25.h | 35 +- arch/arm/mach-imx/devices-imx27.h | 30 +- arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h | 36 +- arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h | 37 +- arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c | 1 - arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c | 1 - arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 - arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 17 +- .../eukrea_mbimxsd35-baseboard.c} | 29 +- arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c | 0 .../arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c | 29 +- arch/arm/{mach-mx3 => mach-imx}/mach-bug.c | 1 - arch/arm/mach-imx/mach-cpuimx27.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c | 2 - arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 - arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 14 +- .../arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c | 1 - arch/arm/mach-imx/mach-mx1ads.c | 1 - arch/arm/mach-imx/mach-mx21ads.c | 1 - arch/arm/mach-imx/mach-mx25_3ds.c | 13 +- arch/arm/mach-imx/mach-mx27ads.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c | 50 +- arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c | 75 ++- arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c | 1 - arch/arm/mach-imx/mach-mxt_td60.c | 1 - arch/arm/mach-imx/mach-pca100.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c | 65 ++- arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c | 17 +- arch/arm/mach-imx/mach-pcm038.c | 1 - arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c | 17 +- arch/arm/{mach-mx3 => mach-imx}/mach-qong.c | 15 +- arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c | 36 +- arch/arm/mach-imx/mm-imx31.c | 66 ++ arch/arm/mach-imx/mm-imx35.c | 63 ++ arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c | 13 +- arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c | 3 +- .../{mach-mx3 => mach-imx}/mx31moboard-devboard.c | 1 - .../{mach-mx3 => mach-imx}/mx31moboard-marxbot.c | 2 - .../{mach-mx3 => mach-imx}/mx31moboard-smartbot.c | 1 - arch/arm/{mach-mx3 => mach-imx}/pcm037.h | 0 arch/arm/mach-mx3/Kconfig | 257 -------- arch/arm/mach-mx3/Makefile | 26 - arch/arm/mach-mx3/Makefile.boot | 3 - arch/arm/mach-mx3/devices.c | 115 ---- arch/arm/mach-mx3/devices.h | 4 - arch/arm/mach-mx3/mm.c | 141 ----- arch/arm/mach-mx5/Kconfig | 58 ++- arch/arm/mach-mx5/board-cpuimx51.c | 2 - arch/arm/mach-mx5/board-cpuimx51sd.c | 2 - arch/arm/mach-mx5/board-mx50_rdp.c | 1 - arch/arm/mach-mx5/board-mx51_babbage.c | 18 +- arch/arm/mach-mx5/board-mx51_efikamx.c | 5 +- arch/arm/mach-mx5/board-mx51_efikasb.c | 5 +- arch/arm/mach-mx5/board-mx53_evk.c | 2 - arch/arm/mach-mx5/board-mx53_loco.c | 4 +- arch/arm/mach-mx5/board-mx53_smd.c | 30 +- arch/arm/mach-mx5/clock-mx51-mx53.c | 1 + arch/arm/mach-mx5/cpu.c | 23 + arch/arm/mach-mx5/devices-imx50.h | 6 +- arch/arm/mach-mx5/devices-imx51.h | 25 +- arch/arm/mach-mx5/devices-imx53.h | 13 +- arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 - arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 16 +- arch/arm/mach-mx5/mx51_efika.c | 3 - arch/arm/mach-mxc91231/Kconfig | 11 - arch/arm/mach-mxc91231/Makefile | 2 - arch/arm/mach-mxc91231/Makefile.boot | 3 - arch/arm/mach-mxc91231/clock.c | 640 -------------------- arch/arm/mach-mxc91231/crm_regs.h | 394 ------------ arch/arm/mach-mxc91231/devices.c | 251 -------- arch/arm/mach-mxc91231/devices.h | 13 - arch/arm/mach-mxc91231/iomux.c | 177 ------ arch/arm/mach-mxc91231/magx-zn5.c | 62 -- arch/arm/mach-mxc91231/mm.c | 62 -- arch/arm/mach-mxc91231/system.c | 51 -- arch/arm/mach-mxs/clock-mx28.c | 7 +- arch/arm/mach-mxs/devices-mx28.h | 2 +- arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 5 +- arch/arm/mach-mxs/include/mach/devices-common.h | 5 +- arch/arm/mach-mxs/include/mach/mx23.h | 2 +- arch/arm/mach-mxs/mach-mx23evk.c | 2 +- arch/arm/mach-mxs/mach-mx28evk.c | 4 +- arch/arm/plat-mxc/Kconfig | 54 +- arch/arm/plat-mxc/devices/Kconfig | 7 +- arch/arm/plat-mxc/devices/Makefile | 2 + arch/arm/plat-mxc/devices/platform-ipu-core.c | 129 ++++ arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 40 ++ arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +- arch/arm/plat-mxc/gpio.c | 7 + arch/arm/plat-mxc/include/mach/common.h | 8 +- arch/arm/plat-mxc/include/mach/debug-macro.S | 7 - arch/arm/plat-mxc/include/mach/devices-common.h | 27 + arch/arm/plat-mxc/include/mach/hardware.h | 17 +- arch/arm/plat-mxc/include/mach/io.h | 23 +- arch/arm/plat-mxc/include/mach/iomux-mx25.h | 3 + arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 283 --------- arch/arm/plat-mxc/include/mach/irqs.h | 2 - arch/arm/plat-mxc/include/mach/memory.h | 3 - arch/arm/plat-mxc/include/mach/mx27.h | 4 +- arch/arm/plat-mxc/include/mach/mx53.h | 13 - arch/arm/plat-mxc/include/mach/mxc.h | 22 +- arch/arm/plat-mxc/include/mach/mxc91231.h | 256 -------- arch/arm/plat-mxc/include/mach/system.h | 6 - arch/arm/plat-mxc/include/mach/timex.h | 2 - arch/arm/plat-mxc/ssi-fiq.S | 2 + arch/arm/plat-mxc/system.c | 6 - arch/arm/plat-mxc/time.c | 2 +- drivers/video/Kconfig | 5 +- drivers/video/imxfb.c | 28 +- 129 files changed, 1360 insertions(+), 3427 deletions(-) create mode 100644 arch/arm/mach-imx/cache-l2x0.c rename arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c (99%) rename arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} (72%) create mode 100644 arch/arm/mach-imx/cpu-imx35.c rename arch/arm/{mach-mx3/crm_regs.h => mach-imx/crmregs-imx31.h} (100%) rename arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h (67%) rename arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h (69%) rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c (99%) rename arch/arm/{mach-mx3/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd35-baseboard.c} (92%) rename arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c (100%) rename arch/arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c (95%) rename arch/arm/{mach-mx3 => mach-imx}/mach-bug.c (98%) rename arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c (96%) rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c (92%) rename arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c (94%) rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c (92%) rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c (97%) rename arch/arm/{mach-mx3 => mach-imx}/mach-qong.c (95%) rename arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c (92%) create mode 100644 arch/arm/mach-imx/mm-imx31.c create mode 100644 arch/arm/mach-imx/mm-imx35.c rename arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c (95%) rename arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c (98%) rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-devboard.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-marxbot.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-smartbot.c (99%) rename arch/arm/{mach-mx3 => mach-imx}/pcm037.h (100%) delete mode 100644 arch/arm/mach-mx3/Kconfig delete mode 100644 arch/arm/mach-mx3/Makefile delete mode 100644 arch/arm/mach-mx3/Makefile.boot delete mode 100644 arch/arm/mach-mx3/devices.c delete mode 100644 arch/arm/mach-mx3/devices.h delete mode 100644 arch/arm/mach-mx3/mm.c delete mode 100644 arch/arm/mach-mxc91231/Kconfig delete mode 100644 arch/arm/mach-mxc91231/Makefile delete mode 100644 arch/arm/mach-mxc91231/Makefile.boot delete mode 100644 arch/arm/mach-mxc91231/clock.c delete mode 100644 arch/arm/mach-mxc91231/crm_regs.h delete mode 100644 arch/arm/mach-mxc91231/devices.c delete mode 100644 arch/arm/mach-mxc91231/devices.h delete mode 100644 arch/arm/mach-mxc91231/iomux.c delete mode 100644 arch/arm/mach-mxc91231/magx-zn5.c delete mode 100644 arch/arm/mach-mxc91231/mm.c delete mode 100644 arch/arm/mach-mxc91231/system.c create mode 100644 arch/arm/plat-mxc/devices/platform-ipu-core.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rtc.c delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h delete mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h Merging linux-spec/for-next $ git merge linux-spec/for-next Already up-to-date. Merging msm/for-next $ git merge msm/for-next Auto-merging arch/arm/mach-msm/acpuclock-arm11.c Merge made by recursive. arch/arm/mach-msm/Makefile | 5 +- arch/arm/mach-msm/acpuclock-arm11.c | 2 +- arch/arm/mach-msm/board-halibut.c | 1 + arch/arm/mach-msm/board-mahimahi.c | 1 + arch/arm/mach-msm/board-msm7x30.c | 1 + arch/arm/mach-msm/board-msm8960.c | 18 + arch/arm/mach-msm/board-msm8x60.c | 9 +- arch/arm/mach-msm/board-qsd8x50.c | 6 +- arch/arm/mach-msm/board-trout.c | 1 + arch/arm/mach-msm/clock-dummy.c | 81 +++++ arch/arm/mach-msm/clock.h | 11 + arch/arm/mach-msm/devices-msm7x00.c | 21 ++- arch/arm/mach-msm/devices-msm7x30.c | 21 ++- arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++ arch/arm/mach-msm/devices-msm8x60.c | 56 ++++ arch/arm/mach-msm/devices-qsd8x50.c | 21 ++- arch/arm/mach-msm/devices.h | 8 + arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++----- arch/arm/mach-msm/include/mach/dma.h | 84 +++--- arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +- arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +- arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +- arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 + arch/arm/mach-msm/io.c | 3 - arch/arm/mach-msm/timer.c | 2 +- 26 files changed, 810 insertions(+), 138 deletions(-) create mode 100644 arch/arm/mach-msm/clock-dummy.c create mode 100644 arch/arm/mach-msm/devices-msm8x60.c Merging omap/for-next $ git merge omap/for-next Already up-to-date. Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Already up-to-date. Merging s5p/for-next $ git merge s5p/for-next Merge made by recursive. arch/arm/configs/exynos4_defconfig | 2 + arch/arm/mach-exynos4/Kconfig | 2 + arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/cpuidle.c | 86 ++++++++++++++++++++++++++++++++++ arch/arm/mach-exynos4/mach-nuri.c | 89 ++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/cpuidle.c Merging tegra/for-next $ git merge tegra/for-next Already up-to-date. Merging ux500-core/ux500-core $ git merge ux500-core/ux500-core Auto-merging arch/arm/mach-ux500/board-mop500.c Removing arch/arm/mach-ux500/cpufreq.c Auto-merging arch/arm/mach-ux500/include/mach/db8500-regs.h Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h Removing arch/arm/mach-ux500/include/mach/prcmu.h Removing arch/arm/mach-ux500/prcmu.c Merge made by recursive. arch/arm/configs/u8500_defconfig | 29 +- arch/arm/mach-ux500/Kconfig | 16 +- arch/arm/mach-ux500/Makefile | 11 +- arch/arm/mach-ux500/board-mop500-regulators.c | 9 +- arch/arm/mach-ux500/board-mop500-sdi.c | 41 +- arch/arm/mach-ux500/board-mop500.c | 22 +- arch/arm/mach-ux500/board-mop500.h | 5 + arch/arm/mach-ux500/board-snowball-pins.c | 133 ++ arch/arm/mach-ux500/board-snowball.c | 359 ++++ arch/arm/mach-ux500/board-snowball.h | 12 + arch/arm/mach-ux500/clock-db8500.c | 1291 +++++++++++++ arch/arm/mach-ux500/clock.c | 904 +++------- arch/arm/mach-ux500/clock.h | 225 +-- arch/arm/mach-ux500/cpu-db5500.c | 2 + arch/arm/mach-ux500/cpu-db8500.c | 190 ++ arch/arm/mach-ux500/cpu.c | 7 +- arch/arm/mach-ux500/cpufreq.c | 211 -- arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +- arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +- arch/arm/mach-ux500/include/mach/hardware.h | 1 + arch/arm/mach-ux500/include/mach/id.h | 20 + .../mach-ux500/include/mach/irqs-board-mop500.h | 5 + .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 + arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 + arch/arm/mach-ux500/include/mach/irqs.h | 46 +- arch/arm/mach-ux500/include/mach/prcmu-db5500.h | 45 + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 - arch/arm/mach-ux500/include/mach/prcmu-fw-api.h | 523 +++++ .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h | 467 +++++ arch/arm/mach-ux500/include/mach/prcmu-regs.h | 27 +- arch/arm/mach-ux500/include/mach/prcmu.h | 28 - arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- arch/arm/mach-ux500/pins-db8500.h | 142 +- arch/arm/mach-ux500/pm/Kconfig | 6 + arch/arm/mach-ux500/pm/Makefile | 4 + arch/arm/mach-ux500/pm/cpufreq.c | 171 ++ arch/arm/mach-ux500/prcmu-db5500.c | 449 +++++ arch/arm/mach-ux500/prcmu-db8500.c | 2018 ++++++++++++++++++++ arch/arm/mach-ux500/prcmu-regs-db8500.h | 162 ++ arch/arm/mach-ux500/prcmu.c | 394 ---- arch/arm/mach-ux500/regulator-db8500.c | 562 ++++++ arch/arm/mach-ux500/regulator-db8500.h | 45 + arch/arm/plat-nomadik/include/plat/pincfg.h | 5 - drivers/mfd/ab8500-i2c.c | 2 +- 45 files changed, 7199 insertions(+), 1582 deletions(-) create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c create mode 100644 arch/arm/mach-ux500/board-snowball.c create mode 100644 arch/arm/mach-ux500/board-snowball.h create mode 100644 arch/arm/mach-ux500/clock-db8500.c delete mode 100644 arch/arm/mach-ux500/cpufreq.c create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h create mode 100644 arch/arm/mach-ux500/pm/Kconfig create mode 100644 arch/arm/mach-ux500/pm/Makefile create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h delete mode 100644 arch/arm/mach-ux500/prcmu.c create mode 100644 arch/arm/mach-ux500/regulator-db8500.c create mode 100644 arch/arm/mach-ux500/regulator-db8500.h Merging xilinx/arm-next $ git merge xilinx/arm-next Auto-merging arch/arm/Kconfig Auto-merging arch/arm/Makefile Merge made by recursive. arch/arm/Kconfig | 14 ++ arch/arm/Makefile | 1 + arch/arm/mach-zynq/Kconfig | 14 ++ arch/arm/mach-zynq/Makefile | 7 + arch/arm/mach-zynq/Makefile.boot | 3 + arch/arm/mach-zynq/board_ep107.c | 85 +++++++ arch/arm/mach-zynq/common.c | 114 ++++++++++ arch/arm/mach-zynq/common.h | 30 +++ arch/arm/mach-zynq/include/mach/clkdev.h | 33 +++ arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++ arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++ arch/arm/mach-zynq/include/mach/hardware.h | 18 ++ arch/arm/mach-zynq/include/mach/io.h | 33 +++ arch/arm/mach-zynq/include/mach/irqs.h | 29 +++ arch/arm/mach-zynq/include/mach/memory.h | 23 ++ arch/arm/mach-zynq/include/mach/system.h | 28 +++ arch/arm/mach-zynq/include/mach/timex.h | 23 ++ arch/arm/mach-zynq/include/mach/uart.h | 25 ++ arch/arm/mach-zynq/include/mach/uncompress.h | 51 +++++ arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++ arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++ arch/arm/mach-zynq/timer.c | 297 +++++++++++++++++++++++++ arch/arm/mm/Kconfig | 2 +- 23 files changed, 963 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-zynq/Kconfig create mode 100644 arch/arm/mach-zynq/Makefile create mode 100644 arch/arm/mach-zynq/Makefile.boot create mode 100644 arch/arm/mach-zynq/board_ep107.c create mode 100644 arch/arm/mach-zynq/common.c create mode 100644 arch/arm/mach-zynq/common.h create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h create mode 100644 arch/arm/mach-zynq/include/mach/io.h create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h create mode 100644 arch/arm/mach-zynq/include/mach/memory.h create mode 100644 arch/arm/mach-zynq/include/mach/system.h create mode 100644 arch/arm/mach-zynq/include/mach/timex.h create mode 100644 arch/arm/mach-zynq/include/mach/uart.h create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h create mode 100644 arch/arm/mach-zynq/timer.c Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Merge made by recursive. arch/blackfin/include/asm/system.h | 36 ++++++++++++++++++------------------ arch/blackfin/kernel/gptimers.c | 2 +- arch/blackfin/kernel/time-ts.c | 8 +++++++- arch/blackfin/mach-common/smp.c | 21 +++++++++++++++++---- 4 files changed, 43 insertions(+), 24 deletions(-) Merging cris/for-next $ git merge cris/for-next Auto-merging drivers/net/cris/eth_v10.c Merge made by recursive. Documentation/cris/README | 62 +++++++++++++++--------------- arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- arch/cris/arch-v32/kernel/ptrace.c | 2 - arch/cris/include/arch-v32/arch/cache.h | 2 +- drivers/net/cris/eth_v10.c | 1 - 5 files changed, 34 insertions(+), 39 deletions(-) Merging ia64/test $ git merge ia64/test Merge made by recursive. arch/ia64/oprofile/backtrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68k/lib/Makefile_mm Removing arch/m68k/lib/Makefile_no Removing arch/m68k/lib/muldi3_mm.c Removing arch/m68k/lib/muldi3_no.c Removing arch/m68k/mm/Makefile_mm Removing arch/m68k/mm/Makefile_no Removing arch/m68k/mm/kmap_mm.c Removing arch/m68k/mm/kmap_no.c Merge made by recursive. arch/m68k/include/asm/io_no.h | 8 +- arch/m68k/kernel/m68k_ksyms_no.c | 9 - arch/m68k/lib/Makefile | 13 ++- arch/m68k/lib/Makefile_mm | 6 - arch/m68k/lib/Makefile_no | 7 - arch/m68k/lib/memcpy.c | 128 ++++++++------ arch/m68k/lib/memmove.c | 2 - arch/m68k/lib/memset.c | 114 ++++++++----- arch/m68k/lib/muldi3.c | 99 ++++++++++- arch/m68k/lib/muldi3_mm.c | 63 ------- arch/m68k/lib/muldi3_no.c | 86 --------- arch/m68k/lib/string.c | 223 ----------------------- arch/m68k/mm/Makefile | 14 +- arch/m68k/mm/Makefile_mm | 8 - arch/m68k/mm/Makefile_no | 5 - arch/m68k/mm/init_no.c | 51 +----- arch/m68k/mm/kmap.c | 368 +++++++++++++++++++++++++++++++++++++- arch/m68k/mm/kmap_mm.c | 367 ------------------------------------- arch/m68k/mm/kmap_no.c | 45 ----- 19 files changed, 634 insertions(+), 982 deletions(-) delete mode 100644 arch/m68k/lib/Makefile_mm delete mode 100644 arch/m68k/lib/Makefile_no delete mode 100644 arch/m68k/lib/muldi3_mm.c delete mode 100644 arch/m68k/lib/muldi3_no.c delete mode 100644 arch/m68k/mm/Makefile_mm delete mode 100644 arch/m68k/mm/Makefile_no delete mode 100644 arch/m68k/mm/kmap_mm.c delete mode 100644 arch/m68k/mm/kmap_no.c Merging microblaze/next $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Merge made by recursive. arch/mips/Kbuild.platforms | 1 + arch/mips/Kconfig | 19 + arch/mips/include/asm/mach-lantiq/lantiq.h | 59 ++ .../mips/include/asm/mach-lantiq/lantiq_platform.h | 46 ++ arch/mips/include/asm/mach-lantiq/war.h | 24 + arch/mips/include/asm/mach-lantiq/xway/irq.h | 18 + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 62 ++ .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 139 ++++ arch/mips/kernel/vmlinux.lds.S | 1 + arch/mips/lantiq/Kconfig | 23 + arch/mips/lantiq/Makefile | 11 + arch/mips/lantiq/Platform | 8 + arch/mips/lantiq/clk.c | 140 ++++ arch/mips/lantiq/clk.h | 18 + arch/mips/lantiq/devices.c | 125 ++++ arch/mips/lantiq/devices.h | 20 + arch/mips/lantiq/early_printk.c | 33 + arch/mips/lantiq/irq.c | 326 +++++++++ arch/mips/lantiq/machtypes.h | 20 + arch/mips/lantiq/prom.c | 71 ++ arch/mips/lantiq/prom.h | 24 + arch/mips/lantiq/setup.c | 65 ++ arch/mips/lantiq/xway/Kconfig | 23 + arch/mips/lantiq/xway/Makefile | 7 + arch/mips/lantiq/xway/clk-ase.c | 48 ++ arch/mips/lantiq/xway/clk-xway.c | 223 ++++++ arch/mips/lantiq/xway/devices.c | 77 ++ arch/mips/lantiq/xway/devices.h | 17 + arch/mips/lantiq/xway/ebu.c | 53 ++ arch/mips/lantiq/xway/gpio.c | 195 +++++ arch/mips/lantiq/xway/gpio_ebu.c | 126 ++++ arch/mips/lantiq/xway/gpio_stp.c | 157 ++++ arch/mips/lantiq/xway/mach-easy50601.c | 69 ++ arch/mips/lantiq/xway/mach-easy50712.c | 74 ++ arch/mips/lantiq/xway/pmu.c | 70 ++ arch/mips/lantiq/xway/prom-ase.c | 39 + arch/mips/lantiq/xway/prom-xway.c | 54 ++ arch/mips/lantiq/xway/reset.c | 79 ++ arch/mips/pci/Makefile | 1 + arch/mips/pci/ops-lantiq.c | 116 +++ arch/mips/pci/pci-lantiq.c | 297 ++++++++ arch/mips/pci/pci-lantiq.h | 18 + arch/mips/sgi-ip27/ip27-timer.c | 13 +- drivers/mtd/maps/Kconfig | 9 + drivers/mtd/maps/Makefile | 1 + drivers/mtd/maps/lantiq-flash.c | 251 +++++++ drivers/tty/serial/Kconfig | 8 + drivers/tty/serial/Makefile | 1 + drivers/tty/serial/lantiq.c | 756 ++++++++++++++++++++ lib/Kconfig.debug | 2 +- 50 files changed, 4024 insertions(+), 13 deletions(-) create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq.h create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_platform.h create mode 100644 arch/mips/include/asm/mach-lantiq/war.h create mode 100644 arch/mips/include/asm/mach-lantiq/xway/irq.h create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h create mode 100644 arch/mips/lantiq/Kconfig create mode 100644 arch/mips/lantiq/Makefile create mode 100644 arch/mips/lantiq/Platform create mode 100644 arch/mips/lantiq/clk.c create mode 100644 arch/mips/lantiq/clk.h create mode 100644 arch/mips/lantiq/devices.c create mode 100644 arch/mips/lantiq/devices.h create mode 100644 arch/mips/lantiq/early_printk.c create mode 100644 arch/mips/lantiq/irq.c create mode 100644 arch/mips/lantiq/machtypes.h create mode 100644 arch/mips/lantiq/prom.c create mode 100644 arch/mips/lantiq/prom.h create mode 100644 arch/mips/lantiq/setup.c create mode 100644 arch/mips/lantiq/xway/Kconfig create mode 100644 arch/mips/lantiq/xway/Makefile create mode 100644 arch/mips/lantiq/xway/clk-ase.c create mode 100644 arch/mips/lantiq/xway/clk-xway.c create mode 100644 arch/mips/lantiq/xway/devices.c create mode 100644 arch/mips/lantiq/xway/devices.h create mode 100644 arch/mips/lantiq/xway/ebu.c create mode 100644 arch/mips/lantiq/xway/gpio.c create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c create mode 100644 arch/mips/lantiq/xway/gpio_stp.c create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c create mode 100644 arch/mips/lantiq/xway/pmu.c create mode 100644 arch/mips/lantiq/xway/prom-ase.c create mode 100644 arch/mips/lantiq/xway/prom-xway.c create mode 100644 arch/mips/lantiq/xway/reset.c create mode 100644 arch/mips/pci/ops-lantiq.c create mode 100644 arch/mips/pci/pci-lantiq.c create mode 100644 arch/mips/pci/pci-lantiq.h create mode 100644 drivers/mtd/maps/lantiq-flash.c create mode 100644 drivers/tty/serial/lantiq.c Merging parisc/for-next $ git merge parisc/for-next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/powerpc/next $ git merge 52xx-and-virtex/powerpc/next Already up-to-date. Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Removing drivers/s390/char/tape_block.c Merge made by recursive. arch/s390/Kconfig | 11 - arch/s390/appldata/appldata_base.c | 2 - arch/s390/crypto/prng.c | 2 +- arch/s390/include/asm/cmpxchg.h | 1 - arch/s390/include/asm/elf.h | 12 - arch/s390/include/asm/hugetlb.h | 17 +- arch/s390/include/asm/mmu.h | 3 - arch/s390/include/asm/mmu_context.h | 3 - arch/s390/include/asm/percpu.h | 66 +++++ arch/s390/include/asm/pgalloc.h | 28 +-- arch/s390/include/asm/pgtable.h | 38 --- arch/s390/include/asm/tlbflush.h | 11 +- arch/s390/kernel/setup.c | 31 +--- arch/s390/kernel/vdso32/Makefile | 3 + arch/s390/kernel/vdso64/Makefile | 3 + arch/s390/mm/extmem.c | 6 +- arch/s390/mm/fault.c | 39 --- arch/s390/mm/hugetlbpage.c | 10 - arch/s390/mm/pgtable.c | 67 +----- drivers/crypto/Kconfig | 2 + drivers/s390/block/dasd.c | 40 ++-- drivers/s390/block/dasd_alias.c | 4 - drivers/s390/block/dasd_devmap.c | 30 +++ drivers/s390/block/dasd_eckd.c | 11 +- drivers/s390/block/dasd_genhd.c | 2 +- drivers/s390/block/dasd_int.h | 3 + drivers/s390/block/dasd_ioctl.c | 128 +++++++---- drivers/s390/char/Kconfig | 12 - drivers/s390/char/Makefile | 1 - drivers/s390/char/monwriter.c | 4 +- drivers/s390/char/raw3270.c | 2 - drivers/s390/char/sclp_sdias.c | 3 - drivers/s390/char/tape_3590.c | 11 +- drivers/s390/char/tape_block.c | 445 ----------------------------------- drivers/s390/char/tape_std.c | 3 +- drivers/s390/cio/device_fsm.c | 3 - drivers/s390/cio/device_ops.c | 3 - drivers/s390/crypto/ap_bus.c | 8 +- 38 files changed, 252 insertions(+), 816 deletions(-) delete mode 100644 drivers/s390/char/tape_block.c Merging sh/sh-latest $ git merge sh/sh-latest Already up-to-date. Merging rmobile/rmobile-latest $ git merge rmobile/rmobile-latest Already up-to-date. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging tile/master $ git merge tile/master Already up-to-date. Merging unicore32/unicore32 $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/master $ git merge xtensa/master Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. Auto-merging arch/xtensa/Kconfig Auto-merging arch/xtensa/Makefile Auto-merging arch/xtensa/boot/Makefile Auto-merging arch/xtensa/configs/iss_defconfig CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig Auto-merging arch/xtensa/include/asm/coprocessor.h Auto-merging arch/xtensa/kernel/Makefile Auto-merging arch/xtensa/kernel/time.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master feef8dc] Merge remote-tracking branch 'xtensa/master' $ git diff -M --stat --summary HEAD^.. arch/xtensa/Kconfig | 17 +- arch/xtensa/Makefile | 5 +- arch/xtensa/boot/Makefile | 1 + arch/xtensa/include/asm/coprocessor.h | 9 +- arch/xtensa/include/asm/io.h | 40 ++-- arch/xtensa/include/asm/irq.h | 7 +- arch/xtensa/include/asm/serial.h | 12 +- arch/xtensa/kernel/Makefile | 4 +- arch/xtensa/kernel/time.c | 2 +- arch/xtensa/platforms/xtavnet/Makefile | 10 + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ .../platforms/xtavnet/include/platform/lcd.h | 22 ++ .../platforms/xtavnet/include/platform/serial.h | 1 + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ 15 files changed, 526 insertions(+), 37 deletions(-) create mode 100644 arch/xtensa/platforms/xtavnet/Makefile create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c create mode 100644 arch/xtensa/platforms/xtavnet/setup.c Merging ceph/for-next $ git merge ceph/for-next Already up-to-date. Merging cifs/master $ git merge cifs/master Already up-to-date. Merging configfs/linux-next $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next $ git merge ecryptfs/next Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution. Auto-merging fs/ecryptfs/crypto.c Auto-merging fs/ecryptfs/ecryptfs_kernel.h CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h Auto-merging fs/ecryptfs/file.c Auto-merging fs/ecryptfs/inode.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 047ab9a] Merge remote-tracking branch 'ecryptfs/next' $ git diff -M --stat --summary HEAD^.. fs/ecryptfs/crypto.c | 21 +++++++++++++++++++++ fs/ecryptfs/ecryptfs_kernel.h | 2 ++ fs/ecryptfs/file.c | 3 ++- fs/ecryptfs/inode.c | 18 +++--------------- 4 files changed, 28 insertions(+), 16 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 Merge made by recursive. fs/fat/cache.c | 7 +++++ fs/fat/dir.c | 32 +++++++++++---------- fs/fat/fat.h | 15 +++++----- fs/fat/fatent.c | 4 +- fs/fat/inode.c | 74 ++++++++++++++++++++++++------------------------- fs/fat/misc.c | 44 ++++++++++++++++++++--------- fs/fat/namei_msdos.c | 4 +- fs/fat/namei_vfat.c | 4 +- 8 files changed, 104 insertions(+), 80 deletions(-) Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/aops.c | 2 +- fs/gfs2/dir.c | 188 +++++++++++++++++++++---------------------------- fs/gfs2/file.c | 58 +++++++++++++--- fs/gfs2/glock.c | 33 ++++----- fs/gfs2/glock.h | 3 +- fs/gfs2/glops.c | 4 + fs/gfs2/inode.c | 56 +++++++++++---- fs/gfs2/inode.h | 3 +- fs/gfs2/log.c | 15 ++--- fs/gfs2/lops.c | 12 ++-- fs/gfs2/meta_io.h | 2 - fs/gfs2/ops_fstype.c | 2 +- fs/gfs2/rgrp.c | 24 +++++-- fs/gfs2/super.c | 34 +++++++--- 14 files changed, 247 insertions(+), 189 deletions(-) Merging hfsplus/for-next $ git merge hfsplus/for-next Merge made by recursive. fs/hfsplus/extents.c | 9 ++++++--- fs/hfsplus/super.c | 9 +++++++++ fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- fs/hfsplus/wrapper.c | 9 +++------ 4 files changed, 45 insertions(+), 17 deletions(-) Merging jfs/next $ git merge jfs/next Already up-to-date. Merging logfs/master $ git merge logfs/master Resolved 'fs/logfs/logfs.h' using previous resolution. Auto-merging fs/logfs/logfs.h CONFLICT (content): Merge conflict in fs/logfs/logfs.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0c9f20e] Merge remote-tracking branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/nfs/namespace.c | 4 ++-- fs/nfs/nfs4proc.c | 32 +++++++++++++++++++++----------- fs/nfs/nfs4xdr.c | 11 +++++++---- fs/nfs/pnfs.c | 8 +++++++- fs/nfs/super.c | 4 ++-- fs/nfs/write.c | 4 +--- net/sunrpc/auth_gss/auth_gss.c | 8 +++++--- 7 files changed, 45 insertions(+), 26 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Merge made by recursive. include/linux/sunrpc/svcsock.h | 1 + net/sunrpc/svcsock.c | 336 ++++++++++++++++++++++------------------ 2 files changed, 189 insertions(+), 148 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Merge made by recursive. fs/nilfs2/file.c | 1 - fs/nilfs2/inode.c | 3 +- fs/nilfs2/page.c | 53 +----------------- fs/nilfs2/page.h | 4 - fs/nilfs2/segbuf.c | 12 ---- fs/nilfs2/segment.c | 159 ++++++-------------------------------------------- fs/nilfs2/segment.h | 2 - 7 files changed, 21 insertions(+), 213 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging omfs/for-next $ git merge omfs/for-next Already up-to-date. Merging squashfs/master $ git merge squashfs/master Already up-to-date. Merging udf/for_next $ git merge udf/for_next Already up-to-date. Merging v9fs/for-next $ git merge v9fs/for-next Merge made by recursive. fs/9p/fid.c | 15 +------- fs/9p/v9fs.h | 1 - fs/9p/vfs_dentry.c | 4 ++- fs/9p/vfs_inode_dotl.c | 2 +- fs/9p/vfs_super.c | 80 +++++++++++++++++++++++++++++++++-------------- include/net/9p/9p.h | 2 - include/net/9p/client.h | 5 +-- net/9p/client.c | 29 ++-------------- net/9p/protocol.c | 7 ++-- net/9p/trans_common.c | 2 +- net/9p/trans_virtio.c | 15 ++++++-- 11 files changed, 84 insertions(+), 78 deletions(-) Merging ubifs/linux-next $ git merge ubifs/linux-next Merge made by recursive. fs/ubifs/debug.h | 152 +++++++++++++++++++++++++++++++++--------------------- fs/ubifs/file.c | 3 + 2 files changed, 97 insertions(+), 58 deletions(-) Merging xfs/master $ git merge xfs/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging vfs-scale/vfs-scale-working $ git merge vfs-scale/vfs-scale-working Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Merge made by recursive. arch/x86/include/asm/pci.h | 2 - arch/x86/kernel/pci-dma.c | 64 ------------------------------------- arch/x86/kernel/setup.c | 1 - arch/x86/pci/direct.c | 17 +++------ drivers/pci/pci.c | 15 +++++++++ drivers/pci/pcie/aer/aer_inject.c | 2 +- drivers/pci/pcie/aspm.c | 2 +- drivers/pci/quirks.c | 10 ++++++ 8 files changed, 33 insertions(+), 80 deletions(-) Merging hid/for-next $ git merge hid/for-next Auto-merging drivers/hid/Kconfig Removing drivers/hid/hid-3m-pct.c Removing drivers/hid/hid-cando.c Removing drivers/hid/hid-stantum.c Auto-merging samples/Kconfig Merge made by recursive. Documentation/{usb => hid}/hiddev.txt | 0 Documentation/hid/hidraw.txt | 119 +++++++++++++ drivers/hid/Kconfig | 21 +-- drivers/hid/Makefile | 3 - drivers/hid/hid-3m-pct.c | 305 --------------------------------- drivers/hid/hid-cando.c | 276 ----------------------------- drivers/hid/hid-multitouch.c | 133 ++++++++++++--- drivers/hid/hid-stantum.c | 286 ------------------------------- drivers/hid/hidraw.c | 16 +- drivers/hid/usbhid/hiddev.c | 2 +- samples/Kconfig | 6 + samples/Makefile | 2 +- samples/hidraw/Makefile | 8 + samples/hidraw/hid-example.c | 178 +++++++++++++++++++ 14 files changed, 437 insertions(+), 918 deletions(-) rename Documentation/{usb => hid}/hiddev.txt (100%) create mode 100644 Documentation/hid/hidraw.txt delete mode 100644 drivers/hid/hid-3m-pct.c delete mode 100644 drivers/hid/hid-cando.c delete mode 100644 drivers/hid/hid-stantum.c create mode 100644 samples/hidraw/Makefile create mode 100644 samples/hidraw/hid-example.c Merging quilt/i2c $ git merge quilt/i2c Auto-merging drivers/i2c/i2c-core.c Merge made by recursive. drivers/i2c/i2c-core.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution. Resolved 'drivers/i2c/busses/i2c-designware-core.c' using previous resolution. Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution. Auto-merging arch/arm/mach-pxa/tosa.c CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c Auto-merging drivers/i2c/busses/Kconfig Auto-merging drivers/i2c/busses/Makefile Auto-merging drivers/i2c/busses/i2c-designware-core.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree. Auto-merging drivers/i2c/busses/i2c-pxa.c CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/i2c/busses/i2c-intel-mid.c arch/arm/mach-pxa/tosa.c: needs merge drivers/i2c/busses/i2c-designware-core.c: needs merge drivers/i2c/busses/i2c-intel-mid.c: needs merge drivers/i2c/busses/i2c-pxa.c: needs merge rm 'drivers/i2c/busses/i2c-intel-mid.c' $ git commit -v -a [master 7e16484] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' $ git diff -M --stat --summary HEAD^.. drivers/i2c/busses/Kconfig | 25 +- drivers/i2c/busses/Makefile | 6 +- .../{i2c-designware.c => i2c-designware-core.c} | 383 ++----- drivers/i2c/busses/i2c-designware-core.h | 106 ++ drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++ drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++ drivers/i2c/busses/i2c-intel-mid.c | 1135 -------------------- 7 files changed, 862 insertions(+), 1413 deletions(-) rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%) create mode 100644 drivers/i2c/busses/i2c-designware-core.h create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c $ git am -3 ../patches/0001-i2c-designware-mdelay-use-needs-linux-delay.h-inclus.patch Applying: i2c-designware: mdelay use needs linux/delay.h inclusion $ git reset HEAD^ Unstaged changes after reset: M drivers/i2c/busses/i2c-designware-core.c $ git add . $ git commit -v -a --amend [master c77d5dd] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' $ git am -3 ../patches/i2c__designware-pcidrv_depends_on_PCI.patch Applying: i2c: designware-pcidrv depends on PCI $ git reset HEAD^ Unstaged changes after reset: M drivers/i2c/busses/Kconfig $ git add . $ git commit -v -a --amend [master 7f020ec] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Auto-merging drivers/hwmon/lm90.c Merge made by recursive. Documentation/hwmon/k10temp | 3 ++- Documentation/hwmon/lm90 | 29 ++++++++++++++++++++--------- drivers/hwmon/Kconfig | 12 ++++++------ drivers/hwmon/adcxx.c | 16 ++++++++-------- drivers/hwmon/ibmaem.c | 10 +++++----- drivers/hwmon/k10temp.c | 11 ++++++----- drivers/hwmon/k8temp.c | 8 ++++---- drivers/hwmon/lm70.c | 10 +++++----- drivers/hwmon/lm90.c | 22 +++++++++++++++------- drivers/hwmon/ultra45_env.c | 4 ++-- 10 files changed, 73 insertions(+), 52 deletions(-) Merging hwmon-staging/hwmon-next $ git merge hwmon-staging/hwmon-next Auto-merging drivers/hwmon/Kconfig Merge made by recursive. Documentation/hwmon/max6642 | 21 + drivers/hwmon/Kconfig | 43 ++ drivers/hwmon/Makefile | 4 + drivers/hwmon/adm1275.c | 121 ++++++ drivers/hwmon/max34440.c | 6 +- drivers/hwmon/max6642.c | 356 ++++++++++++++++ drivers/hwmon/max8688.c | 4 +- drivers/hwmon/pmbus.h | 10 +- drivers/hwmon/pmbus_core.c | 971 ++++++++++++++++++++----------------------- drivers/hwmon/ucd9000.c | 278 ++++++++++++ drivers/hwmon/ucd9200.c | 210 ++++++++++ 11 files changed, 1483 insertions(+), 541 deletions(-) create mode 100644 Documentation/hwmon/max6642 create mode 100644 drivers/hwmon/adm1275.c create mode 100644 drivers/hwmon/max6642.c create mode 100644 drivers/hwmon/ucd9000.c create mode 100644 drivers/hwmon/ucd9200.c Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution. Resolved 'drivers/staging/Kconfig' using previous resolution. Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. Auto-merging arch/arm/mach-omap2/devices.c CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c Auto-merging drivers/media/dvb/b2c2/flexcop-pci.c Auto-merging drivers/media/dvb/dvb-usb/lmedm04.c CONFLICT (delete/modify): drivers/media/dvb/frontends/drx397xD.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/media/dvb/frontends/drx397xD.c left in tree. Removing drivers/media/dvb/frontends/drx397xD.h Removing drivers/media/dvb/frontends/drx397xD_fw.h Auto-merging drivers/staging/Kconfig CONFLICT (content): Merge conflict in drivers/staging/Kconfig Auto-merging drivers/staging/easycap/easycap_ioctl.c CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/media/dvb/frontends/drx397xD.c arch/arm/mach-omap2/devices.c: needs merge drivers/media/dvb/frontends/drx397xD.c: needs merge drivers/staging/Kconfig: needs merge drivers/staging/easycap/easycap_ioctl.c: needs merge rm 'drivers/media/dvb/frontends/drx397xD.c' $ git commit -v -a [master 66cdff9] Merge remote-tracking branch 'v4l-dvb/master' $ git diff -M --stat --summary HEAD^.. Documentation/video4linux/CARDLIST.em28xx | 2 +- drivers/media/common/saa7146_core.c | 7 +- drivers/media/common/tuners/xc5000.c | 32 +- drivers/media/dvb/b2c2/flexcop-pci.c | 4 +- drivers/media/dvb/bt8xx/bt878.c | 2 +- drivers/media/dvb/dvb-usb/lmedm04.c | 12 +- drivers/media/dvb/frontends/Kconfig | 12 +- drivers/media/dvb/frontends/Makefile | 3 +- drivers/media/dvb/frontends/drx397xD.c | 1511 -------------- drivers/media/dvb/frontends/drx397xD.h | 130 -- drivers/media/dvb/frontends/drx397xD_fw.h | 40 - drivers/media/dvb/frontends/drxd.h | 61 + drivers/media/dvb/frontends/drxd_firm.c | 929 +++++++++ drivers/media/dvb/frontends/drxd_firm.h | 115 + drivers/media/dvb/frontends/drxd_hard.c | 3000 +++++++++++++++++++++++++++ drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++++ drivers/media/dvb/mantis/hopper_cards.c | 2 +- drivers/media/dvb/mantis/mantis_cards.c | 2 +- drivers/media/dvb/mantis/mantis_pci.c | 5 +- drivers/media/video/bt8xx/bttv-driver.c | 2 +- drivers/media/video/cx18/cx18-driver.c | 2 +- drivers/media/video/cx23885/cx23885-core.c | 2 +- drivers/media/video/cx88/cx88-mpeg.c | 2 +- drivers/media/video/cx88/cx88-video.c | 2 +- drivers/media/video/em28xx/Kconfig | 1 + drivers/media/video/em28xx/em28xx-cards.c | 21 +- drivers/media/video/em28xx/em28xx-dvb.c | 22 +- drivers/media/video/em28xx/em28xx.h | 2 +- drivers/media/video/ivtv/ivtv-driver.c | 4 +- drivers/media/video/saa7134/saa7134-core.c | 2 +- drivers/media/video/saa7164/saa7164-core.c | 2 +- drivers/media/video/zoran/zoran_card.c | 2 +- include/media/soc_camera_platform.h | 50 + 33 files changed, 5253 insertions(+), 1745 deletions(-) delete mode 100644 drivers/media/dvb/frontends/drx397xD.c delete mode 100644 drivers/media/dvb/frontends/drx397xD.h delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h create mode 100644 drivers/media/dvb/frontends/drxd.h create mode 100644 drivers/media/dvb/frontends/drxd_firm.c create mode 100644 drivers/media/dvb/frontends/drxd_firm.h create mode 100644 drivers/media/dvb/frontends/drxd_hard.c create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h Merging kbuild/for-next $ git merge kbuild/for-next Merge made by recursive. scripts/kconfig/conf.c | 2 +- scripts/patch-kernel | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date! Merge made by recursive. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Already up-to-date. Merging infiniband/for-next $ git merge infiniband/for-next Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c Merge made by recursive. drivers/infiniband/hw/cxgb4/cm.c | 16 +++++++--------- drivers/infiniband/hw/cxgb4/device.c | 6 +++--- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 ++-- drivers/infiniband/hw/cxgb4/qp.c | 3 +-- drivers/infiniband/hw/qib/qib_iba7322.c | 3 ++- 5 files changed, 15 insertions(+), 17 deletions(-) Merging acpi/test $ git merge acpi/test Merge made by recursive. drivers/acpi/acpica/acglobal.h | 13 +++---- drivers/acpi/acpica/evmisc.c | 74 +++++++++++++++++++++------------------ drivers/acpi/acpica/utmutex.c | 12 +++++-- drivers/acpi/osl.c | 33 +++++++++++++---- include/acpi/acpiosxf.h | 3 ++ 5 files changed, 83 insertions(+), 52 deletions(-) Merging idle-test/idle-test $ git merge idle-test/idle-test Auto-merging Documentation/feature-removal-schedule.txt Auto-merging Documentation/kernel-parameters.txt Auto-merging arch/arm/kernel/process.c Auto-merging arch/x86/Kconfig Auto-merging arch/x86/include/asm/acpi.h Auto-merging arch/x86/include/asm/processor.h Auto-merging arch/x86/include/asm/system.h Auto-merging arch/x86/kernel/apm_32.c Auto-merging arch/x86/kernel/cpu/common.c Auto-merging arch/x86/kernel/process.c Auto-merging arch/x86/kernel/process_64.c Auto-merging arch/x86/kernel/setup.c Auto-merging arch/x86/kernel/smpboot.c Auto-merging arch/x86/xen/setup.c Auto-merging drivers/block/floppy.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 2 +- Documentation/kernel-parameters.txt | 14 +-- arch/arm/kernel/process.c | 4 +- arch/sh/kernel/idle.c | 6 +- arch/x86/Kconfig | 11 -- arch/x86/include/asm/acpi.h | 2 +- arch/x86/include/asm/idle.h | 2 +- arch/x86/include/asm/processor.h | 18 +-- arch/x86/include/asm/system.h | 9 - arch/x86/kernel/acpi/cstate.c | 24 +++ arch/x86/kernel/apm_32.c | 232 ---------------------------- arch/x86/kernel/cpu/bugs.c | 13 +-- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/proc.c | 2 - arch/x86/kernel/process.c | 167 +++++---------------- arch/x86/kernel/process_32.c | 4 +- arch/x86/kernel/process_64.c | 4 +- arch/x86/kernel/setup.c | 4 +- arch/x86/kernel/smpboot.c | 2 +- arch/x86/xen/setup.c | 6 +- drivers/acpi/processor_idle.c | 3 +- drivers/block/floppy.c | 35 ---- drivers/cpuidle/cpuidle.c | 50 ++++--- drivers/cpuidle/cpuidle.h | 1 + drivers/cpuidle/driver.c | 3 + drivers/cpuidle/governor.c | 3 + drivers/cpuidle/governors/menu.c | 4 +- include/linux/cpuidle.h | 4 + 28 files changed, 136 insertions(+), 495 deletions(-) Merging powertools/tools-test $ git merge powertools/tools-test Already up-to-date. Merging cpupowerutils/cpupowerutils $ git merge cpupowerutils/cpupowerutils Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 6 + tools/power/cpupower/.gitignore | 21 + tools/power/cpupower/AUTHORS | 18 + tools/power/cpupower/COPYING | 340 +++++++ tools/power/cpupower/Makefile | 273 ++++++ tools/power/cpupower/README | 49 + tools/power/cpupower/ToDo | 11 + tools/power/cpupower/bench/Makefile | 30 + tools/power/cpupower/bench/README-BENCH | 124 +++ tools/power/cpupower/bench/benchmark.c | 184 ++++ tools/power/cpupower/bench/benchmark.h | 27 + tools/power/cpupower/bench/config.h | 36 + tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++ tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++ tools/power/cpupower/bench/example.cfg | 11 + tools/power/cpupower/bench/main.c | 203 ++++ tools/power/cpupower/bench/parse.c | 224 +++++ tools/power/cpupower/bench/parse.h | 50 + tools/power/cpupower/bench/system.c | 188 ++++ tools/power/cpupower/bench/system.h | 29 + tools/power/cpupower/build/ccdv.c | 387 ++++++++ tools/power/cpupower/debug/i386/Makefile | 20 + tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++ tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++ tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++ .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++ tools/power/cpupower/debug/kernel/Makefile | 23 + .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++ tools/power/cpupower/debug/x86_64/Makefile | 14 + .../power/cpupower/debug/x86_64/centrino-decode.c | 1 + .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 + tools/power/cpupower/lib/cpufreq.c | 190 ++++ tools/power/cpupower/lib/cpufreq.h | 215 +++++ tools/power/cpupower/lib/sysfs.c | 671 ++++++++++++++ tools/power/cpupower/lib/sysfs.h | 21 + tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++ tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++ tools/power/cpupower/man/cpupower-info.1 | 19 + tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++ tools/power/cpupower/man/cpupower-set.1 | 103 +++ tools/power/cpupower/man/cpupower.1 | 72 ++ tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++ tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++ tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++ tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++ tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++ tools/power/cpupower/utils/builtin.h | 18 + tools/power/cpupower/utils/cpufreq-info.c | 665 ++++++++++++++ tools/power/cpupower/utils/cpufreq-set.c | 357 ++++++++ tools/power/cpupower/utils/cpuidle-info.c | 245 +++++ tools/power/cpupower/utils/cpupower-info.c | 154 ++++ tools/power/cpupower/utils/cpupower-set.c | 153 ++++ tools/power/cpupower/utils/cpupower.c | 201 ++++ tools/power/cpupower/utils/helpers/amd.c | 137 +++ tools/power/cpupower/utils/helpers/bitmask.c | 290 ++++++ tools/power/cpupower/utils/helpers/bitmask.h | 33 + tools/power/cpupower/utils/helpers/cpuid.c | 145 +++ tools/power/cpupower/utils/helpers/helpers.h | 180 ++++ tools/power/cpupower/utils/helpers/misc.c | 34 + tools/power/cpupower/utils/helpers/msr.c | 122 +++ tools/power/cpupower/utils/helpers/pci.c | 44 + tools/power/cpupower/utils/helpers/sysfs.c | 350 +++++++ tools/power/cpupower/utils/helpers/sysfs.h | 23 + tools/power/cpupower/utils/helpers/topology.c | 108 +++ .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 340 +++++++ .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 185 ++++ .../cpupower/utils/idle_monitor/cpupower-monitor.c | 446 +++++++++ .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++ .../cpupower/utils/idle_monitor/idle_monitors.def | 7 + .../cpupower/utils/idle_monitor/idle_monitors.h | 18 + .../cpupower/utils/idle_monitor/mperf_monitor.c | 258 ++++++ tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 212 +++++ tools/power/cpupower/utils/idle_monitor/snb_idle.c | 189 ++++ 73 files changed, 14423 insertions(+), 0 deletions(-) create mode 100644 tools/power/cpupower/.gitignore create mode 100644 tools/power/cpupower/AUTHORS create mode 100644 tools/power/cpupower/COPYING create mode 100644 tools/power/cpupower/Makefile create mode 100644 tools/power/cpupower/README create mode 100644 tools/power/cpupower/ToDo create mode 100644 tools/power/cpupower/bench/Makefile create mode 100644 tools/power/cpupower/bench/README-BENCH create mode 100644 tools/power/cpupower/bench/benchmark.c create mode 100644 tools/power/cpupower/bench/benchmark.h create mode 100644 tools/power/cpupower/bench/config.h create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh create mode 100644 tools/power/cpupower/bench/example.cfg create mode 100644 tools/power/cpupower/bench/main.c create mode 100644 tools/power/cpupower/bench/parse.c create mode 100644 tools/power/cpupower/bench/parse.h create mode 100644 tools/power/cpupower/bench/system.c create mode 100644 tools/power/cpupower/bench/system.h create mode 100644 tools/power/cpupower/build/ccdv.c create mode 100644 tools/power/cpupower/debug/i386/Makefile create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c create mode 100644 tools/power/cpupower/debug/kernel/Makefile create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c create mode 100644 tools/power/cpupower/debug/x86_64/Makefile create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c create mode 100644 tools/power/cpupower/lib/cpufreq.c create mode 100644 tools/power/cpupower/lib/cpufreq.h create mode 100644 tools/power/cpupower/lib/sysfs.c create mode 100644 tools/power/cpupower/lib/sysfs.h create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1 create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1 create mode 100644 tools/power/cpupower/man/cpupower-info.1 create mode 100644 tools/power/cpupower/man/cpupower-monitor.1 create mode 100644 tools/power/cpupower/man/cpupower-set.1 create mode 100644 tools/power/cpupower/man/cpupower.1 create mode 100644 tools/power/cpupower/po/cs.po create mode 100644 tools/power/cpupower/po/de.po create mode 100644 tools/power/cpupower/po/fr.po create mode 100644 tools/power/cpupower/po/it.po create mode 100644 tools/power/cpupower/po/pt.po create mode 100644 tools/power/cpupower/utils/builtin.h create mode 100644 tools/power/cpupower/utils/cpufreq-info.c create mode 100644 tools/power/cpupower/utils/cpufreq-set.c create mode 100644 tools/power/cpupower/utils/cpuidle-info.c create mode 100644 tools/power/cpupower/utils/cpupower-info.c create mode 100644 tools/power/cpupower/utils/cpupower-set.c create mode 100644 tools/power/cpupower/utils/cpupower.c create mode 100644 tools/power/cpupower/utils/helpers/amd.c create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c create mode 100644 tools/power/cpupower/utils/helpers/helpers.h create mode 100644 tools/power/cpupower/utils/helpers/misc.c create mode 100644 tools/power/cpupower/utils/helpers/msr.c create mode 100644 tools/power/cpupower/utils/helpers/pci.c create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h create mode 100644 tools/power/cpupower/utils/helpers/topology.c create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c Merging ieee1394/for-next $ git merge ieee1394/for-next Already up-to-date! Merge made by recursive. Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. Merging kvm/linux-next $ git merge kvm/linux-next Merge made by recursive. Documentation/kvm/api.txt | 23 ++ arch/powerpc/include/asm/kvm_host.h | 1 + arch/powerpc/kvm/powerpc.c | 4 + arch/powerpc/kvm/timing.c | 10 +- arch/x86/include/asm/kvm_emulate.h | 102 ++++++- arch/x86/include/asm/kvm_host.h | 43 +++- arch/x86/include/asm/msr-index.h | 1 + arch/x86/kvm/emulate.c | 570 ++++++++++++++++++++++++++++++----- arch/x86/kvm/i8254.h | 1 - arch/x86/kvm/mmu.c | 16 +- arch/x86/kvm/paging_tmpl.h | 4 +- arch/x86/kvm/svm.c | 410 +++++++++++++++++++++----- arch/x86/kvm/vmx.c | 107 ++++++-- arch/x86/kvm/x86.c | 273 +++++++++++++----- include/linux/kvm.h | 5 + include/linux/kvm_host.h | 14 +- virt/kvm/kvm_main.c | 17 - 17 files changed, 1323 insertions(+), 278 deletions(-) Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/user.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) Merging swiotlb/master $ git merge swiotlb/master Already up-to-date. Merging ibft/master $ git merge ibft/master 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 up-to-date. Merging net/master $ git merge net/master Auto-merging Documentation/feature-removal-schedule.txt Auto-merging MAINTAINERS Removing drivers/isdn/capi/capifs.c Removing drivers/isdn/capi/capifs.h Auto-merging drivers/net/cris/eth_v10.c Auto-merging drivers/net/qlcnic/qlcnic.h Auto-merging drivers/net/qlcnic/qlcnic_main.c Auto-merging drivers/net/sfc/efx.c Auto-merging drivers/net/sfc/net_driver.h Auto-merging drivers/net/sfc/nic.c Removing drivers/net/wireless/ath/ar9170/Kconfig Removing drivers/net/wireless/ath/ar9170/Makefile Removing drivers/net/wireless/ath/ar9170/ar9170.h Removing drivers/net/wireless/ath/ar9170/cmd.c Removing drivers/net/wireless/ath/ar9170/cmd.h Removing drivers/net/wireless/ath/ar9170/eeprom.h Removing drivers/net/wireless/ath/ar9170/hw.h Removing drivers/net/wireless/ath/ar9170/led.c Removing drivers/net/wireless/ath/ar9170/mac.c Removing drivers/net/wireless/ath/ar9170/main.c Removing drivers/net/wireless/ath/ar9170/phy.c Removing drivers/net/wireless/ath/ar9170/usb.c Removing drivers/net/wireless/ath/ar9170/usb.h Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/wireless/ath/ath9k/mac.c Auto-merging drivers/net/wireless/ath/ath9k/recv.c Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex Auto-merging net/9p/client.c Auto-merging net/core/dev.c Merge made by recursive. Documentation/feature-removal-schedule.txt | 21 - MAINTAINERS | 13 +- drivers/atm/iphase.c | 14 +- drivers/isdn/capi/Kconfig | 15 - drivers/isdn/capi/Makefile | 1 - drivers/isdn/capi/capi.c | 24 +- drivers/isdn/capi/capifs.c | 239 - drivers/isdn/capi/capifs.h | 28 - drivers/isdn/gigaset/ev-layer.c | 26 +- drivers/isdn/hysdn/hysdn_proclog.c | 11 +- drivers/isdn/mISDN/layer2.c | 20 +- drivers/net/8139cp.c | 46 +- drivers/net/atl1c/atl1c_ethtool.c | 8 - drivers/net/atl1c/atl1c_main.c | 23 +- drivers/net/atl1e/atl1e_ethtool.c | 3 - drivers/net/atl1e/atl1e_main.c | 12 +- drivers/net/atlx/atl1.c | 17 +- drivers/net/atlx/atl2.c | 14 +- drivers/net/bcm63xx_enet.c | 4 +- drivers/net/benet/be.h | 31 +- drivers/net/benet/be_cmds.c | 107 + drivers/net/benet/be_cmds.h | 21 + drivers/net/benet/be_ethtool.c | 99 +- drivers/net/benet/be_hw.h | 4 + drivers/net/benet/be_main.c | 187 +- drivers/net/bna/bnad.c | 22 +- drivers/net/bna/bnad.h | 2 - drivers/net/bna/bnad_ethtool.c | 63 - drivers/net/bnx2.c | 165 +- drivers/net/bnx2.h | 3 +- drivers/net/bnx2x/bnx2x.h | 1 - drivers/net/bnx2x/bnx2x_cmn.c | 49 +- drivers/net/bnx2x/bnx2x_cmn.h | 16 +- drivers/net/bnx2x/bnx2x_dcb.c | 22 + drivers/net/bnx2x/bnx2x_dcb.h | 8 +- drivers/net/bnx2x/bnx2x_ethtool.c | 139 +- drivers/net/bnx2x/bnx2x_hsi.h | 2 +- drivers/net/bnx2x/bnx2x_main.c | 32 +- drivers/net/bonding/bond_main.c | 2 +- drivers/net/cnic.c | 62 +- drivers/net/cnic.h | 1 + drivers/net/cnic_if.h | 6 +- drivers/net/cris/eth_v10.c | 4 +- drivers/net/cxgb3/cxgb3_main.c | 25 +- drivers/net/cxgb4/cxgb4_main.c | 17 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 15 +- drivers/net/enic/Makefile | 2 +- drivers/net/enic/enic.h | 5 +- drivers/net/enic/enic_dev.c | 62 +- drivers/net/enic/enic_dev.h | 7 +- drivers/net/enic/enic_main.c | 270 +- drivers/net/enic/enic_pp.c | 264 + drivers/net/enic/enic_pp.h | 27 + drivers/net/enic/enic_res.c | 4 +- drivers/net/enic/vnic_dev.c | 97 +- drivers/net/enic/vnic_dev.h | 6 +- drivers/net/enic/vnic_devcmd.h | 57 +- drivers/net/enic/vnic_vic.c | 5 +- drivers/net/enic/vnic_vic.h | 13 +- drivers/net/ewrk3.c | 56 +- drivers/net/fs_enet/fs_enet-main.c | 2 - drivers/net/gianfar.h | 17 - drivers/net/gianfar_ethtool.c | 52 +- drivers/net/ibmlana.c | 3 +- drivers/net/ioc3-eth.c | 30 +- drivers/net/jme.c | 77 +- drivers/net/jme.h | 2 - drivers/net/ksz884x.c | 73 +- drivers/net/macb.c | 11 +- drivers/net/netxen/netxen_nic.h | 2 +- drivers/net/netxen/netxen_nic_ethtool.c | 102 - drivers/net/netxen/netxen_nic_init.c | 3 +- drivers/net/netxen/netxen_nic_main.c | 55 +- drivers/net/niu.c | 48 +- drivers/net/niu.h | 1 + drivers/net/pcnet32.c | 74 +- drivers/net/ps3_gelic_net.c | 26 +- drivers/net/ps3_gelic_net.h | 3 - drivers/net/ps3_gelic_wireless.c | 4 - drivers/net/qla3xxx.c | 2 +- drivers/net/qlcnic/qlcnic.h | 224 +- drivers/net/qlcnic/qlcnic_ctx.c | 135 +- drivers/net/qlcnic/qlcnic_ethtool.c | 149 +- drivers/net/qlcnic/qlcnic_hw.c | 82 +- drivers/net/qlcnic/qlcnic_init.c | 58 +- drivers/net/qlcnic/qlcnic_main.c | 446 +- drivers/net/qlge/qlge_ethtool.c | 38 +- drivers/net/r8169.c | 404 +- drivers/net/s2io.c | 91 +- drivers/net/s2io.h | 13 +- drivers/net/sfc/efx.c | 20 +- drivers/net/sfc/ethtool.c | 106 +- drivers/net/sfc/net_driver.h | 2 - drivers/net/sfc/nic.c | 6 +- drivers/net/sfc/rx.c | 3 + drivers/net/skge.c | 86 +- drivers/net/skge.h | 1 - drivers/net/sky2.c | 186 +- drivers/net/sky2.h | 1 - drivers/net/smsc911x.c | 292 +- drivers/net/smsc911x.h | 22 +- drivers/net/stmmac/dwmac1000_core.c | 5 +- drivers/net/stmmac/stmmac_ethtool.c | 18 +- drivers/net/stmmac/stmmac_main.c | 83 +- drivers/net/sungem.c | 3 +- drivers/net/sunhme.c | 6 +- drivers/net/tg3.c | 499 +- drivers/net/tg3.h | 67 +- drivers/net/ucc_geth_ethtool.c | 1 - drivers/net/usb/Kconfig | 2 +- drivers/net/usb/plusb.c | 32 +- drivers/net/usb/rndis_host.c | 39 +- drivers/net/usb/smsc75xx.c | 124 +- drivers/net/usb/smsc95xx.c | 83 +- drivers/net/veth.c | 45 +- drivers/net/via-rhine.c | 2 +- drivers/net/via-velocity.c | 7 +- drivers/net/virtio_net.c | 46 +- drivers/net/vxge/vxge-config.c | 48 +- drivers/net/vxge/vxge-config.h | 70 +- drivers/net/vxge/vxge-ethtool.c | 25 +- drivers/net/vxge/vxge-main.c | 43 +- drivers/net/vxge/vxge-traffic.h | 2 +- drivers/net/vxge/vxge-version.h | 4 +- drivers/net/wireless/Kconfig | 1 + drivers/net/wireless/Makefile | 2 + drivers/net/wireless/ath/Kconfig | 1 - drivers/net/wireless/ath/Makefile | 1 - drivers/net/wireless/ath/ar9170/Kconfig | 20 - drivers/net/wireless/ath/ar9170/Makefile | 3 - drivers/net/wireless/ath/ar9170/ar9170.h | 258 - drivers/net/wireless/ath/ar9170/cmd.c | 127 - drivers/net/wireless/ath/ar9170/cmd.h | 92 - drivers/net/wireless/ath/ar9170/eeprom.h | 179 - drivers/net/wireless/ath/ar9170/hw.h | 430 - drivers/net/wireless/ath/ar9170/led.c | 181 - drivers/net/wireless/ath/ar9170/mac.c | 519 - drivers/net/wireless/ath/ar9170/main.c | 2190 --- drivers/net/wireless/ath/ar9170/phy.c | 1719 --- drivers/net/wireless/ath/ar9170/usb.c | 1008 -- drivers/net/wireless/ath/ar9170/usb.h | 82 - drivers/net/wireless/ath/ath.h | 1 + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +- drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 12 - drivers/net/wireless/ath/ath9k/ar9003_hw.c | 98 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 12 - drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 925 -- drivers/net/wireless/ath/ath9k/ath9k.h | 14 +- drivers/net/wireless/ath/ath9k/beacon.c | 207 +- drivers/net/wireless/ath/ath9k/common.c | 2 +- drivers/net/wireless/ath/ath9k/debug.c | 94 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 + drivers/net/wireless/ath/ath9k/eeprom_def.c | 7 + drivers/net/wireless/ath/ath9k/gpio.c | 14 +- drivers/net/wireless/ath/ath9k/htc.h | 2 +- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 9 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 33 +- drivers/net/wireless/ath/ath9k/hw-ops.h | 6 - drivers/net/wireless/ath/ath9k/hw.c | 206 +- drivers/net/wireless/ath/ath9k/hw.h | 66 +- drivers/net/wireless/ath/ath9k/init.c | 53 +- drivers/net/wireless/ath/ath9k/mac.c | 113 +- drivers/net/wireless/ath/ath9k/main.c | 175 +- drivers/net/wireless/ath/ath9k/phy.h | 14 - drivers/net/wireless/ath/ath9k/recv.c | 2 +- drivers/net/wireless/ath/ath9k/reg.h | 1 + drivers/net/wireless/ath/ath9k/xmit.c | 29 +- drivers/net/wireless/ath/key.c | 32 + drivers/net/wireless/iwlwifi/Makefile | 2 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 16 +- drivers/net/wireless/iwlwifi/iwl-2000.c | 48 +- drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 29 +- drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 46 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 52 +- drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 6 +- drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-led.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-led.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 30 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 142 +- drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 122 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 529 +- drivers/net/wireless/iwlwifi/iwl-agn.h | 45 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 647 +- drivers/net/wireless/iwlwifi/iwl-core.c | 114 +- drivers/net/wireless/iwlwifi/iwl-core.h | 40 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 43 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 274 +- drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- drivers/net/wireless/iwlwifi/iwl-eeprom.c | 50 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 191 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 4 +- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 17 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +- drivers/net/wireless/iwlwifi/iwl-io.c | 274 + drivers/net/wireless/iwlwifi/iwl-io.h | 491 +- drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- drivers/net/wireless/iwlwifi/iwl-led.h | 2 +- drivers/net/wireless/iwlwifi/iwl-power.c | 2 +- drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 342 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 13 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 9 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 2 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 68 +- drivers/net/wireless/libertas/if_spi.c | 65 + drivers/net/wireless/mwifiex/11n.c | 809 ++ drivers/net/wireless/mwifiex/11n.h | 176 + drivers/net/wireless/mwifiex/11n_aggr.c | 423 + drivers/net/wireless/mwifiex/11n_aggr.h | 32 + drivers/net/wireless/mwifiex/11n_rxreorder.c | 637 + drivers/net/wireless/mwifiex/11n_rxreorder.h | 67 + drivers/net/wireless/mwifiex/Kconfig | 21 + drivers/net/wireless/mwifiex/Makefile | 41 + drivers/net/wireless/mwifiex/README | 204 + drivers/net/wireless/mwifiex/cfg80211.c | 1456 ++ drivers/net/wireless/mwifiex/cfg80211.h | 31 + drivers/net/wireless/mwifiex/cfp.c | 367 + drivers/net/wireless/mwifiex/cmdevt.c | 1459 ++ drivers/net/wireless/mwifiex/debugfs.c | 773 + drivers/net/wireless/mwifiex/decl.h | 153 + drivers/net/wireless/mwifiex/fw.h | 1229 ++ drivers/net/wireless/mwifiex/init.c | 662 + drivers/net/wireless/mwifiex/ioctl.h | 411 + drivers/net/wireless/mwifiex/join.c | 1462 ++ drivers/net/wireless/mwifiex/main.c | 1102 ++ drivers/net/wireless/mwifiex/main.h | 1058 ++ drivers/net/wireless/mwifiex/scan.c | 3097 +++++ drivers/net/wireless/mwifiex/sdio.c | 1770 +++ drivers/net/wireless/mwifiex/sdio.h | 305 + drivers/net/wireless/mwifiex/sta_cmd.c | 1226 ++ drivers/net/wireless/mwifiex/sta_cmdresp.c | 983 ++ drivers/net/wireless/mwifiex/sta_event.c | 405 + drivers/net/wireless/mwifiex/sta_ioctl.c | 2360 ++++ drivers/net/wireless/mwifiex/sta_rx.c | 182 + drivers/net/wireless/mwifiex/sta_tx.c | 202 + drivers/net/wireless/mwifiex/txrx.c | 202 + drivers/net/wireless/mwifiex/util.c | 252 + drivers/net/wireless/mwifiex/util.h | 32 + drivers/net/wireless/mwifiex/wmm.c | 1237 ++ drivers/net/wireless/mwifiex/wmm.h | 112 + drivers/net/wireless/mwl8k.c | 749 +- drivers/net/wireless/rt2x00/rt2400pci.c | 6 +- drivers/net/wireless/rt2x00/rt2500pci.c | 6 +- drivers/net/wireless/rt2x00/rt2500usb.c | 5 - drivers/net/wireless/rt2x00/rt2800.h | 106 + drivers/net/wireless/rt2x00/rt2800lib.c | 198 +- drivers/net/wireless/rt2x00/rt2800lib.h | 1 + drivers/net/wireless/rt2x00/rt2800pci.c | 19 +- drivers/net/wireless/rt2x00/rt2800usb.c | 3 +- drivers/net/wireless/rt2x00/rt2x00.h | 7 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 1 - drivers/net/wireless/rt2x00/rt2x00dev.c | 28 +- drivers/net/wireless/rt2x00/rt2x00ht.c | 7 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 23 +- drivers/net/wireless/rt2x00/rt2x00link.c | 49 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +- drivers/net/wireless/rt2x00/rt2x00pci.h | 5 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 1 + drivers/net/wireless/rt2x00/rt61pci.c | 6 +- drivers/net/wireless/rt2x00/rt73usb.c | 2 - drivers/net/wireless/rtlwifi/base.c | 5 +- drivers/net/wireless/rtlwifi/core.c | 8 +- drivers/net/wireless/rtlwifi/efuse.c | 106 +- drivers/net/wireless/rtlwifi/pci.c | 53 +- drivers/net/wireless/rtlwifi/pci.h | 4 +- drivers/net/wireless/rtlwifi/ps.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 38 +- drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 4 +- drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- drivers/net/wireless/rtlwifi/wifi.h | 18 +- drivers/net/wireless/wl1251/cmd.h | 4 +- drivers/net/wireless/wl1251/event.c | 6 +- drivers/net/wireless/wl1251/main.c | 22 +- drivers/net/wireless/wl1251/ps.c | 23 +- drivers/net/wireless/wl1251/ps.h | 2 +- drivers/net/wireless/wl1251/wl1251.h | 9 +- drivers/net/wireless/zd1211rw/zd_chip.c | 262 +- drivers/net/wireless/zd1211rw/zd_chip.h | 529 +- drivers/net/wireless/zd1211rw/zd_rf.h | 2 +- drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 198 +- drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 240 +- drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 78 +- drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 86 +- drivers/net/wireless/zd1211rw/zd_usb.c | 4 +- drivers/net/wireless/zd1211rw/zd_usb.h | 2 +- drivers/net/xen-netback/xenbus.c | 2 +- drivers/net/xen-netfront.c | 106 +- drivers/ssb/driver_pcicore.c | 104 +- drivers/ssb/scan.c | 2 +- firmware/Makefile | 6 +- firmware/WHENCE | 9 +- firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ------------- firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex | 9484 +++++++++++++ firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 ------------------ firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex |13192 ++++++++++++++++++ firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 -------------------- firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex |15473 +++++++++++++++++++++ include/linux/ath9k_platform.h | 5 + include/linux/ethtool.h | 269 +- include/linux/ieee80211.h | 9 + include/linux/if_vlan.h | 10 +- include/linux/netdevice.h | 6 +- include/linux/nl80211.h | 35 +- include/linux/pkt_sched.h | 15 + include/linux/ssb/ssb.h | 2 +- include/linux/usb/rndis_host.h | 2 + include/net/bluetooth/hci.h | 40 +- include/net/bluetooth/hci_core.h | 25 +- include/net/bluetooth/l2cap.h | 2 - include/net/bluetooth/mgmt.h | 47 + include/net/caif/caif_dev.h | 27 +- include/net/caif/cfctrl.h | 12 +- include/net/caif/cfmuxl.h | 2 - include/net/caif/cfpkt.h | 75 - include/net/caif/cfsrvl.h | 3 +- include/net/cfg80211.h | 43 + include/net/flow.h | 25 +- include/net/ip_fib.h | 6 +- include/net/route.h | 60 +- include/net/sock.h | 54 + include/net/xfrm.h | 9 + net/8021q/vlan.c | 16 +- net/8021q/vlan.h | 2 - net/8021q/vlan_core.c | 85 +- net/8021q/vlan_dev.c | 223 +- net/9p/client.c | 9 +- net/bluetooth/bnep/bnep.h | 148 +- net/bluetooth/bnep/core.c | 71 +- net/bluetooth/bnep/sock.c | 2 +- net/bluetooth/cmtp/capi.c | 6 +- net/bluetooth/cmtp/cmtp.h | 11 +- net/bluetooth/cmtp/core.c | 25 +- net/bluetooth/cmtp/sock.c | 2 +- net/bluetooth/hci_core.c | 79 +- net/bluetooth/hci_event.c | 95 +- net/bluetooth/hci_sysfs.c | 40 +- net/bluetooth/hidp/core.c | 90 +- net/bluetooth/hidp/hidp.h | 6 +- net/bluetooth/hidp/sock.c | 7 +- net/bluetooth/l2cap_core.c | 27 +- net/bluetooth/mgmt.c | 518 +- net/bridge/br.c | 1 + net/bridge/br_device.c | 41 + net/bridge/br_fdb.c | 311 +- net/bridge/br_if.c | 83 +- net/bridge/br_input.c | 5 +- net/bridge/br_ioctl.c | 40 +- net/bridge/br_netlink.c | 53 +- net/bridge/br_notify.c | 6 + net/bridge/br_private.h | 19 +- net/bridge/br_private_stp.h | 13 + net/bridge/br_stp.c | 48 + net/bridge/br_stp_if.c | 21 +- net/bridge/br_sysfs_br.c | 39 +- net/bridge/br_sysfs_if.c | 26 +- net/caif/caif_config_util.c | 6 +- net/caif/caif_dev.c | 45 +- net/caif/caif_socket.c | 35 +- net/caif/cfcnfg.c | 2 +- net/caif/cfctrl.c | 75 +- net/caif/cfdgml.c | 7 +- net/caif/cffrml.c | 8 +- net/caif/cfmuxl.c | 45 +- net/caif/cfpkt_skbuff.c | 178 +- net/caif/cfserl.c | 7 +- net/caif/cfsrvl.c | 7 +- net/caif/cfutill.c | 7 +- net/caif/cfveil.c | 5 +- net/caif/cfvidl.c | 5 +- net/can/af_can.c | 52 +- net/core/dev.c | 45 +- net/core/ethtool.c | 101 +- net/ipv4/fib_frontend.c | 16 +- net/ipv4/fib_trie.c | 103 +- net/ipv4/inet_connection_sock.c | 18 +- net/ipv4/ip_output.c | 18 +- net/ipv4/raw.c | 18 +- net/ipv4/route.c | 16 +- net/ipv4/syncookies.c | 18 +- net/ipv4/tcp.c | 7 +- net/ipv4/udp.c | 18 +- net/mac80211/Kconfig | 1 - net/mac80211/cfg.c | 13 +- net/mac80211/debugfs.c | 89 +- net/mac80211/ibss.c | 3 +- net/mac80211/ieee80211_i.h | 4 +- net/mac80211/main.c | 5 - net/mac80211/mlme.c | 9 - net/mac80211/rx.c | 2 + net/mac80211/sta_info.c | 15 +- net/mac80211/sta_info.h | 1 - net/mac80211/status.c | 11 +- net/mac80211/tkip.c | 4 +- net/mac80211/tkip.h | 4 +- net/mac80211/util.c | 2 +- net/mac80211/wep.c | 34 +- net/mac80211/wep.h | 4 +- net/sched/Kconfig | 11 + net/sched/Makefile | 1 + net/sched/sch_qfq.c | 1137 ++ net/socket.c | 14 +- net/wireless/mlme.c | 9 + net/wireless/nl80211.c | 55 +- net/wireless/nl80211.h | 3 + net/wireless/reg.c | 71 +- 426 files changed, 73752 insertions(+), 55532 deletions(-) delete mode 100644 drivers/isdn/capi/capifs.c delete mode 100644 drivers/isdn/capi/capifs.h create mode 100644 drivers/net/enic/enic_pp.c create mode 100644 drivers/net/enic/enic_pp.h delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h delete mode 100644 drivers/net/wireless/ath/ar9170/led.c delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c delete mode 100644 drivers/net/wireless/ath/ar9170/main.c delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c create mode 100644 drivers/net/wireless/mwifiex/11n.c create mode 100644 drivers/net/wireless/mwifiex/11n.h create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h create mode 100644 drivers/net/wireless/mwifiex/Kconfig create mode 100644 drivers/net/wireless/mwifiex/Makefile create mode 100644 drivers/net/wireless/mwifiex/README create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h create mode 100644 drivers/net/wireless/mwifiex/cfp.c create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c create mode 100644 drivers/net/wireless/mwifiex/debugfs.c create mode 100644 drivers/net/wireless/mwifiex/decl.h create mode 100644 drivers/net/wireless/mwifiex/fw.h create mode 100644 drivers/net/wireless/mwifiex/init.c create mode 100644 drivers/net/wireless/mwifiex/ioctl.h create mode 100644 drivers/net/wireless/mwifiex/join.c create mode 100644 drivers/net/wireless/mwifiex/main.c create mode 100644 drivers/net/wireless/mwifiex/main.h create mode 100644 drivers/net/wireless/mwifiex/scan.c create mode 100644 drivers/net/wireless/mwifiex/sdio.c create mode 100644 drivers/net/wireless/mwifiex/sdio.h create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c create mode 100644 drivers/net/wireless/mwifiex/sta_event.c create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c create mode 100644 drivers/net/wireless/mwifiex/txrx.c create mode 100644 drivers/net/wireless/mwifiex/util.c create mode 100644 drivers/net/wireless/mwifiex/util.h create mode 100644 drivers/net/wireless/mwifiex/wmm.c create mode 100644 drivers/net/wireless/mwifiex/wmm.h delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex create mode 100644 net/sched/sch_qfq.c Merging wireless/master $ git merge wireless/master Resolved 'drivers/net/wireless/iwlwifi/iwl-core.c' using previous resolution. Auto-merging drivers/net/wireless/ath/ath5k/base.c Auto-merging drivers/net/wireless/ath/ath5k/desc.c Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c Auto-merging drivers/net/wireless/ath/ath5k/pcu.c Auto-merging drivers/net/wireless/ath/ath9k/hif_usb.c Auto-merging drivers/net/wireless/ath/ath9k/htc_hst.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/wireless/ath/ath9k/main.c Auto-merging drivers/net/wireless/ath/ath9k/rc.c Auto-merging drivers/net/wireless/ath/ath9k/recv.c Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.c Auto-merging drivers/net/wireless/iwlwifi/iwl-fh.h Auto-merging drivers/net/wireless/rtlwifi/base.c Auto-merging drivers/net/wireless/rtlwifi/pci.c Auto-merging include/linux/nl80211.h Auto-merging include/net/mac80211.h Auto-merging net/mac80211/ieee80211_i.h Auto-merging net/mac80211/mesh_pathtbl.c Auto-merging net/mac80211/rx.c Auto-merging net/mac80211/sta_info.c Auto-merging net/mac80211/sta_info.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master d810090] Merge remote-tracking branch 'wireless/master' $ git diff -M --stat --summary HEAD^.. drivers/net/wireless/ath/ath5k/ath5k.h | 23 +- drivers/net/wireless/ath/ath5k/base.c | 69 ++- drivers/net/wireless/ath/ath5k/base.h | 4 + drivers/net/wireless/ath/ath5k/debug.c | 65 +-- drivers/net/wireless/ath/ath5k/debug.h | 17 - drivers/net/wireless/ath/ath5k/desc.c | 158 ++--- drivers/net/wireless/ath/ath5k/eeprom.c | 129 ++-- drivers/net/wireless/ath/ath5k/mac80211-ops.c | 9 + drivers/net/wireless/ath/ath5k/pcu.c | 35 +- drivers/net/wireless/ath/ath5k/qcu.c | 4 +- drivers/net/wireless/ath/ath9k/Kconfig | 21 +- drivers/net/wireless/ath/ath9k/Makefile | 6 +- drivers/net/wireless/ath/ath9k/ahb.c | 14 +- drivers/net/wireless/ath/ath9k/ar9002_phy.h | 6 + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 178 +++--- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 17 +- drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 10 +- drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- drivers/net/wireless/ath/ath9k/beacon.c | 1 + drivers/net/wireless/ath/ath9k/debug.c | 40 +- drivers/net/wireless/ath/ath9k/debug.h | 7 + drivers/net/wireless/ath/ath9k/eeprom.h | 6 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 26 + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 25 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 331 ++++++--- drivers/net/wireless/ath/ath9k/hif_usb.h | 7 +- drivers/net/wireless/ath/ath9k/htc.h | 208 ++++-- drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 318 +++++++- drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 531 +++++++++++++ drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 12 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 54 ++- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 322 ++------ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 790 ++++++++++++++++---- drivers/net/wireless/ath/ath9k/htc_hst.c | 50 +- drivers/net/wireless/ath/ath9k/htc_hst.h | 14 +- drivers/net/wireless/ath/ath9k/hw.c | 45 +- drivers/net/wireless/ath/ath9k/main.c | 19 + drivers/net/wireless/ath/ath9k/phy.h | 1 - drivers/net/wireless/ath/ath9k/rc.c | 3 +- drivers/net/wireless/ath/ath9k/recv.c | 6 +- drivers/net/wireless/ath/ath9k/reg.h | 35 +- drivers/net/wireless/ath/ath9k/wmi.c | 122 ++-- drivers/net/wireless/ath/ath9k/wmi.h | 80 ++- drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 - drivers/net/wireless/iwlwifi/iwl-1000.c | 13 +- drivers/net/wireless/iwlwifi/iwl-2000.c | 25 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 18 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 30 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 43 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 4 +- drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 134 ++--- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 39 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 - drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 13 + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 3 + drivers/net/wireless/iwlwifi/iwl-agn.c | 24 +- drivers/net/wireless/iwlwifi/iwl-agn.h | 3 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 64 -- drivers/net/wireless/iwlwifi/iwl-core.c | 47 +- drivers/net/wireless/iwlwifi/iwl-core.h | 28 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 50 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 44 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 38 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 13 + drivers/net/wireless/iwlwifi/iwl-led.c | 4 +- drivers/net/wireless/iwlwifi/iwl-power.c | 4 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 16 +- drivers/net/wireless/iwlwifi/iwl-rx.c | 319 +++++---- drivers/net/wireless/iwlwifi/iwl-tx.c | 1 - drivers/net/wireless/mwifiex/cmdevt.c | 2 + drivers/net/wireless/mwifiex/fw.h | 27 +- drivers/net/wireless/mwifiex/sta_cmd.c | 27 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 3 +- drivers/net/wireless/mwifiex/sta_ioctl.c | 3 +- drivers/net/wireless/mwl8k.c | 77 ++- drivers/net/wireless/rt2x00/rt2800usb.c | 35 +- drivers/net/wireless/rtlwifi/base.c | 12 +- drivers/net/wireless/rtlwifi/pci.c | 3 +- drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 14 +- drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 1 - drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 - include/linux/nl80211.h | 34 +- include/net/cfg80211.h | 33 +- include/net/mac80211.h | 4 + net/mac80211/cfg.c | 29 +- net/mac80211/debugfs_sta.c | 26 + net/mac80211/driver-ops.h | 13 + net/mac80211/driver-trace.h | 20 + net/mac80211/ieee80211_i.h | 5 +- net/mac80211/main.c | 9 +- net/mac80211/mesh.c | 14 +- net/mac80211/mesh.h | 3 +- net/mac80211/mesh_pathtbl.c | 49 +- net/mac80211/mesh_plink.c | 35 +- net/mac80211/mlme.c | 17 +- net/mac80211/rx.c | 23 +- net/mac80211/sta_info.c | 3 + net/mac80211/sta_info.h | 2 + net/mac80211/tx.c | 2 +- net/wireless/mesh.c | 23 +- net/wireless/nl80211.c | 67 ++- net/wireless/nl80211.h | 4 + 102 files changed, 3550 insertions(+), 1871 deletions(-) create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_debug.c Merging bluetooth/master $ git merge bluetooth/master Auto-merging net/bluetooth/l2cap_sock.c Merge made by recursive. drivers/bluetooth/Kconfig | 4 +- drivers/bluetooth/ath3k.c | 3 - drivers/bluetooth/btmrvl_sdio.c | 124 +++- drivers/bluetooth/btmrvl_sdio.h | 68 +- drivers/bluetooth/hci_ath.c | 7 +- drivers/bluetooth/hci_h4.c | 7 +- drivers/bluetooth/hci_ldisc.c | 6 +- include/net/bluetooth/l2cap.h | 130 ++-- net/bluetooth/hci_event.c | 4 + net/bluetooth/l2cap_core.c | 1344 +++++++++++++++++++++------------------ net/bluetooth/l2cap_sock.c | 72 +-- 11 files changed, 964 insertions(+), 805 deletions(-) Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Auto-merging drivers/crypto/Kconfig Merge made by recursive. .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++ arch/powerpc/boot/dts/p4080ds.dts | 86 +- drivers/crypto/Kconfig | 13 + drivers/crypto/Makefile | 2 + drivers/crypto/caam/Kconfig | 72 + drivers/crypto/caam/Makefile | 8 + drivers/crypto/caam/caamalg.c | 1164 ++++++++++++++ drivers/crypto/caam/compat.h | 35 + drivers/crypto/caam/ctrl.c | 270 ++++ drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ drivers/crypto/caam/desc_constr.h | 204 +++ drivers/crypto/caam/error.c | 248 +++ drivers/crypto/caam/error.h | 10 + drivers/crypto/caam/intern.h | 113 ++ drivers/crypto/caam/jr.c | 523 +++++++ drivers/crypto/caam/jr.h | 21 + drivers/crypto/caam/regs.h | 663 ++++++++ drivers/crypto/padlock-sha.c | 269 ++++- drivers/crypto/picoxcell_crypto.c | 64 +- drivers/crypto/s5p-sss.c | 701 +++++++++ 20 files changed, 6433 insertions(+), 35 deletions(-) create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt create mode 100644 drivers/crypto/caam/Kconfig create mode 100644 drivers/crypto/caam/Makefile create mode 100644 drivers/crypto/caam/caamalg.c create mode 100644 drivers/crypto/caam/compat.h create mode 100644 drivers/crypto/caam/ctrl.c create mode 100644 drivers/crypto/caam/desc.h create mode 100644 drivers/crypto/caam/desc_constr.h create mode 100644 drivers/crypto/caam/error.c create mode 100644 drivers/crypto/caam/error.h create mode 100644 drivers/crypto/caam/intern.h create mode 100644 drivers/crypto/caam/jr.c create mode 100644 drivers/crypto/caam/jr.h create mode 100644 drivers/crypto/caam/regs.h create mode 100644 drivers/crypto/s5p-sss.c Merging sound/for-next $ git merge sound/for-next Resolved 'sound/soc/codecs/wm8994.c' using previous resolution. Removing drivers/media/radio/radio-maestro.c Auto-merging include/sound/control.h Auto-merging sound/pci/asihpi/asihpi.c Auto-merging sound/pci/asihpi/hpi6000.c Auto-merging sound/pci/asihpi/hpi6205.c Auto-merging sound/pci/asihpi/hpi_internal.h Auto-merging sound/pci/asihpi/hpimsgx.c Auto-merging sound/pci/hda/hda_codec.c Auto-merging sound/pci/hda/patch_realtek.c Auto-merging sound/soc/codecs/sn95031.c Auto-merging sound/soc/codecs/wm8994.c CONFLICT (content): Merge conflict in sound/soc/codecs/wm8994.c Auto-merging sound/soc/imx/imx-ssi.c Auto-merging sound/soc/soc-jack.c Auto-merging sound/usb/6fire/firmware.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 62e7c34] Merge remote-tracking branch 'sound/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- drivers/media/radio/Kconfig | 15 - drivers/media/radio/Makefile | 1 - drivers/media/radio/radio-maestro.c | 452 ---------- include/linux/mfd/wm8994/pdata.h | 49 + include/sound/control.h | 1 + include/sound/soc.h | 14 +- include/sound/tea575x-tuner.h | 7 +- sound/core/control.c | 64 ++ sound/core/init.c | 2 +- sound/i2c/other/Makefile | 2 +- sound/i2c/other/tea575x-tuner.c | 52 +- sound/pci/Kconfig | 14 +- sound/pci/asihpi/asihpi.c | 328 +++---- sound/pci/asihpi/hpi6000.c | 39 +- sound/pci/asihpi/hpi6205.c | 97 +- sound/pci/asihpi/hpi_internal.h | 19 +- sound/pci/asihpi/hpicmn.c | 10 +- sound/pci/asihpi/hpicmn.h | 2 + sound/pci/asihpi/hpifunc.c | 27 - sound/pci/asihpi/hpimsgx.c | 31 +- sound/pci/asihpi/hpioctl.c | 63 +- sound/pci/emu10k1/emumixer.c | 6 + sound/pci/es1968.c | 125 +++ sound/pci/fm801.c | 1 - sound/pci/hda/hda_codec.c | 69 ++- sound/pci/hda/hda_codec.h | 2 + sound/pci/hda/patch_realtek.c | 250 +++--- sound/pci/hda/patch_via.c | 1240 +++++++++++++++----------- sound/soc/atmel/sam9g20_wm8731.c | 2 +- sound/soc/au1x/db1200.c | 2 +- sound/soc/blackfin/bf5xx-ac97-pcm.c | 13 +- sound/soc/blackfin/bf5xx-ac97.c | 166 ++--- sound/soc/blackfin/bf5xx-ad1836.c | 42 +- sound/soc/blackfin/bf5xx-ad193x.c | 56 +- sound/soc/blackfin/bf5xx-ad1980.c | 45 +- sound/soc/blackfin/bf5xx-ad73311.c | 42 +- sound/soc/blackfin/bf5xx-i2s-pcm.c | 23 +- sound/soc/blackfin/bf5xx-i2s.c | 172 ++-- sound/soc/blackfin/bf5xx-sport.c | 159 +++- sound/soc/blackfin/bf5xx-sport.h | 16 +- sound/soc/blackfin/bf5xx-ssm2602.c | 42 +- sound/soc/blackfin/bf5xx-tdm-pcm.c | 23 +- sound/soc/blackfin/bf5xx-tdm.c | 110 +-- sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/Makefile | 2 +- sound/soc/codecs/ad193x.c | 23 +- sound/soc/codecs/ad1980.c | 2 +- sound/soc/codecs/ad73311.c | 2 +- sound/soc/codecs/ak4535.c | 19 +- sound/soc/codecs/ak4671.c | 18 +- sound/soc/codecs/cx20442.c | 18 +- sound/soc/codecs/max98088.c | 25 +- sound/soc/codecs/sn95031.c | 17 +- sound/soc/codecs/ssm2602.c | 140 +-- sound/soc/codecs/tlv320aic23.c | 19 +- sound/soc/codecs/wm8711.c | 18 +- sound/soc/codecs/wm8728.c | 18 +- sound/soc/codecs/wm8731.c | 22 +- sound/soc/codecs/wm8903.c | 18 +- sound/soc/codecs/wm8958-dsp2.c | 1028 +++++++++++++++++++++ sound/soc/codecs/wm8994.c | 364 ++------- sound/soc/codecs/wm8994.h | 97 ++ sound/soc/codecs/wm9705.c | 18 +- sound/soc/codecs/wm9712.c | 18 +- sound/soc/codecs/wm9713.c | 19 +- sound/soc/imx/imx-ssi.c | 6 - sound/soc/pxa/corgi.c | 2 +- sound/soc/pxa/poodle.c | 2 +- sound/soc/pxa/spitz.c | 41 +- sound/soc/soc-cache.c | 572 ++++-------- sound/soc/soc-core.c | 46 + sound/soc/soc-dapm.c | 48 + sound/soc/soc-jack.c | 2 +- sound/usb/6fire/control.c | 105 +++ sound/usb/6fire/control.h | 17 + sound/usb/6fire/firmware.c | 44 +- sound/usb/6fire/pcm.c | 97 +-- sound/usb/Kconfig | 9 +- 79 files changed, 3753 insertions(+), 3042 deletions(-) delete mode 100644 drivers/media/radio/radio-maestro.c create mode 100644 sound/soc/codecs/wm8958-dsp2.c Merging sound-asoc/for-next $ git merge sound-asoc/for-next Auto-merging MAINTAINERS Auto-merging drivers/staging/intel_sst/intel_sst_drv_interface.c Auto-merging drivers/staging/intel_sst/intelmid.c Auto-merging sound/soc/codecs/sn95031.c Auto-merging sound/soc/mid-x86/sst_platform.c Merge made by recursive. MAINTAINERS | 2 +- arch/arm/mach-s3c2440/mach-gta02.c | 5 + .../staging/intel_sst/intel_sst_drv_interface.c | 1 - drivers/staging/intel_sst/intelmid.c | 4 + include/sound/max98095.h | 26 + include/sound/soc.h | 11 +- include/sound/wm8915.h | 55 + sound/soc/codecs/Kconfig | 14 +- sound/soc/codecs/Makefile | 6 + sound/soc/codecs/jz4740.c | 20 +- sound/soc/codecs/max98095.c | 2009 +++++++++++ sound/soc/codecs/max98095.h | 284 ++ sound/soc/codecs/sn95031.c | 2 +- sound/soc/codecs/ssm2602.c | 56 +- sound/soc/codecs/wm1250-ev1.c | 108 + sound/soc/codecs/wm8903.c | 38 +- sound/soc/codecs/wm8915.c | 2924 +++++++++++++++ sound/soc/codecs/wm8915.h | 3717 ++++++++++++++++++++ sound/soc/codecs/wm8994.c | 16 + sound/soc/codecs/wm_hubs.c | 8 +- sound/soc/jz4740/qi_lb60.c | 46 +- sound/soc/mid-x86/sst_platform.c | 14 +- sound/soc/samsung/Kconfig | 15 + sound/soc/samsung/Makefile | 4 + sound/soc/samsung/pcm.c | 4 +- sound/soc/samsung/smdk_wm8580pcm.c | 206 ++ sound/soc/samsung/speyside.c | 333 ++ sound/soc/sh/fsi.c | 21 +- sound/soc/soc-core.c | 39 +- sound/soc/soc-dapm.c | 133 +- sound/soc/tegra/harmony.c | 1 + 31 files changed, 9929 insertions(+), 193 deletions(-) create mode 100644 include/sound/max98095.h create mode 100644 include/sound/wm8915.h create mode 100644 sound/soc/codecs/max98095.c create mode 100644 sound/soc/codecs/max98095.h create mode 100644 sound/soc/codecs/wm1250-ev1.c create mode 100644 sound/soc/codecs/wm8915.c create mode 100644 sound/soc/codecs/wm8915.h create mode 100644 sound/soc/samsung/smdk_wm8580pcm.c create mode 100644 sound/soc/samsung/speyside.c Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merging kernel/module.c Auto-merging kernel/params.c Merge made by recursive. drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++----- drivers/char/virtio_console.c | 16 ------- drivers/virtio/virtio_pci.c | 15 ++++--- drivers/virtio/virtio_ring.c | 1 + include/linux/module.h | 28 +++++++------ include/linux/moduleparam.h | 7 ++- kernel/module.c | 4 +- kernel/params.c | 9 +++- 8 files changed, 114 insertions(+), 54 deletions(-) Merging input/next $ git merge input/next Auto-merging drivers/input/touchscreen/Kconfig Merge made by recursive. drivers/input/keyboard/gpio_keys.c | 11 +- drivers/input/touchscreen/Kconfig | 12 ++ drivers/input/touchscreen/Makefile | 1 + drivers/input/touchscreen/atmel_mxt_ts.c | 92 +++++++---- drivers/input/touchscreen/max11801_ts.c | 272 ++++++++++++++++++++++++++++++ include/linux/gpio_keys.h | 8 +- 6 files changed, 360 insertions(+), 36 deletions(-) create mode 100644 drivers/input/touchscreen/max11801_ts.c Merging input-mt/next $ git merge input-mt/next Already up-to-date. Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Merge made by recursive. block/blk-core.c | 47 ++++++++++++++++++++++++++++++++++------- block/blk-settings.c | 16 ++++++++++++++ include/linux/blkdev.h | 3 ++ include/trace/events/block.h | 25 +++++----------------- kernel/trace/blktrace.c | 23 ++----------------- 5 files changed, 67 insertions(+), 47 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 Already up-to-date. Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Resolved 'drivers/leds/Kconfig' using previous resolution. Auto-merging drivers/leds/Kconfig CONFLICT (content): Merge conflict in drivers/leds/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 85def48] Merge remote-tracking branch 'leds/for-mm' $ git diff -M --stat --summary HEAD^.. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging mmc/mmc-next $ git merge mmc/mmc-next Auto-merging drivers/mmc/core/mmc.c Auto-merging drivers/mmc/core/mmc_ops.c Merge made by recursive. Documentation/mmc/00-INDEX | 2 + Documentation/mmc/mmc-dev-attrs.txt | 10 + Documentation/mmc/mmc-dev-parts.txt | 27 ++ arch/arm/mach-tegra/include/mach/sdhci.h | 1 + drivers/mmc/card/block.c | 433 ++++++++++++++++++++++++++---- drivers/mmc/card/queue.c | 8 - drivers/mmc/core/bus.c | 1 + drivers/mmc/core/core.c | 43 ++-- drivers/mmc/core/core.h | 2 - drivers/mmc/core/host.c | 4 +- drivers/mmc/core/mmc.c | 39 +++- drivers/mmc/core/mmc_ops.c | 16 +- drivers/mmc/core/mmc_ops.h | 1 - drivers/mmc/core/quirks.c | 89 +++---- drivers/mmc/core/sd_ops.c | 4 + drivers/mmc/core/sdio.c | 20 +- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/omap.c | 2 +- drivers/mmc/host/sdhci-pci.c | 45 ++-- drivers/mmc/host/sdhci-tegra.c | 2 + drivers/mmc/host/sdhci.c | 72 ++++-- drivers/mmc/host/sdhci.h | 6 + include/linux/mmc/card.h | 109 ++++++++- include/linux/mmc/core.h | 3 +- include/linux/mmc/host.h | 6 +- include/linux/mmc/mmc.h | 11 + 26 files changed, 760 insertions(+), 198 deletions(-) create mode 100644 Documentation/mmc/mmc-dev-parts.txt Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Already up-to-date. Merging slab/for-next $ git merge slab/for-next Auto-merging mm/slub.c Merge made by recursive. mm/slub.c | 2 +- 1 files changed, 1 insertions(+), 1 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/mfd-core.c' using previous resolution. Resolved 'include/linux/mfd/core.h' using previous resolution. Auto-merging drivers/mfd/mfd-core.c CONFLICT (content): Merge conflict in drivers/mfd/mfd-core.c Auto-merging include/linux/mfd/core.h CONFLICT (content): Merge conflict in include/linux/mfd/core.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master c876f16] Merge remote-tracking branch 'mfd/for-next' $ git diff -M --stat --summary HEAD^.. drivers/dma/timb_dma.c | 3 +- drivers/gpio/janz-ttl.c | 3 +- drivers/gpio/rdc321x-gpio.c | 3 +- drivers/gpio/timbgpio.c | 6 +- drivers/i2c/busses/i2c-ocores.c | 3 +- drivers/i2c/busses/i2c-xiic.c | 3 +- drivers/input/misc/twl4030-vibra.c | 3 +- drivers/leds/leds-88pm860x.c | 7 +-- drivers/leds/leds-mc13783.c | 7 +-- drivers/media/radio/radio-timb.c | 3 +- drivers/media/radio/radio-wl1273.c | 2 +- drivers/media/video/timblogiw.c | 3 +- drivers/mfd/88pm860x-core.c | 18 +++++-- drivers/mfd/ab3100-core.c | 6 ++- drivers/mfd/ab3550-core.c | 6 ++- drivers/mfd/asic3.c | 6 ++- drivers/mfd/davinci_voicecodec.c | 6 ++- drivers/mfd/htc-pasic3.c | 5 ++- drivers/mfd/janz-cmodio.c | 3 +- drivers/mfd/mc13xxx-core.c | 12 +++-- drivers/mfd/mfd-core.c | 7 +++ drivers/mfd/omap-usb-host.c | 8 +-- drivers/mfd/rdc321x-southbridge.c | 6 ++- drivers/mfd/t7l66xb.c | 6 ++- drivers/mfd/tc6387xb.c | 3 +- drivers/mfd/tc6393xb.c | 10 +++- drivers/mfd/timberdale.c | 81 +++++++++++++++++++++----------- drivers/mfd/tps6105x.c | 3 +- drivers/mfd/twl4030-codec.c | 6 ++- drivers/mfd/wl1273-core.c | 7 ++- drivers/mfd/wm831x-core.c | 13 +++++- drivers/mfd/wm831x-irq.c | 27 ++++++----- drivers/mfd/wm8400-core.c | 3 +- drivers/mmc/host/tmio_mmc.c | 2 +- drivers/mtd/nand/tmio_nand.c | 2 +- drivers/net/can/janz-ican3.c | 3 +- drivers/net/ks8842.c | 3 +- drivers/regulator/88pm8607.c | 7 +-- drivers/regulator/ab3100.c | 3 +- drivers/regulator/mc13783-regulator.c | 7 ++- drivers/regulator/mc13892-regulator.c | 7 ++- drivers/regulator/tps6105x-regulator.c | 4 +- drivers/spi/xilinx_spi.c | 3 +- drivers/video/backlight/88pm860x_bl.c | 7 +-- drivers/video/tmiofb.c | 12 ++--- drivers/w1/masters/ds1wm.c | 12 ++++- drivers/watchdog/rdc321x_wdt.c | 3 +- include/linux/mfd/abx500.h | 1 + include/linux/mfd/core.h | 23 +-------- include/linux/mfd/wm831x/core.h | 26 ---------- include/linux/mfd/wm831x/pdata.h | 4 ++ sound/soc/codecs/cq93vc.c | 3 +- sound/soc/codecs/twl4030.c | 6 +-- sound/soc/codecs/wl1273.c | 3 +- sound/soc/codecs/wm8400.c | 2 +- sound/soc/davinci/davinci-vcif.c | 2 +- 56 files changed, 224 insertions(+), 209 deletions(-) Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Already up-to-date. Merging fbdev/master $ git merge fbdev/master Already up-to-date. Merging viafb/viafb-next $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Merge made by recursive. arch/arm/mach-omap2/board-4430sdp.c | 132 ++++++++++++++++-- drivers/video/omap2/dss/dsi.c | 240 +++++++++++++++++++++----------- drivers/video/omap2/dss/dss.c | 51 ++++++- drivers/video/omap2/dss/dss_features.c | 9 +- drivers/video/omap2/dss/dss_features.h | 30 +++-- 5 files changed, 346 insertions(+), 116 deletions(-) Merging voltage/for-next $ git merge voltage/for-next Auto-merging drivers/regulator/core.c Auto-merging drivers/regulator/tps6105x-regulator.c Merge made by recursive. drivers/regulator/core.c | 24 +++-- drivers/regulator/tps6105x-regulator.c | 1 + drivers/regulator/twl-regulator.c | 209 ++++++++++++++++++++++++-------- 3 files changed, 175 insertions(+), 59 deletions(-) Merging security-testing/next $ git merge security-testing/next Merge made by recursive. include/linux/capability.h | 7 +-- include/linux/init_task.h | 7 --- include/linux/key.h | 13 +++++ include/linux/kmod.h | 3 + kernel/capability.c | 4 -- kernel/cred.c | 6 +- kernel/kmod.c | 100 ++++++++++++++++++++++++++++++++++++++ kernel/sysctl.c | 6 ++ net/dns_resolver/dns_key.c | 10 ++-- security/Kconfig | 1 + security/commoncap.c | 13 ++--- security/keys/internal.h | 4 +- security/keys/keyctl.c | 6 ++ security/keys/keyring.c | 37 +++++++++----- security/keys/proc.c | 2 +- security/keys/process_keys.c | 12 +++-- security/keys/request_key.c | 3 +- security/keys/request_key_auth.c | 3 +- security/keys/user_defined.c | 4 +- security/tomoyo/memory.c | 1 + 20 files changed, 185 insertions(+), 57 deletions(-) Merging selinux/master $ git merge selinux/master Auto-merging MAINTAINERS Auto-merging security/selinux/ss/services.c Merge made by recursive. MAINTAINERS | 3 +- security/selinux/include/security.h | 7 +++-- security/selinux/selinuxfs.c | 16 +++++++++++++- security/selinux/ss/policydb.c | 35 ++++++++++++++++++++++++++------ security/selinux/ss/policydb.h | 3 +- security/selinux/ss/services.c | 37 +++++++++++++++++------------------ 6 files changed, 68 insertions(+), 33 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Merge made by recursive. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Auto-merging drivers/pci/intel-iommu.c Merge made by recursive. drivers/pci/intel-iommu.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) Merging cputime/cputime $ git merge cputime/cputime Already up-to-date. Merging osd/linux-next $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next $ git merge jc_docs/docs-next Already up-to-date. Merging nommu/master $ git merge nommu/master Already up-to-date. Merging trivial/for-next $ git merge trivial/for-next Auto-merging CREDITS Auto-merging MAINTAINERS Auto-merging arch/arm/mach-at91/at91cap9_devices.c Auto-merging arch/mips/sgi-ip22/ip22-int.c Auto-merging drivers/gpu/drm/radeon/radeon_fence.c Auto-merging drivers/gpu/drm/radeon/radeon_ring.c Auto-merging drivers/net/can/softing/softing_main.c Auto-merging drivers/net/sgiseeq.c Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c Auto-merging drivers/net/wireless/rtlwifi/core.c Auto-merging drivers/net/wireless/rtlwifi/pci.c Auto-merging drivers/scsi/lpfc/lpfc_bsg.c Auto-merging drivers/scsi/qla2xxx/qla_isr.c Auto-merging drivers/target/target_core_alua.c Auto-merging drivers/target/target_core_transport.c Auto-merging drivers/tty/serial/mrst_max3110.c Auto-merging drivers/tty/tty_ioctl.c Auto-merging fs/logfs/readwrite.c Auto-merging fs/ocfs2/refcounttree.c Auto-merging fs/ufs/inode.c Auto-merging include/video/newport.h Auto-merging lib/Kconfig.debug Auto-merging lib/vsprintf.c Auto-merging mm/hugetlb.c Auto-merging mm/page_alloc.c Auto-merging net/netfilter/ipset/ip_set_bitmap_ip.c Auto-merging security/selinux/selinuxfs.c Merge made by recursive. CREDITS | 2 +- Documentation/stable_api_nonsense.txt | 2 +- Documentation/sysctl/vm.txt | 4 ++-- MAINTAINERS | 3 ++- arch/Kconfig | 3 --- arch/arm/mach-at91/at91cap9_devices.c | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- arch/arm/mach-tegra/tegra2_clocks.c | 2 +- arch/arm/mach-u300/gpio.c | 7 +++---- arch/arm/mach-ux500/mbox-db5500.c | 6 ++---- arch/arm/plat-iop/time.c | 1 - arch/m68k/include/asm/MC68EZ328.h | 2 +- arch/m68k/include/asm/MC68VZ328.h | 2 +- arch/mips/fw/arc/cmdline.c | 2 +- arch/mips/fw/arc/env.c | 2 +- arch/mips/fw/arc/identify.c | 2 +- arch/mips/fw/arc/init.c | 2 +- arch/mips/fw/arc/misc.c | 2 +- arch/mips/fw/arc/salone.c | 2 +- arch/mips/fw/arc/time.c | 2 +- arch/mips/fw/arc/tree.c | 2 +- arch/mips/include/asm/asmmacro-32.h | 2 +- arch/mips/include/asm/asmmacro-64.h | 2 +- arch/mips/include/asm/cpu.h | 2 +- arch/mips/include/asm/r4kcache.h | 2 +- arch/mips/include/asm/sgialib.h | 2 +- arch/mips/include/asm/sgiarcs.h | 2 +- arch/mips/kernel/octeon_switch.S | 2 +- arch/mips/kernel/r2300_fpu.S | 2 +- arch/mips/kernel/r2300_switch.S | 2 +- arch/mips/kernel/r4k_fpu.S | 2 +- arch/mips/kernel/r4k_switch.S | 2 +- arch/mips/kernel/r6000_fpu.S | 2 +- arch/mips/mm/c-r3k.c | 2 +- arch/mips/mm/c-r4k.c | 2 +- arch/mips/mm/c-tx39.c | 2 +- arch/mips/mm/sc-ip22.c | 2 +- arch/mips/mm/sc-r5k.c | 2 +- arch/mips/mm/tlb-r3k.c | 2 +- arch/mips/mm/tlb-r4k.c | 2 +- arch/mips/mm/tlb-r8k.c | 2 +- arch/mips/rb532/gpio.c | 2 +- arch/mips/sgi-ip22/ip22-hpc.c | 2 +- arch/mips/sgi-ip22/ip22-int.c | 2 +- arch/mips/sgi-ip22/ip22-mc.c | 2 +- arch/mips/sgi-ip22/ip22-setup.c | 2 +- arch/s390/hypfs/hypfs.h | 2 +- arch/um/drivers/mmapper_kern.c | 2 +- arch/xtensa/configs/s6105_defconfig | 1 - drivers/base/memory.c | 9 ++++----- drivers/gpio/langwell_gpio.c | 2 +- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/ttm/ttm_object.c | 2 +- drivers/leds/leds-mc13783.c | 2 +- drivers/misc/cs5535-mfgpt.c | 4 ++-- drivers/misc/ibmasm/ibmasmfs.c | 2 +- drivers/net/can/softing/softing_main.c | 2 +- drivers/net/sgiseeq.c | 2 +- drivers/net/sgiseeq.h | 2 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- drivers/net/wireless/rtlwifi/core.c | 2 +- drivers/net/wireless/rtlwifi/pci.c | 2 +- drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 ++-- drivers/power/intel_mid_battery.c | 2 +- drivers/scsi/be2iscsi/be_main.c | 4 ++-- drivers/scsi/lpfc/lpfc_bsg.c | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- drivers/scsi/sgiwd93.c | 2 +- drivers/target/target_core_alua.c | 4 ++-- drivers/target/target_core_transport.c | 2 +- drivers/tty/serial/mrst_max3110.c | 2 +- drivers/tty/tty_ioctl.c | 2 +- drivers/video/console/newport_con.c | 2 +- drivers/video/msm/mddi.c | 2 +- drivers/video/mxsfb.c | 2 +- drivers/watchdog/bcm63xx_wdt.c | 2 +- drivers/xen/evtchn.c | 2 +- drivers/xen/swiotlb-xen.c | 2 +- fs/logfs/readwrite.c | 2 +- fs/ocfs2/refcounttree.c | 2 +- fs/partitions/ldm.c | 2 +- fs/ufs/inode.c | 2 +- include/linux/leds-regulator.h | 2 +- include/video/newport.h | 2 +- kernel/Kconfig.locks | 2 +- kernel/pm_qos_params.c | 2 +- lib/Kconfig.debug | 3 ++- lib/vsprintf.c | 9 +++------ mm/hugetlb.c | 2 +- mm/page_alloc.c | 2 +- net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +- net/sunrpc/addr.c | 2 +- security/selinux/selinuxfs.c | 8 ++++---- tools/power/x86/turbostat/turbostat.c | 2 +- 97 files changed, 113 insertions(+), 123 deletions(-) Merging audit/for-next $ git merge audit/for-next Already up-to-date. Merging suspend/linux-next $ git merge suspend/linux-next Already up-to-date. Merging fsnotify/for-next $ git merge fsnotify/for-next Auto-merging fs/cachefiles/namei.c Auto-merging fs/nfsd/vfs.c Auto-merging fs/notify/fanotify/fanotify_user.c Auto-merging fs/notify/mark.c Auto-merging include/linux/fsnotify_backend.h Merge made by recursive. fs/cachefiles/namei.c | 1 - fs/cachefiles/xattr.c | 1 - fs/nfsd/vfs.c | 3 - fs/notify/dnotify/dnotify.c | 15 +++--- fs/notify/fanotify/fanotify.c | 24 +++++---- fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- fs/notify/group.c | 1 + fs/notify/mark.c | 36 +++++-------- include/linux/fanotify.h | 5 ++- include/linux/fsnotify_backend.h | 14 ++++- 10 files changed, 121 insertions(+), 80 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Auto-merging drivers/edac/i7core_edac.c Merge made by recursive. drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) Merging i7300_edac/linux_next $ git merge i7300_edac/linux_next Already up-to-date! Merge made by recursive. Merging devicetree/devicetree/next $ git merge devicetree/devicetree/next Already up-to-date. Merging spi/spi/next $ git merge spi/spi/next Auto-merging drivers/spi/dw_spi.c Auto-merging drivers/spi/dw_spi.h Merge made by recursive. drivers/spi/dw_spi.c | 202 ++++++++++++++++--------------------------------- drivers/spi/dw_spi.h | 2 - 2 files changed, 66 insertions(+), 138 deletions(-) Merging tip/auto-latest $ git merge tip/auto-latest Recorded preimage for 'kernel/sched.c' Resolved 'arch/x86/kernel/process.c' using previous resolution. Auto-merging arch/blackfin/kernel/time-ts.c Auto-merging arch/blackfin/mach-common/smp.c Auto-merging arch/mips/sgi-ip27/ip27-timer.c Auto-merging arch/x86/Kconfig Auto-merging arch/x86/kernel/probe_roms.c Auto-merging arch/x86/kernel/process.c CONFLICT (content): Merge conflict in arch/x86/kernel/process.c Auto-merging arch/x86/kernel/smpboot.c Auto-merging kernel/sched.c CONFLICT (content): Merge conflict in kernel/sched.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'kernel/sched.c'. [master 7dc5640] Merge remote-tracking branch 'tip/auto-latest' $ git diff -M --stat --summary HEAD^.. arch/alpha/kernel/smp.c | 3 +- arch/alpha/kernel/time.c | 3 +- arch/arm/kernel/smp.c | 5 +- arch/blackfin/kernel/time-ts.c | 35 +- arch/blackfin/mach-common/smp.c | 3 + arch/cris/arch-v32/kernel/smp.c | 13 +- arch/ia64/kernel/cyclone.c | 6 +- arch/ia64/kernel/irq_ia64.c | 2 + arch/ia64/kernel/time.c | 9 +- arch/ia64/sn/kernel/sn2/timer.c | 6 +- arch/ia64/xen/irq_xen.c | 10 +- arch/m32r/kernel/smp.c | 4 +- arch/microblaze/kernel/timer.c | 6 +- arch/mips/alchemy/common/time.c | 3 +- arch/mips/cavium-octeon/csrc-octeon.c | 3 +- arch/mips/cavium-octeon/smp.c | 2 + arch/mips/include/asm/time.h | 6 - arch/mips/jz4740/time.c | 3 +- arch/mips/kernel/cevt-txx9.c | 3 +- arch/mips/kernel/csrc-bcm1480.c | 3 +- arch/mips/kernel/csrc-ioasic.c | 4 +- arch/mips/kernel/csrc-powertv.c | 35 +- arch/mips/kernel/csrc-r4k.c | 4 +- arch/mips/kernel/csrc-sb1250.c | 3 +- arch/mips/kernel/i8253.c | 5 +- arch/mips/kernel/smtc.c | 2 +- arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 5 +- arch/mips/mti-malta/malta-int.c | 2 + arch/mips/pmc-sierra/yosemite/smp.c | 4 + arch/mips/sgi-ip27/ip27-irq.c | 2 + arch/mips/sgi-ip27/ip27-timer.c | 3 +- arch/mips/sibyte/bcm1480/smp.c | 7 +- arch/mips/sibyte/sb1250/smp.c | 7 +- arch/mn10300/kernel/smp.c | 5 +- arch/parisc/kernel/smp.c | 5 +- arch/powerpc/kernel/smp.c | 4 +- arch/s390/kernel/smp.c | 6 +- arch/sh/kernel/smp.c | 2 + arch/sparc/include/asm/topology_64.h | 6 +- arch/sparc/kernel/smp_32.c | 4 +- arch/sparc/kernel/smp_64.c | 1 + arch/tile/kernel/smp.c | 6 +- arch/um/kernel/smp.c | 2 +- arch/x86/Kconfig | 43 +- arch/x86/Kconfig.cpu | 16 +- arch/x86/Makefile_32.cpu | 2 +- arch/x86/include/asm/cpufeature.h | 13 +- arch/x86/include/asm/mach_traps.h | 18 +- arch/x86/include/asm/mmzone_64.h | 23 - arch/x86/include/asm/module.h | 2 +- arch/x86/include/asm/olpc_ofw.h | 9 +- arch/x86/include/asm/percpu.h | 27 + arch/x86/include/asm/probe_roms.h | 8 + arch/x86/include/asm/setup.h | 2 +- arch/x86/include/asm/topology.h | 1 - arch/x86/kernel/Makefile | 2 +- arch/x86/kernel/apb_timer.c | 10 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/numaq_32.c | 4 - arch/x86/kernel/cpu/cpufreq/Kconfig | 4 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 7 +- arch/x86/kernel/cpu/perf_event_p4.c | 2 +- arch/x86/kernel/head32.c | 1 - arch/x86/kernel/i8253.c | 6 +- arch/x86/kernel/kvmclock.c | 6 +- arch/x86/kernel/mpparse.c | 6 +- arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 ++ arch/x86/kernel/reboot.c | 24 +- arch/x86/kernel/smp.c | 5 +- arch/x86/kernel/smpboot.c | 4 +- arch/x86/kernel/x86_init.c | 2 +- arch/x86/lguest/boot.c | 4 +- arch/x86/mm/numa_32.c | 268 ++-- arch/x86/mm/numa_64.c | 131 +-- arch/x86/mm/srat_32.c | 1 - arch/x86/platform/ce4100/falconfalls.dts | 2 + arch/x86/platform/mrst/mrst.c | 10 +- arch/x86/platform/olpc/Makefile | 4 +- arch/x86/platform/olpc/olpc.c | 51 +- arch/x86/platform/olpc/olpc_dt.c | 19 + arch/x86/platform/uv/uv_time.c | 6 +- arch/x86/xen/smp.c | 5 +- arch/x86/xen/time.c | 6 +- drivers/acpi/processor_throttling.c | 32 +- drivers/char/hpet.c | 6 +- drivers/clocksource/cyclone.c | 10 +- drivers/rtc/class.c | 2 +- drivers/rtc/interface.c | 26 + drivers/rtc/rtc-bfin.c | 2 + drivers/rtc/rtc-s3c.c | 2 - include/linux/clocksource.h | 2 +- include/linux/mutex.h | 2 +- include/linux/rtc.h | 2 + include/linux/sched.h | 49 +- init/Kconfig | 5 + kernel/cpuset.c | 2 +- kernel/mutex-debug.c | 2 +- kernel/mutex-debug.h | 2 +- kernel/mutex.c | 2 +- kernel/mutex.h | 2 +- kernel/perf_event.c | 12 + kernel/sched.c | 1585 ++++++++------------- kernel/sched_debug.c | 2 +- kernel/sched_fair.c | 74 +- kernel/sched_features.h | 6 + kernel/sched_idletask.c | 2 +- kernel/sched_rt.c | 54 +- kernel/sched_stoptask.c | 5 +- tools/perf/Documentation/perf-script.txt | 52 +- tools/perf/builtin-script.c | 171 ++- tools/perf/util/cgroup.c | 2 +- tools/perf/util/probe-finder.c | 72 + tools/perf/util/probe-finder.h | 2 + 113 files changed, 1545 insertions(+), 1753 deletions(-) create mode 100644 arch/x86/include/asm/probe_roms.h rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%) $ git am -3 ../patches/0001-x86-idle-merge-fix-for-mwait-move.patch Applying: x86 idle: merge fix for mwait move $ git reset HEAD^ Unstaged changes after reset: M arch/x86/kernel/acpi/cstate.c $ git add . $ git commit -v -a --amend [master 67ea882] Merge remote-tracking branch 'tip/auto-latest' Merging rcu/rcu/next $ git merge rcu/rcu/next Auto-merging lib/Kconfig.debug Merge made by recursive. Documentation/RCU/00-INDEX | 2 +- Documentation/RCU/stallwarn.txt | 23 +- Documentation/RCU/trace.txt | 77 +++--- Documentation/filesystems/proc.txt | 1 - include/linux/interrupt.h | 1 - include/trace/events/irq.h | 3 +- kernel/rcutree.c | 489 +++++++++++++++++++++++++++-------- kernel/rcutree.h | 50 ++-- kernel/rcutree_plugin.h | 186 ++++++++------ kernel/rcutree_trace.c | 23 +- kernel/softirq.c | 2 +- lib/Kconfig.debug | 30 +-- tools/perf/util/trace-event-parse.c | 1 - 13 files changed, 576 insertions(+), 312 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Auto-merging arch/s390/oprofile/init.c Merge made by recursive. arch/alpha/oprofile/common.c | 5 +---- arch/avr32/oprofile/op_model_avr32.c | 5 +---- arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- arch/ia64/oprofile/init.c | 2 +- arch/m32r/oprofile/init.c | 4 +--- arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- arch/mips/oprofile/common.c | 2 +- arch/mn10300/oprofile/op_model_null.c | 5 +---- arch/parisc/oprofile/init.c | 4 +--- arch/powerpc/oprofile/common.c | 4 +--- arch/s390/oprofile/init.c | 2 +- arch/sparc/oprofile/init.c | 4 +--- arch/x86/oprofile/init.c | 2 +- 13 files changed, 13 insertions(+), 34 deletions(-) Merging ptrace/ptrace $ git merge ptrace/ptrace Auto-merging include/linux/sched.h Auto-merging include/linux/tracehook.h Auto-merging kernel/exit.c Auto-merging kernel/ptrace.c Auto-merging kernel/signal.c Merge made by recursive. fs/exec.c | 1 + include/linux/sched.h | 17 ++- include/linux/tracehook.h | 27 ---- kernel/exit.c | 84 ++++++++-- kernel/ptrace.c | 118 ++++++++++----- kernel/signal.c | 375 +++++++++++++++++++++++++++++++++------------ 6 files changed, 442 insertions(+), 180 deletions(-) Merging xen-two/linux-next $ git merge xen-two/linux-next Auto-merging arch/x86/kernel/x86_init.c Auto-merging arch/x86/xen/setup.c Merge made by recursive. arch/x86/include/asm/pgtable_types.h | 1 + arch/x86/include/asm/x86_init.h | 9 +++++++++ arch/x86/kernel/x86_init.c | 4 ++++ arch/x86/mm/init.c | 9 +++++++-- arch/x86/xen/mmu.c | 17 ++++++++++++++++- arch/x86/xen/setup.c | 2 +- 6 files changed, 38 insertions(+), 4 deletions(-) Merging xen-pvhvm/linux-next $ git merge xen-pvhvm/linux-next Already up-to-date. Merging edac-amd/for-next $ git merge edac-amd/for-next Already up-to-date. Merging percpu/for-next $ git merge percpu/for-next Auto-merging arch/mips/kernel/vmlinux.lds.S Auto-merging arch/x86/include/asm/percpu.h Auto-merging include/asm-generic/vmlinux.lds.h Auto-merging kernel/workqueue.c Auto-merging mm/percpu.c Merge made by recursive. arch/alpha/kernel/vmlinux.lds.S | 2 +- arch/arm/kernel/vmlinux.lds.S | 2 +- arch/blackfin/kernel/vmlinux.lds.S | 2 +- arch/cris/kernel/vmlinux.lds.S | 2 +- arch/frv/kernel/vmlinux.lds.S | 2 +- arch/m32r/kernel/vmlinux.lds.S | 2 +- arch/mips/kernel/vmlinux.lds.S | 2 +- arch/mn10300/kernel/vmlinux.lds.S | 2 +- arch/parisc/kernel/vmlinux.lds.S | 2 +- arch/powerpc/kernel/vmlinux.lds.S | 2 +- arch/s390/kernel/vmlinux.lds.S | 2 +- arch/sh/kernel/vmlinux.lds.S | 2 +- arch/sparc/kernel/vmlinux.lds.S | 2 +- arch/tile/kernel/vmlinux.lds.S | 2 +- arch/um/include/asm/common.lds.S | 2 +- arch/x86/include/asm/percpu.h | 7 ++++++- arch/x86/kernel/vmlinux.lds.S | 2 +- arch/xtensa/kernel/vmlinux.lds.S | 2 +- include/asm-generic/vmlinux.lds.h | 17 ++++++++--------- kernel/workqueue.c | 4 +--- mm/percpu.c | 6 ++++-- 21 files changed, 36 insertions(+), 32 deletions(-) Merging workqueues/for-next $ git merge workqueues/for-next Merge made by recursive. Documentation/workqueue.txt | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Recorded preimage for 'drivers/platform/x86/intel_pmic_gpio.c' Auto-merging drivers/platform/x86/Kconfig Auto-merging drivers/platform/x86/acer-wmi.c Auto-merging drivers/platform/x86/asus-wmi.c Auto-merging drivers/platform/x86/eeepc-wmi.c Auto-merging drivers/platform/x86/intel_pmic_gpio.c CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c Auto-merging drivers/platform/x86/sony-laptop.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/platform/x86/intel_pmic_gpio.c'. [master 63f3dca] Merge remote-tracking branch 'drivers-x86/linux-next' $ git diff -M --stat --summary HEAD^.. drivers/platform/x86/Kconfig | 9 + drivers/platform/x86/Makefile | 1 + drivers/platform/x86/acer-wmi.c | 32 +- drivers/platform/x86/asus-laptop.c | 34 +- drivers/platform/x86/asus-wmi.c | 22 +- drivers/platform/x86/asus_acpi.c | 77 ++--- drivers/platform/x86/compal-laptop.c | 22 +- drivers/platform/x86/dell-laptop.c | 12 +- drivers/platform/x86/dell-wmi-aio.c | 3 +- drivers/platform/x86/dell-wmi.c | 17 +- drivers/platform/x86/eeepc-laptop.c | 20 +- drivers/platform/x86/eeepc-wmi.c | 14 +- drivers/platform/x86/fujitsu-laptop.c | 39 +- drivers/platform/x86/hdaps.c | 19 +- drivers/platform/x86/hp-wmi.c | 43 +-- drivers/platform/x86/ibm_rtl.c | 23 +- drivers/platform/x86/ideapad-laptop.c | 2 + drivers/platform/x86/intel_menlow.c | 5 +- drivers/platform/x86/intel_mid_thermal.c | 606 +++++++++++++++--------------- drivers/platform/x86/intel_oaktrail.c | 396 +++++++++++++++++++ drivers/platform/x86/intel_pmic_gpio.c | 14 +- drivers/platform/x86/msi-laptop.c | 9 +- drivers/platform/x86/msi-wmi.c | 45 +-- drivers/platform/x86/sony-laptop.c | 109 +++--- drivers/platform/x86/tc1100-wmi.c | 7 +- drivers/platform/x86/thinkpad_acpi.c | 490 ++++++++++-------------- drivers/platform/x86/topstar-laptop.c | 2 +- drivers/platform/x86/toshiba_acpi.c | 59 ++-- drivers/platform/x86/toshiba_bluetooth.c | 11 +- drivers/platform/x86/wmi.c | 10 +- drivers/platform/x86/xo15-ebook.c | 5 +- 31 files changed, 1214 insertions(+), 943 deletions(-) create mode 100644 drivers/platform/x86/intel_oaktrail.c Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging driver-core/driver-core-next $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next $ git merge tty/tty-next Already up-to-date. Merging usb/usb-next $ git merge usb/usb-next Recorded preimage for 'arch/arm/mach-exynos4/mach-nuri.c' Auto-merging arch/arm/mach-exynos4/Kconfig Auto-merging arch/arm/mach-exynos4/Makefile Auto-merging arch/arm/mach-exynos4/mach-nuri.c CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c Auto-merging drivers/usb/Kconfig Auto-merging drivers/usb/core/devices.c Auto-merging drivers/usb/host/ehci-q.c Removing drivers/usb/serial/sam-ba.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-exynos4/mach-nuri.c'. [master 3192247] Merge remote-tracking branch 'usb/usb-next' $ git diff -M --stat --summary HEAD^.. arch/arm/mach-exynos4/Kconfig | 1 + arch/arm/mach-exynos4/Makefile | 2 + arch/arm/mach-exynos4/cpu.c | 7 +- arch/arm/mach-exynos4/include/mach/map.h | 4 + arch/arm/mach-exynos4/include/mach/regs-pmu.h | 3 + arch/arm/mach-exynos4/include/mach/regs-usb-phy.h | 64 + arch/arm/mach-exynos4/mach-nuri.c | 16 + arch/arm/mach-exynos4/usb-phy.c | 136 +++ arch/arm/plat-s5p/Kconfig | 5 + arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/dev-ehci.c | 57 + arch/arm/plat-s5p/include/plat/ehci.h | 21 + arch/arm/plat-s5p/include/plat/map-s5p.h | 2 +- arch/arm/plat-s5p/include/plat/usb-phy.h | 22 + arch/arm/plat-samsung/include/plat/devs.h | 2 + arch/mips/ath79/Kconfig | 5 + drivers/Makefile | 5 +- drivers/usb/Kconfig | 3 + drivers/usb/Makefile | 5 + drivers/usb/class/cdc-acm.c | 466 +++----- drivers/usb/class/cdc-acm.h | 23 +- drivers/usb/core/devices.c | 22 +- drivers/usb/core/file.c | 8 - drivers/usb/gadget/Kconfig | 18 + drivers/usb/gadget/f_mass_storage.c | 84 +- drivers/usb/gadget/file_storage.c | 81 +- drivers/usb/gadget/fsl_qe_udc.h | 2 +- drivers/usb/gadget/gadget_chips.h | 9 + drivers/usb/gadget/storage_common.c | 22 +- drivers/usb/host/Kconfig | 33 + drivers/usb/host/ehci-ath79.c | 202 ++++ drivers/usb/host/ehci-hcd.c | 10 + drivers/usb/host/ehci-hub.c | 2 +- drivers/usb/host/ehci-q.c | 4 + drivers/usb/host/ehci-s5p.c | 201 +++ drivers/usb/host/ehci.h | 1 + drivers/usb/host/ohci-ath79.c | 151 +++ drivers/usb/host/ohci-hcd.c | 5 + drivers/usb/host/sl811-hcd.c | 8 +- drivers/usb/host/u132-hcd.c | 3 +- drivers/usb/host/uhci-hcd.c | 26 +- drivers/usb/misc/ftdi-elan.c | 3 +- drivers/usb/otg/twl4030-usb.c | 9 +- drivers/usb/otg/twl6030-usb.c | 2 +- drivers/usb/renesas_usbhs/Kconfig | 15 + drivers/usb/renesas_usbhs/Makefile | 9 + drivers/usb/renesas_usbhs/common.c | 394 ++++++ drivers/usb/renesas_usbhs/common.h | 225 ++++ drivers/usb/renesas_usbhs/mod.c | 276 +++++ drivers/usb/renesas_usbhs/mod.h | 122 ++ drivers/usb/renesas_usbhs/mod_gadget.c | 1341 +++++++++++++++++++++ drivers/usb/renesas_usbhs/pipe.c | 880 ++++++++++++++ drivers/usb/renesas_usbhs/pipe.h | 105 ++ drivers/usb/serial/Kconfig | 9 - drivers/usb/serial/Makefile | 1 - drivers/usb/serial/sam-ba.c | 206 ---- include/linux/usb/gadget.h | 4 +- include/linux/usb/renesas_usbhs.h | 149 +++ 58 files changed, 4786 insertions(+), 706 deletions(-) create mode 100644 arch/arm/mach-exynos4/include/mach/regs-usb-phy.h create mode 100644 arch/arm/mach-exynos4/usb-phy.c create mode 100644 arch/arm/plat-s5p/dev-ehci.c create mode 100644 arch/arm/plat-s5p/include/plat/ehci.h create mode 100644 arch/arm/plat-s5p/include/plat/usb-phy.h create mode 100644 drivers/usb/host/ehci-ath79.c create mode 100644 drivers/usb/host/ehci-s5p.c create mode 100644 drivers/usb/host/ohci-ath79.c create mode 100644 drivers/usb/renesas_usbhs/Kconfig create mode 100644 drivers/usb/renesas_usbhs/Makefile create mode 100644 drivers/usb/renesas_usbhs/common.c create mode 100644 drivers/usb/renesas_usbhs/common.h create mode 100644 drivers/usb/renesas_usbhs/mod.c create mode 100644 drivers/usb/renesas_usbhs/mod.h create mode 100644 drivers/usb/renesas_usbhs/mod_gadget.c create mode 100644 drivers/usb/renesas_usbhs/pipe.c create mode 100644 drivers/usb/renesas_usbhs/pipe.h delete mode 100644 drivers/usb/serial/sam-ba.c create mode 100644 include/linux/usb/renesas_usbhs.h Merging staging/staging-next $ git merge staging/staging-next Removing drivers/staging/ath6kl/include/athendpack.h Removing drivers/staging/ath6kl/include/athstartpack.h Removing drivers/staging/ath6kl/os/linux/ar6000_android.c Removing drivers/staging/ath6kl/os/linux/ar6k_pal.c Removing drivers/staging/ath6kl/os/linux/ioctl.c Removing drivers/staging/ath6kl/os/linux/wireless_ext.c Removing drivers/staging/gma500/psb_buffer.c Removing drivers/staging/gma500/psb_fence.c Removing drivers/staging/gma500/psb_sgx.c Removing drivers/staging/gma500/psb_sgx.h Removing drivers/staging/gma500/psb_ttm_fence.c Removing drivers/staging/gma500/psb_ttm_fence_api.h Removing drivers/staging/gma500/psb_ttm_fence_driver.h Removing drivers/staging/gma500/psb_ttm_fence_user.c Removing drivers/staging/gma500/psb_ttm_fence_user.h Removing drivers/staging/gma500/psb_ttm_glue.c Removing drivers/staging/gma500/psb_ttm_placement_user.c Removing drivers/staging/gma500/psb_ttm_placement_user.h Removing drivers/staging/gma500/psb_ttm_userobj_api.h Removing drivers/staging/hv/blkvsc.c Merge made by recursive. drivers/staging/ath6kl/Kconfig | 6 - drivers/staging/ath6kl/Makefile | 39 +- drivers/staging/ath6kl/bmi/src/bmi.c | 8 +- .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 380 +- .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 10 +- drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 2 +- drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 3 - .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 2 +- drivers/staging/ath6kl/htc2/htc.c | 10 +- drivers/staging/ath6kl/htc2/htc_internal.h | 8 - drivers/staging/ath6kl/htc2/htc_recv.c | 6 - drivers/staging/ath6kl/htc2/htc_send.c | 5 - drivers/staging/ath6kl/include/a_config.h | 22 - drivers/staging/ath6kl/include/a_debug.h | 28 - drivers/staging/ath6kl/include/a_drv.h | 22 - drivers/staging/ath6kl/include/a_drv_api.h | 28 - drivers/staging/ath6kl/include/a_osapi.h | 29 - drivers/staging/ath6kl/include/a_types.h | 26 - drivers/staging/ath6kl/include/ar6000_api.h | 22 - drivers/staging/ath6kl/include/athendpack.h | 52 - drivers/staging/ath6kl/include/athstartpack.h | 55 - .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 13 - .../include/common/AR6002/hw4.0/hw/apb_map.h | 8 - .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 8 - .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 13 - .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 8 - .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 8 - .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 14 - .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 8 - drivers/staging/ath6kl/include/common/bmi_msg.h | 8 - drivers/staging/ath6kl/include/common/dbglog.h | 8 - .../staging/ath6kl/include/common/dset_internal.h | 8 - drivers/staging/ath6kl/include/common/dsetid.h | 8 - .../staging/ath6kl/include/common/epping_test.h | 9 - drivers/staging/ath6kl/include/common/gmboxif.h | 8 - drivers/staging/ath6kl/include/common/htc.h | 9 - drivers/staging/ath6kl/include/common/regdump.h | 8 - drivers/staging/ath6kl/include/common/targaddrs.h | 8 - drivers/staging/ath6kl/include/common/wmi.h | 10 +- drivers/staging/ath6kl/include/common/wmix.h | 7 - drivers/staging/ath6kl/include/common_drv.h | 4 - drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 22 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 28 +- .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 5 - drivers/staging/ath6kl/miscdrv/common_drv.c | 34 - drivers/staging/ath6kl/os/linux/ar6000_android.c | 388 -- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 652 +-- drivers/staging/ath6kl/os/linux/ar6000_pm.c | 77 - drivers/staging/ath6kl/os/linux/ar6k_pal.c | 479 -- drivers/staging/ath6kl/os/linux/cfg80211.c | 4 +- drivers/staging/ath6kl/os/linux/eeprom.c | 213 - drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 +- .../staging/ath6kl/os/linux/include/ar6000_drv.h | 83 +- .../ath6kl/os/linux/include/ar6xapi_linux.h | 8 - .../staging/ath6kl/os/linux/include/athdrv_linux.h | 4 +- .../staging/ath6kl/os/linux/include/config_linux.h | 7 - .../staging/ath6kl/os/linux/include/osapi_linux.h | 49 +- .../staging/ath6kl/os/linux/include/wlan_config.h | 10 - .../ath6kl/os/linux/include/wmi_filter_linux.h | 2 +- drivers/staging/ath6kl/os/linux/ioctl.c | 4767 -------------------- drivers/staging/ath6kl/os/linux/wireless_ext.c | 2723 ----------- drivers/staging/ath6kl/reorder/rcv_aggr.c | 10 +- drivers/staging/ath6kl/wlan/include/ieee80211.h | 4 - drivers/staging/ath6kl/wlan/src/wlan_node.c | 6 +- drivers/staging/ath6kl/wmi/wmi.c | 223 +- drivers/staging/brcm80211/README | 102 +- drivers/staging/brcm80211/TODO | 56 +- drivers/staging/brcm80211/brcmfmac/README | 35 - drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 6 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 7 + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 3 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 + .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 16 +- drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 2 +- drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 5 +- drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 7 +- drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 60 +- drivers/staging/brcm80211/brcmsmac/wlc_main.c | 8 +- drivers/staging/brcm80211/include/bcmdevs.h | 72 +- drivers/staging/brcm80211/include/bcmsrom_fmt.h | 2 +- drivers/staging/brcm80211/include/hndpmu.h | 1 - drivers/staging/brcm80211/include/pcicfg.h | 345 +-- drivers/staging/brcm80211/util/bcmsrom.c | 1336 ------ drivers/staging/brcm80211/util/hnddma.c | 3 - drivers/staging/brcm80211/util/hndpmu.c | 49 - drivers/staging/brcm80211/util/siutils.c | 65 +- drivers/staging/gma500/Kconfig | 2 +- drivers/staging/gma500/Makefile | 13 +- drivers/staging/gma500/mrst.h | 217 + drivers/staging/gma500/mrst_crtc.c | 620 +++ drivers/staging/gma500/mrst_lvds.c | 371 ++ drivers/staging/gma500/psb_2d.c | 5 +- drivers/staging/gma500/psb_bl.c | 117 +- drivers/staging/gma500/psb_buffer.c | 450 -- drivers/staging/gma500/psb_drm.h | 111 - drivers/staging/gma500/psb_drv.c | 620 ++-- drivers/staging/gma500/psb_drv.h | 427 +-- drivers/staging/gma500/psb_fb.c | 49 +- drivers/staging/gma500/psb_fence.c | 122 - drivers/staging/gma500/psb_gtt.c | 57 +- drivers/staging/gma500/psb_gtt.h | 4 - drivers/staging/gma500/psb_intel_display.c | 45 +- drivers/staging/gma500/psb_intel_lvds.c | 36 +- drivers/staging/gma500/psb_intel_sdvo.c | 4 +- drivers/staging/gma500/psb_irq.c | 178 +- drivers/staging/gma500/{psb_reset.c => psb_lid.c} | 0 drivers/staging/gma500/psb_mmu.c | 61 - drivers/staging/gma500/psb_powermgmt.c | 750 +--- drivers/staging/gma500/psb_powermgmt.h | 55 +- drivers/staging/gma500/psb_sgx.c | 238 - drivers/staging/gma500/psb_sgx.h | 32 - drivers/staging/gma500/psb_ttm_fence.c | 605 --- drivers/staging/gma500/psb_ttm_fence_api.h | 272 -- drivers/staging/gma500/psb_ttm_fence_driver.h | 302 -- drivers/staging/gma500/psb_ttm_fence_user.c | 237 - drivers/staging/gma500/psb_ttm_fence_user.h | 140 - drivers/staging/gma500/psb_ttm_glue.c | 349 -- drivers/staging/gma500/psb_ttm_placement_user.c | 628 --- drivers/staging/gma500/psb_ttm_placement_user.h | 252 -- drivers/staging/gma500/psb_ttm_userobj_api.h | 85 - drivers/staging/hv/Makefile | 2 +- drivers/staging/hv/blkvsc.c | 102 - drivers/staging/hv/blkvsc_drv.c | 219 +- drivers/staging/hv/channel.c | 79 +- drivers/staging/hv/channel_mgmt.c | 76 +- drivers/staging/hv/connection.c | 21 +- drivers/staging/hv/hv.c | 64 +- drivers/staging/hv/hv_kvp.c | 9 +- drivers/staging/hv/hv_mouse.c | 420 +- drivers/staging/hv/hv_timesource.c | 3 +- drivers/staging/hv/hv_util.c | 29 +- drivers/staging/hv/netvsc.c | 215 +- drivers/staging/hv/netvsc_drv.c | 46 +- drivers/staging/hv/ring_buffer.c | 21 +- drivers/staging/hv/rndis_filter.c | 64 +- drivers/staging/hv/storvsc.c | 329 +-- drivers/staging/hv/storvsc_api.h | 97 +- drivers/staging/hv/storvsc_drv.c | 169 +- drivers/staging/hv/vmbus_drv.c | 1039 ++--- drivers/staging/hv/vstorage.h | 5 + drivers/staging/iio/adc/Kconfig | 11 + drivers/staging/iio/adc/Makefile | 1 + drivers/staging/iio/adc/ad7780.c | 329 ++ drivers/staging/iio/adc/ad7780.h | 30 + drivers/staging/iio/dac/Kconfig | 10 + drivers/staging/iio/dac/Makefile | 1 + drivers/staging/iio/dac/ad5504.c | 426 ++ drivers/staging/iio/dac/ad5504.h | 74 + drivers/staging/iio/sysfs.h | 1 + drivers/staging/winbond/mto.c | 10 - drivers/staging/winbond/phy_calibration.c | 8 +- 153 files changed, 4650 insertions(+), 19663 deletions(-) delete mode 100644 drivers/staging/ath6kl/include/athendpack.h delete mode 100644 drivers/staging/ath6kl/include/athstartpack.h delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c delete mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c delete mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c delete mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c create mode 100644 drivers/staging/gma500/mrst.h create mode 100644 drivers/staging/gma500/mrst_crtc.c create mode 100644 drivers/staging/gma500/mrst_lvds.c delete mode 100644 drivers/staging/gma500/psb_buffer.c delete mode 100644 drivers/staging/gma500/psb_fence.c rename drivers/staging/gma500/{psb_reset.c => psb_lid.c} (100%) delete mode 100644 drivers/staging/gma500/psb_sgx.c delete mode 100644 drivers/staging/gma500/psb_sgx.h delete mode 100644 drivers/staging/gma500/psb_ttm_fence.c delete mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h delete mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h delete mode 100644 drivers/staging/gma500/psb_ttm_glue.c delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h delete mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h delete mode 100644 drivers/staging/hv/blkvsc.c create mode 100644 drivers/staging/iio/adc/ad7780.c create mode 100644 drivers/staging/iio/adc/ad7780.h create mode 100644 drivers/staging/iio/dac/ad5504.c create mode 100644 drivers/staging/iio/dac/ad5504.h Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging bkl-config/config $ git merge bkl-config/config Already up-to-date. Merging cleancache/linux-next $ git merge cleancache/linux-next Resolved 'fs/ocfs2/super.c' using previous resolution. Resolved 'fs/super.c' using previous resolution. Resolved 'include/linux/fs.h' using previous resolution. Resolved 'mm/Kconfig' using previous resolution. Resolved 'mm/truncate.c' using previous resolution. Auto-merging arch/x86/include/asm/xen/hypercall.h Auto-merging drivers/xen/Makefile Auto-merging fs/btrfs/extent_io.c Auto-merging fs/btrfs/super.c Auto-merging fs/buffer.c Auto-merging fs/ext3/super.c Auto-merging fs/ext4/super.c Auto-merging fs/mpage.c Auto-merging fs/ocfs2/super.c CONFLICT (content): Merge conflict in fs/ocfs2/super.c Auto-merging fs/super.c CONFLICT (content): Merge conflict in fs/super.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging include/xen/interface/xen.h Auto-merging mm/Kconfig CONFLICT (content): Merge conflict in mm/Kconfig Auto-merging mm/Makefile Auto-merging mm/filemap.c Auto-merging mm/truncate.c CONFLICT (content): Merge conflict in mm/truncate.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 73fa655] Merge remote-tracking branch 'cleancache/linux-next' $ git diff -M --stat --summary HEAD^.. .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ arch/x86/include/asm/xen/hypercall.h | 7 + drivers/xen/Makefile | 1 + drivers/xen/tmem.c | 264 +++++++++++++++++++ fs/btrfs/extent_io.c | 9 + fs/btrfs/super.c | 2 + fs/buffer.c | 5 + fs/ext3/super.c | 2 + fs/ext4/super.c | 2 + fs/mpage.c | 7 + fs/ocfs2/super.c | 2 + fs/super.c | 3 + include/linux/cleancache.h | 118 +++++++++ include/linux/fs.h | 5 + include/xen/interface/xen.h | 22 ++ mm/Kconfig | 22 ++ mm/Makefile | 1 + mm/cleancache.c | 245 ++++++++++++++++++ mm/filemap.c | 11 + mm/truncate.c | 10 + 21 files changed, 1016 insertions(+), 0 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache create mode 100644 Documentation/vm/cleancache.txt create mode 100644 drivers/xen/tmem.c create mode 100644 include/linux/cleancache.h create mode 100644 mm/cleancache.c Merging scsi-post-merge/merge-base:master $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master From ../next * [new branch] scsi-post-merge/master -> scsi-post-merge/master $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base From ../next * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base $ git checkout scsi-post-merge/master Switched to branch 'scsi-post-merge/master' $ git rebase --onto master scsi-post-merge/merge-base First, rewinding head to replay your work on top of it... Fast-forwarded scsi-post-merge/master to master. $ cd ../next $ git pull -f ../rebase-tmp scsi-post-merge/master From ../rebase-tmp * branch scsi-post-merge/master -> FETCH_HEAD Already up-to-date. $ rm -rf ../rebase-tmp