$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at a7bcf21 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 Merging origin/master $ git merge origin/master Updating a7bcf21..f6614b7 Fast-forward fs/cifs/inode.c | 1 - fs/cifs/ioctl.c | 12 ++++++++++-- fs/openpromfs/inode.c | 2 +- include/linux/kernel.h | 2 +- mm/mprotect.c | 2 +- 5 files changed, 13 insertions(+), 6 deletions(-) Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Merge made by recursive. arch/arm/Kconfig | 2 +- arch/arm/include/asm/hardware/it8152.h | 2 +- arch/arm/kernel/hw_breakpoint.c | 3 +- arch/arm/kernel/perf_event.c | 2 +- arch/arm/kernel/stacktrace.c | 2 +- arch/arm/kernel/traps.c | 5 +- arch/arm/kernel/unwind.c | 2 +- arch/arm/mach-ep93xx/include/mach/dma.h | 111 +++++++++++++++++++++++++-- arch/arm/mach-kirkwood/common.c | 7 +- arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- arch/arm/mach-kirkwood/lacie_v2-common.c | 14 ---- arch/arm/mach-kirkwood/lacie_v2-common.h | 2 - arch/arm/mach-kirkwood/mpp.c | 4 +- arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- arch/arm/mach-kirkwood/ts41x-setup.c | 14 +++- arch/arm/mach-mmp/include/mach/cputype.h | 3 +- arch/arm/mach-mv78xx0/mpp.c | 4 +- arch/arm/mach-orion5x/mpp.c | 4 +- arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- arch/arm/mach-pxa/cm-x2xx.c | 2 - arch/arm/mach-pxa/saar.c | 2 +- arch/arm/mm/dma-mapping.c | 2 +- arch/arm/plat-orion/include/plat/pcie.h | 3 + arch/arm/plat-orion/pcie.c | 5 - 25 files changed, 142 insertions(+), 67 deletions(-) Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/atm/solos-attrlist.c | 1 + drivers/atm/solos-pci.c | 8 +++++ drivers/net/r8169.c | 9 +++--- drivers/net/skge.c | 1 - drivers/s390/net/qeth_core.h | 9 ------ drivers/s390/net/qeth_core_main.c | 55 ++++++------------------------------- include/linux/netdevice.h | 5 +++ include/net/dst_ops.h | 1 + net/core/pktgen.c | 6 ++-- net/ipv4/igmp.c | 4 +-- net/ipv6/reassembly.c | 2 +- net/rds/message.c | 4 ++- net/sched/cls_basic.c | 4 +++ net/tipc/socket.c | 1 + 14 files changed, 42 insertions(+), 68 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/pci.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) Merging wireless-current/master $ git merge wireless-current/master Merge made by recursive. drivers/bluetooth/btusb.c | 5 ++++ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 ++ drivers/net/wireless/ath/ath9k/ath9k.h | 1 + drivers/net/wireless/ath/ath9k/hif_usb.c | 31 +++++++++++++-------------- drivers/net/wireless/ath/ath9k/hw.c | 15 +++++++++++- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/init.c | 8 +++++++ drivers/net/wireless/ath/ath9k/main.c | 29 ++++++++++++++++++------- drivers/net/wireless/ath/ath9k/recv.c | 4 +- drivers/net/wireless/ath/ath9k/reg.h | 1 + drivers/net/wireless/ath/carl9170/usb.c | 4 ++- drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 +- drivers/net/wireless/libertas/cfg.c | 5 ++- drivers/net/wireless/libertas/dev.h | 1 + drivers/net/wireless/libertas/main.c | 7 ++++++ net/bluetooth/hci_event.c | 6 +++++ net/bluetooth/hidp/Kconfig | 2 +- net/bluetooth/l2cap.c | 8 +++--- net/bluetooth/rfcomm/core.c | 13 ++++++++-- net/mac80211/iface.c | 6 ++-- net/wireless/nl80211.c | 4 +- 21 files changed, 112 insertions(+), 45 deletions(-) Merging kbuild-current/rc-fixes $ git merge kbuild-current/rc-fixes Already up-to-date. Merging driver-core.current/driver-core-linus $ git merge driver-core.current/driver-core-linus Merge made by recursive. MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging tty.current/tty-linus $ git merge tty.current/tty-linus Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 4 +- drivers/char/nozomi.c | 1 - drivers/char/pcmcia/synclink_cs.c | 1 + drivers/serial/8250_pci.c | 5 ++++ drivers/serial/bfin_5xx.c | 6 +--- drivers/tty/tty_buffer.c | 14 +++++++++- drivers/tty/tty_ldisc.c | 49 +++++++++++++++++++++++++++++++----- include/linux/tty.h | 2 +- 8 files changed, 65 insertions(+), 17 deletions(-) Merging usb.current/usb-linus $ git merge usb.current/usb-linus Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 2 +- drivers/usb/musb/blackfin.c | 80 +++++++++++++++++++++++++------------ drivers/usb/musb/musb_core.c | 41 +++++++++---------- drivers/usb/musb/musb_core.h | 2 +- drivers/usb/musb/musb_gadget.c | 41 ++++++++++--------- drivers/usb/musb/musb_regs.h | 3 +- drivers/usb/musb/musbhsdma.c | 14 ++++++ drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 7 +++ include/linux/usb.h | 2 +- include/linux/usb/musb.h | 2 + 11 files changed, 125 insertions(+), 71 deletions(-) Merging staging.current/staging-linus $ git merge staging.current/staging-linus Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 2 +- drivers/staging/ath6kl/Kconfig | 2 +- drivers/staging/ath6kl/os/linux/cfg80211.c | 7 +- drivers/staging/bcm/Bcmchar.c | 49 +++-- drivers/staging/brcm80211/README | 2 +- drivers/staging/brcm80211/TODO | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 - drivers/staging/cpia/cpia.c | 6 +- drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 1 - drivers/staging/hv/hv_utils.c | 3 - .../staging/intel_sst/intel_sst_app_interface.c | 284 +++++++++++--------- drivers/staging/intel_sst/intel_sst_common.h | 4 +- drivers/staging/rt2860/common/cmm_aes.c | 2 - drivers/staging/rt2860/usb_main_dev.c | 1 + drivers/staging/rtl8192e/r8192E_core.c | 3 + drivers/staging/stradis/stradis.c | 11 +- drivers/staging/udlfb/udlfb.c | 2 +- drivers/staging/vt6656/main_usb.c | 3 +- .../staging/westbridge/astoria/api/src/cyasusb.c | 1 - 19 files changed, 223 insertions(+), 164 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Already up-to-date. Merging input-current/for-linus $ git merge input-current/for-linus Already up-to-date. 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 Merge made by recursive. drivers/crypto/n2_core.c | 2 +- drivers/crypto/padlock-aes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 Merge made by recursive. include/linux/sh_intc.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging rmobile-current/rmobile-fixes-for-linus $ git merge rmobile-current/rmobile-fixes-for-linus Merge made by recursive. arch/arm/mach-shmobile/board-ap4evb.c | 2 ++ arch/arm/mach-shmobile/intc-sh7372.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) Merging gcl-current/merge $ git merge gcl-current/merge Already up-to-date. Merging arm/devel $ git merge arm/devel Auto-merging arch/arm/kernel/traps.c Merge made by recursive. Documentation/arm/00-INDEX | 2 + Documentation/arm/swp_emulation | 27 ++ arch/arm/common/Makefile | 1 + arch/arm/{plat-versatile => common}/timer-sp.c | 4 +- arch/arm/include/asm/assembler.h | 13 +- arch/arm/include/asm/domain.h | 31 +++- arch/arm/include/asm/futex.h | 9 +- .../plat => include/asm/hardware}/timer-sp.h | 0 arch/arm/include/asm/traps.h | 2 + arch/arm/include/asm/uaccess.h | 16 +- arch/arm/kernel/Makefile | 2 + arch/arm/kernel/entry-armv.S | 4 +- arch/arm/kernel/fiq.c | 5 + arch/arm/kernel/swp_emulate.c | 267 ++++++++++++++++++++ arch/arm/kernel/traps.c | 14 +- arch/arm/lib/getuser.S | 13 +- arch/arm/lib/putuser.S | 29 ++- arch/arm/lib/uaccess.S | 83 +++--- arch/arm/mach-integrator/integrator_cp.c | 2 +- arch/arm/mach-realview/core.c | 2 +- arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- arch/arm/mach-vexpress/v2m.c | 2 +- arch/arm/mm/Kconfig | 35 +++ arch/arm/mm/mmu.c | 6 +- arch/arm/mm/proc-macros.S | 7 + arch/arm/mm/proc-v7.S | 9 +- arch/arm/plat-versatile/Makefile | 1 - 28 files changed, 489 insertions(+), 101 deletions(-) create mode 100644 Documentation/arm/swp_emulation rename arch/arm/{plat-versatile => common}/timer-sp.c (98%) rename arch/arm/{plat-versatile/include/plat => include/asm/hardware}/timer-sp.h (100%) create mode 100644 arch/arm/kernel/swp_emulate.c Merging davinci/davinci-next $ git merge davinci/davinci-next Already up-to-date. Merging i.MX/for-next $ git merge i.MX/for-next Merge made by recursive. arch/arm/mach-imx/Kconfig | 3 + arch/arm/mach-imx/devices.c | 8 +- arch/arm/mach-imx/dma-v1.c | 2 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 - arch/arm/mach-imx/mm-imx1.c | 7 +- arch/arm/mach-imx/mm-imx21.c | 21 +-- arch/arm/mach-imx/mm-imx27.c | 21 +-- arch/arm/mach-imx/pm-imx27.c | 3 + arch/arm/mach-mx25/devices-imx25.h | 4 +- arch/arm/mach-mx25/devices.c | 8 +- arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx25/mach-cpuimx25.c | 2 +- arch/arm/mach-mx25/mach-mx25_3ds.c | 2 +- arch/arm/mach-mx25/mm.c | 27 +-- arch/arm/mach-mx3/Kconfig | 2 + arch/arm/mach-mx3/Makefile | 3 - arch/arm/mach-mx3/devices.c | 72 ++++---- arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 2 +- arch/arm/mach-mx3/mach-mx35_3ds.c | 2 +- arch/arm/mach-mx3/mach-pcm037_eet.c | 5 +- arch/arm/mach-mx3/mach-pcm043.c | 16 +- arch/arm/mach-mx3/mm.c | 63 +++---- arch/arm/mach-mx5/Kconfig | 3 + arch/arm/mach-mx5/board-cpuimx51.c | 4 +- arch/arm/mach-mx5/board-cpuimx51sd.c | 4 +- arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- arch/arm/mach-mx5/board-mx51_babbage.c | 10 +- arch/arm/mach-mx5/board-mx51_efikamx.c | 245 ++++++++++++++++++++++++- arch/arm/mach-mx5/cpu.c | 3 + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 +- arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 2 +- arch/arm/mach-mx5/mm.c | 35 +--- arch/arm/mach-mxc91231/mm.c | 53 +----- arch/arm/plat-mxc/Kconfig | 11 +- arch/arm/plat-mxc/Makefile | 5 +- arch/arm/plat-mxc/{irq.c => avic.c} | 0 arch/arm/plat-mxc/devices/platform-imx-dma.c | 8 - arch/arm/plat-mxc/devices/platform-spi_imx.c | 1 + arch/arm/plat-mxc/include/mach/common.h | 2 +- arch/arm/plat-mxc/include/mach/debug-macro.S | 24 +-- arch/arm/plat-mxc/include/mach/hardware.h | 87 +++++++++- arch/arm/plat-mxc/include/mach/iomux-mx51.h | 28 ++- arch/arm/plat-mxc/include/mach/iomux-v3.h | 38 ++++- arch/arm/plat-mxc/include/mach/mx1.h | 133 +------------- arch/arm/plat-mxc/include/mach/mx21.h | 44 +----- arch/arm/plat-mxc/include/mach/mx25.h | 23 +-- arch/arm/plat-mxc/include/mach/mx27.h | 79 +-------- arch/arm/plat-mxc/include/mach/mx2x.h | 149 --------------- arch/arm/plat-mxc/include/mach/mx31.h | 49 +----- arch/arm/plat-mxc/include/mach/mx35.h | 34 +--- arch/arm/plat-mxc/include/mach/mx3x.h | 182 +------------------ arch/arm/plat-mxc/include/mach/mx51.h | 42 +---- arch/arm/plat-mxc/include/mach/mxc91231.h | 23 +-- arch/arm/plat-mxc/iomux-v3.c | 22 +- arch/arm/plat-mxc/system.c | 8 + drivers/usb/host/ehci-mxc.c | 14 +- drivers/video/mx3fb.c | 4 + 60 files changed, 610 insertions(+), 1057 deletions(-) rename arch/arm/plat-mxc/{irq.c => avic.c} (100%) Merging msm/for-next $ git merge msm/for-next Already up-to-date! Merge made by recursive. Merging omap/for-next $ git merge omap/for-next Removing arch/arm/mach-omap2/board-zoom2.c Merge made by recursive. arch/arm/mach-omap1/devices.c | 5 +- arch/arm/mach-omap1/include/mach/camera.h | 2 + arch/arm/mach-omap2/Makefile | 4 +- arch/arm/mach-omap2/board-devkit8000.c | 3 - arch/arm/mach-omap2/board-igep0020.c | 35 ++---- .../arm/mach-omap2/{board-zoom3.c => board-zoom.c} | 104 ++++++++++------- arch/arm/mach-omap2/board-zoom2.c | 117 -------------------- arch/arm/plat-omap/dma.c | 2 + 8 files changed, 81 insertions(+), 191 deletions(-) rename arch/arm/mach-omap2/{board-zoom3.c => board-zoom.c} (75%) delete mode 100644 arch/arm/mach-omap2/board-zoom2.c Merging pxa/for-next $ git merge pxa/for-next Already up-to-date. Merging samsung/next-samsung $ git merge samsung/next-samsung Auto-merging arch/arm/mach-s3c2410/mach-h1940.c Merge made by recursive. Merging s5p/for-next $ git merge s5p/for-next Already up-to-date. Merging tegra/for-next $ git merge tegra/for-next Already up-to-date. Merging avr32/avr32-arch $ git merge avr32/avr32-arch Already up-to-date. Merging blackfin/for-linus $ git merge blackfin/for-linus Removing arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h Removing arch/blackfin/mach-bf518/include/mach/defBF51x_base.h Removing arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h Removing arch/blackfin/mach-bf527/include/mach/defBF52x_base.h Removing arch/blackfin/mach-bf533/include/mach/fio_flag.h Merge made by recursive. arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 113 ++ arch/blackfin/include/asm/bfin_dma.h | 91 + arch/blackfin/include/asm/bfin_serial.h | 263 +++ arch/blackfin/include/asm/dma.h | 37 +- arch/blackfin/include/asm/io.h | 268 +--- arch/blackfin/include/mach-common/ports-a.h | 25 + arch/blackfin/include/mach-common/ports-b.h | 25 + arch/blackfin/include/mach-common/ports-c.h | 25 + arch/blackfin/include/mach-common/ports-d.h | 25 + arch/blackfin/include/mach-common/ports-e.h | 25 + arch/blackfin/include/mach-common/ports-f.h | 25 + arch/blackfin/include/mach-common/ports-g.h | 25 + arch/blackfin/include/mach-common/ports-h.h | 25 + arch/blackfin/include/mach-common/ports-i.h | 25 + arch/blackfin/include/mach-common/ports-j.h | 25 + arch/blackfin/mach-bf518/dma.c | 2 +- .../blackfin/mach-bf518/include/mach/bfin_serial.h | 14 + .../mach-bf518/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf518/include/mach/blackfin.h | 68 +- arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 1038 ++++++++++- arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 5 +- arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 5 +- arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 5 +- .../mach-bf518/include/mach/cdefBF51x_base.h | 1061 ---------- arch/blackfin/mach-bf518/include/mach/defBF512.h | 1388 +++++++++++++- .../mach-bf518/include/mach/defBF51x_base.h | 1495 -------------- arch/blackfin/mach-bf518/include/mach/gpio.h | 4 + arch/blackfin/mach-bf527/dma.c | 2 +- .../blackfin/mach-bf527/include/mach/bfin_serial.h | 14 + .../mach-bf527/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf527/include/mach/blackfin.h | 48 +- arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 1092 ++++++++++- arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 7 +- arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 7 +- .../mach-bf527/include/mach/cdefBF52x_base.h | 1113 ----------- arch/blackfin/mach-bf527/include/mach/defBF522.h | 1393 +++++++++++++- arch/blackfin/mach-bf527/include/mach/defBF525.h | 2 +- arch/blackfin/mach-bf527/include/mach/defBF527.h | 2 +- .../mach-bf527/include/mach/defBF52x_base.h | 1506 -------------- arch/blackfin/mach-bf527/include/mach/gpio.h | 4 + arch/blackfin/mach-bf533/boards/blackstamp.c | 15 +- arch/blackfin/mach-bf533/boards/ip0x.c | 9 - arch/blackfin/mach-bf533/boards/stamp.c | 20 +- arch/blackfin/mach-bf533/dma.c | 2 +- .../blackfin/mach-bf533/include/mach/bfin_serial.h | 14 + .../mach-bf533/include/mach/bfin_serial_5xx.h | 74 +- arch/blackfin/mach-bf533/include/mach/blackfin.h | 30 +- arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 63 +- arch/blackfin/mach-bf533/include/mach/defBF532.h | 128 +-- arch/blackfin/mach-bf533/include/mach/fio_flag.h | 55 - arch/blackfin/mach-bf533/include/mach/gpio.h | 2 + arch/blackfin/mach-bf537/dma.c | 2 +- .../blackfin/mach-bf537/include/mach/bfin_serial.h | 14 + .../mach-bf537/include/mach/bfin_serial_5xx.h | 72 +- arch/blackfin/mach-bf537/include/mach/blackfin.h | 38 +- arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 27 +- arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 5 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 111 +- arch/blackfin/mach-bf537/include/mach/defBF537.h | 5 +- arch/blackfin/mach-bf537/include/mach/gpio.h | 4 + arch/blackfin/mach-bf538/dma.c | 18 +- .../blackfin/mach-bf538/include/mach/bfin_serial.h | 14 + .../mach-bf538/include/mach/bfin_serial_5xx.h | 73 +- arch/blackfin/mach-bf538/include/mach/blackfin.h | 37 +- arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 504 ++--- arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 8 +- arch/blackfin/mach-bf538/include/mach/defBF538.h | 1825 +++++++++++++++++ arch/blackfin/mach-bf538/include/mach/defBF539.h | 2095 +------------------- arch/blackfin/mach-bf538/include/mach/gpio.h | 5 + arch/blackfin/mach-bf548/dma.c | 2 +- .../blackfin/mach-bf548/include/mach/bfin_serial.h | 16 + .../mach-bf548/include/mach/bfin_serial_5xx.h | 60 +- arch/blackfin/mach-bf548/include/mach/blackfin.h | 70 +- arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 10 +- arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 10 +- .../mach-bf548/include/mach/cdefBF54x_base.h | 23 +- arch/blackfin/mach-bf548/include/mach/defBF542.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF544.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF547.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF548.h | 7 +- arch/blackfin/mach-bf548/include/mach/defBF549.h | 7 +- .../mach-bf548/include/mach/defBF54x_base.h | 321 +--- arch/blackfin/mach-bf548/include/mach/gpio.h | 11 + arch/blackfin/mach-bf561/dma.c | 18 +- .../blackfin/mach-bf561/include/mach/bfin_serial.h | 14 + .../mach-bf561/include/mach/bfin_serial_5xx.h | 74 +- arch/blackfin/mach-bf561/include/mach/blackfin.h | 26 +- arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 503 ++--- arch/blackfin/mach-bf561/include/mach/defBF561.h | 408 ++--- arch/blackfin/mach-bf561/include/mach/gpio.h | 2 + arch/blackfin/mach-bf561/smp.c | 4 +- drivers/net/irda/bfin_sir.h | 2 + include/asm-generic/io.h | 30 + 96 files changed, 8439 insertions(+), 9942 deletions(-) create mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig create mode 100644 arch/blackfin/include/asm/bfin_dma.h create mode 100644 arch/blackfin/include/asm/bfin_serial.h create mode 100644 arch/blackfin/include/mach-common/ports-a.h create mode 100644 arch/blackfin/include/mach-common/ports-b.h create mode 100644 arch/blackfin/include/mach-common/ports-c.h create mode 100644 arch/blackfin/include/mach-common/ports-d.h create mode 100644 arch/blackfin/include/mach-common/ports-e.h create mode 100644 arch/blackfin/include/mach-common/ports-f.h create mode 100644 arch/blackfin/include/mach-common/ports-g.h create mode 100644 arch/blackfin/include/mach-common/ports-h.h create mode 100644 arch/blackfin/include/mach-common/ports-i.h create mode 100644 arch/blackfin/include/mach-common/ports-j.h create mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF51x_base.h create mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF52x_base.h create mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_serial.h delete mode 100644 arch/blackfin/mach-bf533/include/mach/fio_flag.h create mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf538/include/mach/defBF538.h create mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_serial.h create mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_serial.h Merging cris/for-next $ git merge cris/for-next Already up-to-date. Merging ia64/test $ git merge ia64/test Already up-to-date. Merging m68k/for-next $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next $ git merge m68knommu/for-next Removing arch/m68knommu/mm/fault.c Removing arch/m68knommu/mm/memory.c Merge made by recursive. arch/m68k/include/asm/cacheflush_no.h | 34 ++----- arch/m68k/include/asm/coldfire.h | 2 +- arch/m68k/include/asm/entry_no.h | 59 ++++++----- arch/m68k/include/asm/gpio.h | 2 +- arch/m68k/include/asm/io_no.h | 1 - arch/m68k/include/asm/m5206sim.h | 12 ++- arch/m68k/include/asm/m520xsim.h | 12 ++- arch/m68k/include/asm/m523xsim.h | 9 ++ arch/m68k/include/asm/m5249sim.h | 8 ++ arch/m68k/include/asm/m5272sim.h | 6 + arch/m68k/include/asm/m527xsim.h | 9 ++ arch/m68k/include/asm/m528xsim.h | 9 ++ arch/m68k/include/asm/m5307sim.h | 14 +++ arch/m68k/include/asm/m532xsim.h | 10 ++ arch/m68k/include/asm/m5407sim.h | 40 +------ arch/m68k/include/asm/m54xxacr.h | 123 ++++++++++++++++++++++ arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 21 +++- arch/m68k/include/asm/mcfcache.h | 30 +++--- arch/m68k/include/asm/mcfsim.h | 4 +- arch/m68k/include/asm/mcfuart.h | 45 +-------- arch/m68k/include/asm/processor.h | 13 ++- arch/m68knommu/Kconfig | 23 ++++- arch/m68knommu/Makefile | 6 +- arch/m68knommu/kernel/setup.c | 72 +++---------- arch/m68knommu/mm/Makefile | 2 +- arch/m68knommu/mm/fault.c | 57 ---------- arch/m68knommu/mm/kmap.c | 9 -- arch/m68knommu/mm/memory.c | 33 ------ arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- arch/m68knommu/platform/coldfire/Makefile | 2 +- arch/m68knommu/platform/coldfire/entry.S | 56 ++-------- 33 files changed, 380 insertions(+), 385 deletions(-) create mode 100644 arch/m68k/include/asm/m54xxacr.h rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (74%) delete mode 100644 arch/m68knommu/mm/fault.c delete mode 100644 arch/m68knommu/mm/memory.c rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) Merging microblaze/next $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next $ git merge mips/mips-for-linux-next Already up-to-date. Merging parisc/next $ git merge parisc/next Already up-to-date. Merging powerpc/next $ git merge powerpc/next Already up-to-date. Merging 4xx/next $ git merge 4xx/next Already up-to-date. Merging 52xx-and-virtex/next $ git merge 52xx-and-virtex/next Auto-merging arch/powerpc/platforms/Kconfig Auto-merging arch/powerpc/sysdev/mpc8xxx_gpio.c Merge made by recursive. arch/powerpc/platforms/Kconfig | 7 ++- arch/powerpc/sysdev/mpc8xxx_gpio.c | 75 ++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 11 deletions(-) Merging galak/next $ git merge galak/next Already up-to-date. Merging s390/features $ git merge s390/features Merge made by recursive. arch/s390/mm/gup.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) Merging sh/sh-latest $ git merge sh/sh-latest Removing arch/sh/kernel/io_generic.c Merge made by recursive. arch/sh/Kconfig | 20 +- arch/sh/boards/board-secureedge5410.c | 2 - arch/sh/boards/mach-se/7206/setup.c | 6 + arch/sh/boards/mach-se/board-se7619.c | 6 + arch/sh/drivers/pci/pci.c | 3 +- arch/sh/include/asm/io.h | 345 +++++++++++++++++--------------- arch/sh/include/asm/io_generic.h | 25 --- arch/sh/include/asm/machvec.h | 21 -- arch/sh/kernel/Makefile | 6 +- arch/sh/kernel/cpu/Makefile | 2 +- arch/sh/kernel/cpu/proc.c | 148 ++++++++++++++ arch/sh/kernel/cpu/sh2/clock-sh7619.c | 22 +- arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 20 +- arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 21 +- arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 20 +- arch/sh/kernel/io_generic.c | 180 ----------------- arch/sh/kernel/iomap.c | 165 +++++++++++++++ arch/sh/kernel/ioport.c | 43 ++++ arch/sh/kernel/machvec.c | 22 -- arch/sh/kernel/setup.c | 144 ------------- 20 files changed, 605 insertions(+), 616 deletions(-) create mode 100644 arch/sh/kernel/cpu/proc.c delete mode 100644 arch/sh/kernel/io_generic.c create mode 100644 arch/sh/kernel/iomap.c create mode 100644 arch/sh/kernel/ioport.c Merging rmobile/rmobile-latest $ git merge rmobile/rmobile-latest Already up-to-date! Merge made by recursive. Merging sparc/master $ git merge sparc/master Already up-to-date. Merging tile/master $ git merge tile/master 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/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 0a68b28] Merge remote 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 Merge made by recursive. fs/ecryptfs/ecryptfs_kernel.h | 4 +--- fs/ecryptfs/file.c | 22 ++++++++++------------ fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ fs/ecryptfs/kthread.c | 19 +++++++++++++++---- fs/ecryptfs/main.c | 5 +++-- include/linux/magic.h | 1 + 6 files changed, 44 insertions(+), 39 deletions(-) Merging ext3/for_next $ git merge ext3/for_next Already up-to-date. Merging ext4/next $ git merge ext4/next Already up-to-date. Merging fatfs/master $ git merge fatfs/master Already up-to-date. Merging fuse/for-next $ git merge fuse/for-next Already up-to-date. Merging gfs2/master $ git merge gfs2/master Merge made by recursive. fs/gfs2/export.c | 46 ++--------------- fs/gfs2/glock.c | 43 ++++++++-------- fs/gfs2/inode.c | 152 ++++++++++++----------------------------------------- fs/gfs2/inode.h | 4 +- fs/gfs2/rgrp.c | 91 ++++++++++++++++---------------- 5 files changed, 109 insertions(+), 227 deletions(-) Merging hfsplus/for-next $ git merge hfsplus/for-next Merge made by recursive. fs/hfsplus/hfsplus_fs.h | 1 + fs/hfsplus/options.c | 26 ++++++++++++++++++++++++++ fs/hfsplus/super.c | 8 +++----- 3 files changed, 30 insertions(+), 5 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/dir.c Auto-merging fs/logfs/file.c 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 f73f782] Merge remote branch 'logfs/master' $ git diff -M --stat --summary HEAD^.. Merging nfs/linux-next $ git merge nfs/linux-next Merge made by recursive. fs/lockd/host.c | 11 ++++------- fs/nfs/super.c | 8 +++++++- include/linux/lockd/lockd.h | 1 + 3 files changed, 12 insertions(+), 8 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Already up-to-date. Merging nilfs2/for-next $ git merge nilfs2/for-next Already up-to-date. Merging ocfs2/linux-next $ git merge ocfs2/linux-next Already up-to-date. Merging 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 Already up-to-date. Merging ubifs/linux-next $ git merge ubifs/linux-next Already up-to-date. Merging xfs/master $ git merge xfs/master Already up-to-date. Merging vfs/for-next $ git merge vfs/for-next Already up-to-date. Merging pci/linux-next $ git merge pci/linux-next Already up-to-date. Merging hid/for-next $ git merge hid/for-next Resolved 'drivers/hid/hid-input.c' using previous resolution. Auto-merging drivers/hid/hid-core.c Auto-merging drivers/hid/hid-ids.h Auto-merging drivers/hid/hid-input.c CONFLICT (content): Merge conflict in drivers/hid/hid-input.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 8e8d926] Merge remote branch 'hid/for-next' $ git diff -M --stat --summary HEAD^.. drivers/hid/Kconfig | 10 +++ drivers/hid/Makefile | 1 + drivers/hid/hid-apple.c | 49 +++++++++++++-- drivers/hid/hid-core.c | 13 ++++ drivers/hid/hid-egalax.c | 2 +- drivers/hid/hid-emsff.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/hid/hid-ids.h | 9 +++ drivers/hid/hid-input.c | 2 +- 8 files changed, 241 insertions(+), 7 deletions(-) create mode 100644 drivers/hid/hid-emsff.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. Documentation/feature-removal-schedule.txt | 10 ++++++++++ drivers/i2c/i2c-mux.c | 1 - drivers/media/common/saa7146_i2c.c | 1 - drivers/media/video/ir-kbd-i2c.c | 1 - drivers/staging/olpc_dcon/olpc_dcon.c | 1 - drivers/video/riva/rivafb-i2c.c | 1 - include/linux/i2c-id.h | 22 ---------------------- include/linux/i2c.h | 2 +- 8 files changed, 11 insertions(+), 28 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Already up-to-date. Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. Auto-merging Documentation/feature-removal-schedule.txt CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ff15cb4] Merge branch 'quilt/jdelvare-hwmon' $ git diff -M --stat --summary HEAD^.. Documentation/feature-removal-schedule.txt | 10 ++ Documentation/hwmon/adm9240 | 2 +- Documentation/hwmon/w83793 | 2 +- drivers/hwmon/adm9240.c | 32 ++++- drivers/hwmon/amc6821.c | 2 +- drivers/hwmon/lm93.c | 4 +- drivers/hwmon/lm95241.c | 19 ++- drivers/hwmon/max6650.c | 2 +- drivers/hwmon/w83792d.c | 44 ++++++- drivers/hwmon/w83793.c | 33 ++++- drivers/hwmon/w83795.c | 207 +++++++++++++++++++++++----- 11 files changed, 304 insertions(+), 53 deletions(-) Merging hwmon-staging/hwmon-next $ git merge hwmon-staging/hwmon-next Merge made by recursive. drivers/hwmon/abituguru.c | 36 +++++++-------- drivers/hwmon/abituguru3.c | 45 ++++++++---------- drivers/hwmon/ad7414.c | 6 ++- drivers/hwmon/adt7470.c | 8 ++- drivers/hwmon/applesmc.c | 106 +++++++++++++++++------------------------- drivers/hwmon/asb100.c | 9 ++-- drivers/hwmon/asus_atk0110.c | 7 ++- drivers/hwmon/coretemp.c | 11 ++-- drivers/hwmon/dme1737.c | 12 ++-- drivers/hwmon/f71805f.c | 29 +++++------ drivers/hwmon/f71882fg.c | 23 +++++---- drivers/hwmon/gpio-fan.c | 8 ++-- drivers/hwmon/hp_accel.c | 13 +++-- drivers/hwmon/hwmon-vid.c | 11 ++-- drivers/hwmon/hwmon.c | 4 +- drivers/hwmon/ibmaem.c | 4 +- drivers/hwmon/lis3lv02d.c | 23 ++++----- drivers/hwmon/lm70.c | 5 +- drivers/hwmon/pcf8591.c | 5 +- drivers/hwmon/pkgtemp.c | 7 ++- drivers/hwmon/sis5595.c | 10 ++-- drivers/hwmon/smsc47b397.c | 13 ++--- drivers/hwmon/smsc47m1.c | 31 ++++++------ drivers/hwmon/via-cputemp.c | 10 ++-- drivers/hwmon/via686a.c | 10 ++-- drivers/hwmon/vt1211.c | 30 +++++------- drivers/hwmon/vt8231.c | 10 ++-- drivers/hwmon/w83627ehf.c | 23 ++++----- drivers/hwmon/w83627hf.c | 17 +++---- 29 files changed, 251 insertions(+), 275 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Merge made by recursive. drivers/media/Kconfig | 1 - drivers/media/dvb/frontends/dibx000_common.c | 1 + drivers/media/video/cafe_ccic.c | 5 ++- drivers/media/video/cx231xx/cx231xx-417.c | 6 +--- drivers/media/video/cx23885/cx23885-417.c | 9 +------- drivers/media/video/cx23885/cx23885-video.c | 5 ---- drivers/media/video/mx2_camera.c | 13 ++++------- drivers/media/video/mx3_camera.c | 4 +++ drivers/media/video/omap1_camera.c | 16 +++++++------- drivers/media/video/ov6650.c | 4 +-- drivers/media/video/saa7134/saa7134-cards.c | 24 ++++++++++---------- drivers/media/video/se401.c | 7 ++--- drivers/media/video/stk-webcam.c | 4 --- drivers/media/video/tlg2300/pd-main.c | 13 +++-------- drivers/media/video/usbvideo/vicam.c | 29 ++++++++++++------------- drivers/media/video/v4l2-dev.c | 7 +++-- drivers/media/video/zoran/zoran.h | 1 + drivers/media/video/zoran/zoran_card.c | 1 + drivers/media/video/zoran/zoran_driver.c | 27 ++++++++++++++++++----- drivers/staging/tm6000/tm6000-video.c | 1 + 20 files changed, 86 insertions(+), 92 deletions(-) Merging kbuild/for-next $ git merge kbuild/for-next Already up-to-date! Merge made by recursive. 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 Already up-to-date. Merging acpi/test $ git merge acpi/test Already up-to-date. Merging idle-test/idle-test $ git merge idle-test/idle-test Already up-to-date. Merging ieee1394/for-next $ git merge ieee1394/for-next Merge made by recursive. drivers/firewire/core-card.c | 6 +++--- drivers/firewire/core-cdev.c | 2 +- drivers/firewire/core-device.c | 30 +++++++++++++++++++----------- drivers/firewire/core-transaction.c | 18 ++++++++++++++---- drivers/firewire/core.h | 2 ++ drivers/firewire/nosy.c | 3 +-- 6 files changed, 40 insertions(+), 21 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Already up-to-date. Merging kvm/linux-next $ git merge kvm/linux-next Already up-to-date. Merging dlm/next $ git merge dlm/next Already up-to-date. Merging 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 Merge made by recursive. drivers/block/aoe/aoecmd.c | 6 +- drivers/net/bonding/bond_main.c | 8 ++-- drivers/net/ks8851.c | 33 +++++++++++++ include/linux/netdevice.h | 2 +- include/net/dn_dev.h | 27 +++++++---- include/net/dst.h | 8 ++-- net/decnet/af_decnet.c | 2 +- net/decnet/dn_dev.c | 100 +++++++++++++++++++++++---------------- net/decnet/dn_fib.c | 6 ++- net/decnet/dn_neigh.c | 2 +- net/decnet/dn_route.c | 68 +++++++++++++++----------- net/unix/af_unix.c | 34 +++++++------- 12 files changed, 184 insertions(+), 112 deletions(-) Merging wireless/master $ git merge wireless/master Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/wireless/ath/ath9k/hw.h Auto-merging drivers/net/wireless/ath/ath9k/init.c Auto-merging drivers/net/wireless/ath/ath9k/main.c Auto-merging drivers/net/wireless/ath/ath9k/recv.c Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c Merge made by recursive. drivers/net/wireless/ath/ath5k/base.c | 24 +- drivers/net/wireless/ath/ath5k/desc.h | 18 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 123 ++-- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 20 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 69 +- drivers/net/wireless/ath/ath9k/ar9003_mac.h | 6 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 2 +- drivers/net/wireless/ath/ath9k/ath9k.h | 5 +- drivers/net/wireless/ath/ath9k/beacon.c | 6 +- drivers/net/wireless/ath/ath9k/common.c | 15 +- drivers/net/wireless/ath/ath9k/common.h | 5 +- drivers/net/wireless/ath/ath9k/debug.c | 12 +- drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- drivers/net/wireless/ath/ath9k/eeprom_4k.c | 9 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 27 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 62 +- drivers/net/wireless/ath/ath9k/gpio.c | 10 +- drivers/net/wireless/ath/ath9k/htc_drv_main.c | 70 +-- drivers/net/wireless/ath/ath9k/hw.c | 9 +- drivers/net/wireless/ath/ath9k/hw.h | 3 +- drivers/net/wireless/ath/ath9k/init.c | 36 +- drivers/net/wireless/ath/ath9k/mac.c | 86 ++- drivers/net/wireless/ath/ath9k/mac.h | 13 +- drivers/net/wireless/ath/ath9k/main.c | 96 +-- drivers/net/wireless/ath/ath9k/pci.c | 40 +- drivers/net/wireless/ath/ath9k/rc.c | 31 +- drivers/net/wireless/ath/ath9k/recv.c | 42 +- drivers/net/wireless/ath/ath9k/virtual.c | 1 + drivers/net/wireless/ath/ath9k/xmit.c | 2 - drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- drivers/net/wireless/ath/carl9170/main.c | 2 +- drivers/net/wireless/ath/debug.h | 2 + drivers/net/wireless/ath/key.c | 9 +- drivers/net/wireless/b43/b43.h | 13 + drivers/net/wireless/b43/dma.c | 5 - drivers/net/wireless/b43/phy_n.c | 14 +- drivers/net/wireless/b43/radio_2055.c | 8 +- drivers/net/wireless/b43/radio_2056.c | 51 ++ drivers/net/wireless/b43/radio_2056.h | 1081 +++++++++++++++++++++++- drivers/net/wireless/iwlwifi/Kconfig | 3 + drivers/net/wireless/iwlwifi/Makefile | 3 + drivers/net/wireless/iwlwifi/iwl-1000.c | 5 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 15 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 326 +++++++- drivers/net/wireless/iwlwifi/iwl-5000.c | 10 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 27 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 31 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 587 +++++++++++++ drivers/net/wireless/iwlwifi/iwl-agn.c | 421 ++-------- drivers/net/wireless/iwlwifi/iwl-agn.h | 36 + drivers/net/wireless/iwlwifi/iwl-core.c | 749 ++++------------- drivers/net/wireless/iwlwifi/iwl-core.h | 51 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 3 + drivers/net/wireless/iwlwifi/iwl-led.c | 2 + drivers/net/wireless/iwlwifi/iwl-legacy.c | 560 ++++++++++++ drivers/net/wireless/iwlwifi/iwl-legacy.h | 74 ++ drivers/net/wireless/iwlwifi/iwl-power.c | 95 ++- drivers/net/wireless/iwlwifi/iwl-power.h | 3 + drivers/net/wireless/iwlwifi/iwl-scan.c | 11 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 47 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- drivers/ssb/driver_pcicore.c | 7 + drivers/ssb/pcihost_wrapper.c | 7 + include/linux/nl80211.h | 6 +- include/linux/rfkill.h | 31 - include/net/cfg80211.h | 15 +- net/mac80211/debugfs.c | 60 +- net/mac80211/debugfs.h | 2 + net/mac80211/debugfs_key.c | 19 +- net/mac80211/debugfs_sta.c | 26 +- net/mac80211/rc80211_minstrel_ht.c | 16 +- net/rfkill/core.c | 14 - net/wireless/reg.c | 134 +++- 75 files changed, 3753 insertions(+), 1687 deletions(-) create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.h Merging bluetooth/master $ git merge bluetooth/master Merge made by recursive. net/bluetooth/bnep/core.c | 1 + net/bluetooth/cmtp/core.c | 1 + net/bluetooth/hidp/core.c | 2 +- 3 files changed, 3 insertions(+), 1 deletions(-) Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Already up-to-date. Merging sound/for-next $ git merge sound/for-next Removing sound/pci/oxygen/hifier.c Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- include/sound/alc5623.h | 15 + sound/pci/Kconfig | 17 +- sound/pci/oxygen/Makefile | 2 - sound/pci/oxygen/hifier.c | 239 ----- sound/pci/oxygen/oxygen.c | 71 ++- sound/pci/oxygen/oxygen_lib.c | 2 +- sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/alc5623.c | 1118 +++++++++++++++++++++++ sound/soc/codecs/alc5623.h | 161 ++++ sound/soc/codecs/wm8993.c | 2 + sound/soc/codecs/wm8994.c | 3 + sound/soc/codecs/wm_hubs.c | 69 +- sound/soc/codecs/wm_hubs.h | 3 + sound/soc/kirkwood/Kconfig | 9 + sound/soc/kirkwood/Makefile | 2 + sound/soc/kirkwood/kirkwood-t5325.c | 141 +++ 18 files changed, 1577 insertions(+), 296 deletions(-) create mode 100644 include/sound/alc5623.h delete mode 100644 sound/pci/oxygen/hifier.c create mode 100644 sound/soc/codecs/alc5623.c create mode 100644 sound/soc/codecs/alc5623.h create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c Merging sound-asoc/for-next $ git merge sound-asoc/for-next Merge made by recursive. include/sound/soc-dapm.h | 49 ++- include/sound/soc.h | 30 +- sound/soc/atmel/playpaq_wm8510.c | 11 +- sound/soc/atmel/sam9g20_wm8731.c | 17 +- sound/soc/atmel/snd-soc-afeb9260.c | 13 +- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ad1836.c | 5 +- sound/soc/codecs/ad193x.c | 5 +- sound/soc/codecs/ak4535.c | 9 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 9 +- sound/soc/codecs/alc5623.c | 23 +- sound/soc/codecs/cq93vc.c | 2 +- sound/soc/codecs/cs42l51.c | 5 +- sound/soc/codecs/cx20442.c | 15 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/jz4740.c | 10 +- sound/soc/codecs/max98088.c | 12 +- sound/soc/codecs/ssm2602.c | 9 +- sound/soc/codecs/stac9766.c | 3 +- sound/soc/codecs/tlv320aic23.c | 9 +- sound/soc/codecs/tlv320aic3x.c | 22 +- sound/soc/codecs/tlv320dac33.c | 15 +- sound/soc/codecs/tpa6130a2.c | 5 +- sound/soc/codecs/twl4030.c | 13 +- sound/soc/codecs/twl6040.c | 12 +- sound/soc/codecs/uda134x.c | 2 +- sound/soc/codecs/uda1380.c | 13 +- sound/soc/codecs/wm2000.c | 5 +- sound/soc/codecs/wm8350.c | 28 +- sound/soc/codecs/wm8400.c | 11 +- sound/soc/codecs/wm8510.c | 11 +- sound/soc/codecs/wm8523.c | 11 +- sound/soc/codecs/wm8580.c | 13 +- sound/soc/codecs/wm8711.c | 9 +- sound/soc/codecs/wm8728.c | 11 +- sound/soc/codecs/wm8731.c | 13 +- sound/soc/codecs/wm8741.c | 9 +- sound/soc/codecs/wm8750.c | 11 +- sound/soc/codecs/wm8753.c | 29 +- sound/soc/codecs/wm8770.c | 750 ++++++++++++++++++++++++ sound/soc/codecs/wm8770.h | 51 ++ sound/soc/codecs/wm8776.c | 10 +- sound/soc/codecs/wm8804.c | 6 +- sound/soc/codecs/wm8900.c | 11 +- sound/soc/codecs/wm8903.c | 11 +- sound/soc/codecs/wm8904.c | 33 +- sound/soc/codecs/wm8940.c | 5 +- sound/soc/codecs/wm8955.c | 11 +- sound/soc/codecs/wm8960.c | 25 +- sound/soc/codecs/wm8961.c | 11 +- sound/soc/codecs/wm8962.c | 37 +- sound/soc/codecs/wm8971.c | 29 +- sound/soc/codecs/wm8974.c | 11 +- sound/soc/codecs/wm8978.c | 11 +- sound/soc/codecs/wm8985.c | 11 +- sound/soc/codecs/wm8988.c | 9 +- sound/soc/codecs/wm8990.c | 11 +- sound/soc/codecs/wm8993.c | 9 +- sound/soc/codecs/wm8994.c | 15 +- sound/soc/codecs/wm9081.c | 9 +- sound/soc/codecs/wm9090.c | 17 +- sound/soc/codecs/wm9705.c | 6 +- sound/soc/codecs/wm9712.c | 9 +- sound/soc/codecs/wm9713.c | 8 +- sound/soc/codecs/wm_hubs.c | 18 +- sound/soc/davinci/davinci-evm.c | 21 +- sound/soc/ep93xx/snappercl15.c | 5 +- sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- sound/soc/imx/eukrea-tlv320.c | 8 +- sound/soc/imx/imx-pcm-dma-mx2.c | 221 +++---- sound/soc/imx/imx-ssi.c | 48 +- sound/soc/imx/imx-ssi.h | 4 + sound/soc/imx/phycore-ac97.c | 5 +- sound/soc/imx/wm1133-ev1.c | 7 +- sound/soc/jz4740/qi_lb60.c | 13 +- sound/soc/kirkwood/kirkwood-t5325.c | 13 +- sound/soc/omap/am3517evm.c | 13 +- sound/soc/omap/ams-delta.c | 82 ++-- sound/soc/omap/n810.c | 42 +- sound/soc/omap/omap3pandora.c | 44 +- sound/soc/omap/osk5912.c | 13 +- sound/soc/omap/rx51.c | 25 +- sound/soc/omap/sdp3430.c | 43 +- sound/soc/omap/sdp4430.c | 19 +- sound/soc/omap/zoom2.c | 35 +- sound/soc/pxa/corgi.c | 56 +- sound/soc/pxa/e740_wm9705.c | 29 +- sound/soc/pxa/e750_wm9705.c | 29 +- sound/soc/pxa/e800_wm9712.c | 7 +- sound/soc/pxa/magician.c | 39 +- sound/soc/pxa/mioa701_wm9713.c | 17 +- sound/soc/pxa/palm27x.c | 33 +- sound/soc/pxa/poodle.c | 30 +- sound/soc/pxa/saarb.c | 17 +- sound/soc/pxa/spitz.c | 74 ++- sound/soc/pxa/tavorevb3.c | 17 +- sound/soc/pxa/tosa.c | 42 +- sound/soc/pxa/z2.c | 15 +- sound/soc/pxa/zylonite.c | 11 +- sound/soc/s3c24xx/Kconfig | 1 + sound/soc/s3c24xx/aquila_wm8994.c | 25 +- sound/soc/s3c24xx/goni_wm8994.c | 21 +- sound/soc/s3c24xx/jive_wm8750.c | 19 +- sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 41 +- sound/soc/s3c24xx/neo1973_wm8753.c | 123 ++-- sound/soc/s3c24xx/rx1950_uda1380.c | 11 +- sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 15 +- sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 15 +- sound/soc/s3c24xx/smartq_wm8987.c | 21 +- sound/soc/s3c24xx/smdk64xx_wm8580.c | 16 +- sound/soc/s6000/s6105-ipcam.c | 40 +- sound/soc/sh/migor.c | 5 +- sound/soc/sh/sh7760-ac97.c | 2 +- sound/soc/soc-cache.c | 18 +- sound/soc/soc-core.c | 104 +++- sound/soc/soc-dapm.c | 357 ++++++------ sound/soc/soc-jack.c | 19 +- 120 files changed, 2303 insertions(+), 1261 deletions(-) create mode 100644 sound/soc/codecs/wm8770.c create mode 100644 sound/soc/codecs/wm8770.h Merging cpufreq/next $ git merge cpufreq/next Already up-to-date. Merging quilt/rr $ git merge quilt/rr Auto-merging drivers/block/virtio_blk.c Auto-merging drivers/char/virtio_console.c Auto-merging kernel/module.c Merge made by recursive. Merging input/next $ git merge input/next Merge made by recursive. drivers/input/input.c | 50 +++++++++++++++------- drivers/input/keyboard/adp5588-keys.c | 74 +++++++++++---------------------- drivers/input/keyboard/atkbd.c | 12 +++++- drivers/input/serio/i8042-x86ia64io.h | 11 +++++ drivers/serial/kgdboc.c | 59 ++++++++++++++++++++++++++ include/linux/i2c/adp5588.h | 15 ++++++- include/linux/input.h | 4 +- 7 files changed, 158 insertions(+), 67 deletions(-) Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Resolved 'fs/ocfs2/file.c' using previous resolution. Auto-merging fs/ocfs2/file.c CONFLICT (content): Merge conflict in fs/ocfs2/file.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f352eda] Merge remote branch 'block/for-next' $ git diff -M --stat --summary HEAD^.. Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Auto-merging drivers/char/pcmcia/cm4000_cs.c Merge made by recursive. drivers/char/pcmcia/cm4000_cs.c | 3 ++- drivers/pcmcia/pd6729.c | 8 ++++---- drivers/pcmcia/pd6729.h | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) Merging battery/master $ git merge battery/master Already up-to-date. Merging leds/for-mm $ git merge leds/for-mm Auto-merging drivers/leds/Kconfig Auto-merging drivers/leds/leds-gpio.c Merge made by recursive. Merging backlight/for-mm $ git merge backlight/for-mm Already up-to-date. Merging mmc/mmc-next $ git merge mmc/mmc-next Merge made by recursive. arch/arm/mach-dove/common.c | 4 +- drivers/mmc/core/Kconfig | 11 ++ drivers/mmc/core/core.c | 47 ++++++++- drivers/mmc/core/core.h | 2 + drivers/mmc/core/debugfs.c | 5 + drivers/mmc/core/host.c | 207 +++++++++++++++++++++++++++++++++++- drivers/mmc/core/host.h | 21 ++++ drivers/mmc/core/mmc.c | 8 +- drivers/mmc/host/Kconfig | 11 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/mmci.c | 35 ++++-- drivers/mmc/host/mmci.h | 1 + drivers/mmc/host/mxcmmc.c | 52 ++++++++- drivers/mmc/host/sdhci-dove.c | 70 ++++++++++++ drivers/mmc/host/sdhci-esdhc-imx.c | 12 ++- drivers/mmc/host/sdhci-pci.c | 31 ++++-- drivers/mmc/host/sdhci-pltfm.c | 3 + drivers/mmc/host/sdhci-pltfm.h | 1 + drivers/mmc/host/sdhci.c | 10 ++ drivers/mmc/host/sdhci.h | 4 + drivers/mmc/host/ushc.c | 30 ++++-- include/linux/mmc/host.h | 10 ++ include/linux/pci_ids.h | 1 + 23 files changed, 534 insertions(+), 43 deletions(-) create mode 100644 drivers/mmc/host/sdhci-dove.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Already up-to-date. Merging slab/for-next $ git merge slab/for-next Merge made by recursive. Documentation/vm/Makefile | 2 +- include/linux/slub_def.h | 55 +++++++++++++-------------- mm/slub.c | 33 ++++++++++++---- {Documentation/vm => tools/slub}/slabinfo.c | 6 +- 4 files changed, 55 insertions(+), 41 deletions(-) rename {Documentation/vm => tools/slub}/slabinfo.c (99%) Merging uclinux/for-next $ git merge uclinux/for-next Already up-to-date. Merging md/for-next $ git merge md/for-next Already up-to-date. Merging mfd/for-next $ git merge mfd/for-next Already up-to-date. Merging hdlc/hdlc-next $ git merge hdlc/hdlc-next Already up-to-date. Merging drm/drm-next $ git merge drm/drm-next Merge made by recursive. drivers/char/agp/intel-gtt.c | 6 +- drivers/gpu/drm/drm_crtc_helper.c | 2 +- drivers/gpu/drm/drm_edid.c | 26 +++++-- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 118 +++++++++++++++---------- drivers/gpu/drm/i915/i915_gem_evict.c | 8 +-- drivers/gpu/drm/i915/i915_suspend.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 70 +++++++++------ drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_lvds.c | 16 +++- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_overlay.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 129 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_ringbuffer.h | 3 + drivers/gpu/drm/radeon/evergreen.c | 8 ++- drivers/gpu/drm/radeon/r100.c | 4 +- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 +-- drivers/gpu/drm/radeon/radeon_atombios.c | 27 ++++-- drivers/gpu/drm/radeon/radeon_connectors.c | 16 ++-- drivers/gpu/drm/radeon/radeon_display.c | 18 +++-- drivers/gpu/drm/radeon/radeon_encoders.c | 26 ++++++ drivers/gpu/drm/radeon/radeon_fence.c | 3 +- drivers/gpu/drm/radeon/radeon_i2c.c | 41 +++++++-- drivers/gpu/drm/radeon/radeon_mode.h | 17 +++- drivers/gpu/drm/radeon/radeon_ttm.c | 3 +- drivers/gpu/drm/radeon/rs400.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 4 +- drivers/gpu/drm/ttm/ttm_bo.c | 82 ++++-------------- drivers/gpu/drm/ttm/ttm_bo_manager.c | 81 ++++++++++-------- drivers/gpu/drm/ttm/ttm_tt.c | 4 +- drivers/gpu/drm/via/via_dmablit.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- drivers/gpu/stub/Kconfig | 3 + include/drm/ttm/ttm_bo_driver.h | 79 ++++++++++++++++- 40 files changed, 567 insertions(+), 273 deletions(-) Merging fbdev/master $ git merge fbdev/master Merge made by recursive. drivers/video/Kconfig | 26 +++ drivers/video/Makefile | 3 + drivers/video/vt8500lcdfb.c | 447 +++++++++++++++++++++++++++++++++++++++++ drivers/video/vt8500lcdfb.h | 34 +++ drivers/video/wm8505fb.c | 422 ++++++++++++++++++++++++++++++++++++++ drivers/video/wm8505fb_regs.h | 76 +++++++ drivers/video/wmt_ge_rops.c | 192 ++++++++++++++++++ drivers/video/wmt_ge_rops.h | 5 + 8 files changed, 1205 insertions(+), 0 deletions(-) create mode 100644 drivers/video/vt8500lcdfb.c create mode 100644 drivers/video/vt8500lcdfb.h create mode 100644 drivers/video/wm8505fb.c create mode 100644 drivers/video/wm8505fb_regs.h create mode 100644 drivers/video/wmt_ge_rops.c create mode 100644 drivers/video/wmt_ge_rops.h Merging viafb/viafb-next $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next $ git merge omap_dss2/for-next Auto-merging arch/arm/plat-omap/fb.c Auto-merging drivers/video/omap2/omapfb/omapfb-main.c Auto-merging drivers/video/omap2/vram.c Merge made by recursive. arch/arm/plat-omap/include/plat/vram.h | 1 + drivers/video/omap2/omapfb/omapfb-main.c | 2 +- drivers/video/omap2/vram.c | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletions(-) Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/core.c | 12 +++++++++--- drivers/regulator/mc13783-regulator.c | 4 ++-- drivers/regulator/twl-regulator.c | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) Merging security-testing/next $ git merge security-testing/next Merge made by recursive. include/linux/kernel.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Merging lblnet/master $ git merge lblnet/master Already up-to-date. Merging agp/agp-next $ git merge agp/agp-next Auto-merging drivers/char/agp/backend.c Auto-merging drivers/char/agp/hp-agp.c Merge made by recursive. Merging watchdog/master $ git merge watchdog/master Merge made by recursive. drivers/watchdog/bcm63xx_wdt.c | 42 +++++++++++---------------------------- 1 files changed, 12 insertions(+), 30 deletions(-) Merging bdev/master $ git merge bdev/master Already up-to-date. Merging dwmw2-iommu/master $ git merge dwmw2-iommu/master Already up-to-date. 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 Resolved 'arch/blackfin/mach-bf538/include/mach/defBF539.h' using previous resolution. Resolved 'drivers/scsi/bfa/bfa_fcpim.c' using previous resolution. CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree. CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree. Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h Auto-merging arch/blackfin/mach-bf538/include/mach/defBF539.h CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h Auto-merging drivers/media/video/zoran/zoran.h Auto-merging drivers/mmc/host/Kconfig Auto-merging drivers/scsi/bfa/bfa_fcpim.c CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c Auto-merging drivers/scsi/bfa/bfa_fcs_lport.c Auto-merging drivers/scsi/libfc/fc_fcp.c Auto-merging drivers/scsi/lpfc/lpfc_attr.c Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c Auto-merging drivers/scsi/lpfc/lpfc_sli.c Auto-merging drivers/staging/stradis/stradis.c Auto-merging drivers/usb/musb/musb_gadget.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/inode.c Auto-merging net/core/dev.c Auto-merging net/decnet/dn_dev.c Auto-merging sound/soc/codecs/max98088.c Automatic merge failed; fix conflicts and then commit the result. $ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h arch/blackfin/mach-bf518/include/mach/defBF51x_base.h: needs merge arch/blackfin/mach-bf527/include/mach/defBF52x_base.h: needs merge arch/blackfin/mach-bf538/include/mach/defBF539.h: needs merge drivers/scsi/bfa/bfa_fcpim.c: needs merge rm 'arch/blackfin/mach-bf518/include/mach/defBF51x_base.h' rm 'arch/blackfin/mach-bf527/include/mach/defBF52x_base.h' $ git commit -v -a [master 5e1ed13] Merge remote branch 'trivial/for-next' $ git diff -M --stat --summary HEAD^.. Documentation/DocBook/mtdnand.tmpl | 2 +- Documentation/cgroups/cgroup_event_listener.c | 2 +- Documentation/cgroups/memcg_test.txt | 2 +- Documentation/kprobes.txt | 2 +- Documentation/kvm/api.txt | 2 +- Documentation/networking/caif/spi_porting.txt | 2 +- Documentation/powerpc/booting-without-of.txt | 2 +- Documentation/scheduler/00-INDEX | 2 +- Documentation/scsi/ChangeLog.lpfc | 2 +- Documentation/timers/timer_stats.txt | 2 +- arch/arm/common/it8152.c | 2 +- arch/arm/common/vic.c | 2 +- arch/arm/mach-at91/board-ecbat91.c | 6 +++--- arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +- arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +- arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- arch/arm/mach-bcmring/dma.c | 2 +- arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +- .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +- arch/arm/mach-gemini/include/mach/hardware.h | 2 +- arch/arm/mach-msm/io.c | 2 +- arch/arm/mach-omap2/cpuidle34xx.c | 2 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-pxa/mxm8x10.c | 2 +- arch/arm/mach-s3c64xx/dma.c | 2 +- arch/arm/mach-spear3xx/spear300.c | 4 ++-- arch/arm/mach-spear3xx/spear310.c | 2 +- arch/arm/mach-spear3xx/spear320.c | 2 +- arch/arm/mach-spear3xx/spear3xx.c | 6 +++--- arch/arm/mach-spear6xx/spear6xx.c | 4 ++-- arch/arm/mach-u300/Kconfig | 2 +- arch/arm/mach-u300/include/mach/coh901318.h | 4 ++-- arch/arm/plat-mxc/include/mach/irqs.h | 2 +- arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- arch/cris/arch-v32/lib/nand_init.S | 2 +- arch/cris/include/asm/etraxgpio.h | 2 +- arch/h8300/Kconfig.debug | 2 +- arch/ia64/kvm/mmio.c | 2 +- arch/mips/alchemy/common/power.c | 2 +- arch/mips/include/asm/mach-powertv/ioremap.h | 2 +- arch/mips/jz4740/board-qi_lb60.c | 4 ++-- arch/mips/jz4740/gpio.c | 2 +- arch/mips/mti-malta/malta-memory.c | 2 +- arch/mips/pci/pcie-octeon.c | 2 +- arch/mips/powertv/memory.c | 2 +- arch/mips/txx9/generic/pci.c | 2 +- arch/powerpc/include/asm/8xx_immap.h | 4 ++-- arch/powerpc/oprofile/op_model_cell.c | 2 +- arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++--- arch/powerpc/platforms/ps3/device-init.c | 4 ++-- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- arch/sh/mm/cache-sh5.c | 2 +- arch/sparc/kernel/traps_64.c | 2 +- arch/x86/include/asm/pgalloc.h | 2 +- arch/x86/include/asm/processor.h | 2 +- arch/x86/kernel/amd_iommu.c | 4 ++-- arch/x86/kernel/early_printk_mrst.c | 2 +- arch/x86/kernel/head_32.S | 2 +- block/cfq-iosched.c | 2 +- drivers/acpi/acpica/acobject.h | 2 +- drivers/ata/libata-core.c | 4 ++-- drivers/ata/sata_vsc.c | 2 +- drivers/atm/idt77252.h | 2 +- drivers/atm/iphase.c | 4 ++-- drivers/base/power/main.c | 2 +- drivers/dma/intel_mid_dma.c | 6 +++--- drivers/edac/amd8131_edac.h | 2 +- drivers/edac/cell_edac.c | 4 ++-- drivers/edac/edac_core.h | 2 +- drivers/edac/ppc4xx_edac.c | 6 +++--- drivers/gpu/drm/radeon/atombios.h | 2 +- drivers/i2c/busses/i2c-nomadik.c | 4 ++-- drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- drivers/input/serio/Kconfig | 2 +- drivers/input/touchscreen/Kconfig | 2 +- drivers/isdn/gigaset/bas-gigaset.c | 4 ++-- drivers/isdn/gigaset/ser-gigaset.c | 4 ++-- drivers/isdn/gigaset/usb-gigaset.c | 4 ++-- drivers/isdn/hardware/mISDN/ipac.h | 4 ++-- drivers/isdn/hardware/mISDN/isar.h | 2 +- drivers/media/video/cx25840/cx25840-ir.c | 2 +- drivers/media/video/davinci/vpif.h | 2 +- drivers/media/video/davinci/vpss.c | 2 +- drivers/media/video/omap/omap_vout.c | 2 +- drivers/media/video/saa7164/saa7164-core.c | 4 ++-- drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- drivers/media/video/via-camera.c | 2 -- drivers/media/video/zoran/zoran.h | 2 +- drivers/message/fusion/lsi/mpi_log_sas.h | 2 +- drivers/message/fusion/mptbase.c | 2 +- drivers/message/fusion/mptsas.c | 2 +- drivers/message/i2o/i2o_block.c | 2 +- drivers/misc/arm-charlcd.c | 2 +- drivers/mmc/card/block.c | 2 +- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/au1xmmc.c | 2 +- drivers/mmc/host/sdricoh_cs.c | 4 ++-- drivers/mtd/nand/nand_base.c | 2 +- drivers/net/bnx2x/bnx2x_main.c | 2 +- drivers/net/bnx2x/bnx2x_reg.h | 2 +- drivers/net/bonding/bond_3ad.c | 6 +++--- drivers/net/chelsio/subr.c | 2 +- drivers/net/cxgb3/mc5.c | 2 +- drivers/net/cxgb3/t3_hw.c | 2 +- drivers/net/e1000/e1000_hw.h | 2 +- drivers/net/e1000/e1000_main.c | 2 +- drivers/net/e1000e/82571.c | 2 +- drivers/net/e1000e/ich8lan.c | 2 +- drivers/net/e1000e/phy.c | 2 +- drivers/net/eepro.c | 2 +- drivers/net/irda/donauboe.h | 2 +- drivers/net/ixgbe/ixgbe_82599.c | 4 ++-- drivers/net/ll_temac_main.c | 2 +- drivers/net/sis900.c | 2 +- drivers/net/tehuti.c | 6 +++--- drivers/net/tun.c | 2 +- drivers/net/vxge/vxge-traffic.h | 2 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wimax/i2400m/driver.c | 2 +- drivers/net/wimax/i2400m/i2400m.h | 2 +- drivers/net/wireless/ath/ath5k/reg.h | 6 +++--- drivers/net/wireless/b43/phy_g.c | 2 +- drivers/net/wireless/b43legacy/phy.c | 2 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- drivers/net/wireless/prism54/islpci_dev.c | 6 +++--- drivers/net/wireless/prism54/islpci_eth.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- drivers/net/wireless/wl3501_cs.c | 2 +- drivers/pcmcia/m32r_cfc.h | 2 +- drivers/pcmcia/m32r_pcc.h | 2 +- drivers/pcmcia/m8xx_pcmcia.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 2 +- drivers/power/s3c_adc_battery.c | 4 ++-- drivers/s390/net/lcs.c | 2 +- drivers/s390/scsi/zfcp_cfdc.c | 2 +- drivers/scsi/a100u2w.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 ++-- drivers/scsi/aic94xx/aic94xx_scb.c | 2 +- drivers/scsi/aic94xx/aic94xx_seq.c | 6 +++--- drivers/scsi/bfa/bfa_fcpim.c | 2 +- drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- drivers/scsi/dc395x.c | 8 ++++---- drivers/scsi/libfc/fc_fcp.c | 2 +- drivers/scsi/lpfc/lpfc_attr.c | 2 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/megaraid.h | 2 +- drivers/scsi/pm8001/pm8001_init.c | 2 +- drivers/scsi/scsi_netlink.c | 2 +- drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- drivers/spi/atmel_spi.c | 4 ++-- drivers/spi/spidev.c | 2 +- drivers/staging/stradis/stradis.c | 2 +- drivers/telephony/ixj.c | 3 ++- drivers/usb/gadget/imx_udc.c | 2 +- drivers/usb/host/imx21-hcd.c | 2 +- drivers/usb/host/oxu210hp-hcd.c | 2 +- drivers/usb/misc/adutux.c | 2 +- drivers/usb/misc/iowarrior.c | 2 +- drivers/usb/misc/ldusb.c | 2 +- drivers/usb/musb/musb_gadget.c | 4 ++-- drivers/usb/wusbcore/wa-rpipe.c | 2 +- drivers/video/sstfb.c | 2 +- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 4 ++-- fs/ext4/inode.c | 4 ++-- fs/notify/fanotify/Kconfig | 2 +- fs/ocfs2/inode.c | 2 +- fs/ocfs2/suballoc.c | 2 +- fs/xfs/linux-2.6/xfs_super.c | 2 +- include/acpi/actbl1.h | 2 +- include/linux/cgroup.h | 2 +- include/linux/firewire-cdev.h | 2 +- include/linux/mfd/core.h | 2 +- include/net/sctp/user.h | 4 ++-- include/scsi/fc/fc_fcp.h | 4 ++-- kernel/audit.c | 2 +- kernel/debug/kdb/kdb_main.c | 2 +- kernel/kexec.c | 2 +- kernel/power/swap.c | 2 +- kernel/sched.c | 2 +- kernel/sysctl_binary.c | 2 +- kernel/time/clocksource.c | 2 +- kernel/trace/trace_entries.h | 2 +- lib/nlattr.c | 2 +- lib/swiotlb.c | 2 +- mm/percpu.c | 2 +- mm/sparse-vmemmap.c | 2 +- net/core/dev.c | 2 +- net/decnet/dn_dev.c | 2 +- net/ipv4/tcp_output.c | 2 +- scripts/kconfig/confdata.c | 2 +- scripts/mod/modpost.c | 2 +- security/apparmor/include/match.h | 2 +- sound/core/init.c | 2 +- sound/core/pcm_native.c | 2 +- sound/isa/opl3sa2.c | 2 +- sound/pci/ca0106/ca0106.h | 2 +- sound/pci/emu10k1/emu10k1x.c | 2 +- sound/pci/emu10k1/p16v.h | 2 +- sound/pci/es1968.c | 2 +- sound/pci/rme9652/hdspm.c | 6 +++--- sound/soc/codecs/max98088.c | 2 +- sound/soc/s3c24xx/smdk_spdif.c | 6 +++--- 211 files changed, 264 insertions(+), 265 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 Merge made by recursive. fs/namei.c | 3 + fs/notify/fanotify/fanotify.c | 24 ++++++---- fs/notify/fanotify/fanotify_user.c | 84 ++++++++++++++++++++++-------------- fs/notify/mark.c | 41 +++++++---------- include/linux/fanotify.h | 7 ++- include/linux/fsnotify.h | 3 - include/linux/fsnotify_backend.h | 13 +++++- 7 files changed, 101 insertions(+), 74 deletions(-) $ git reset --hard HEAD^ HEAD is now at 5e1ed13 Merge remote branch 'trivial/for-next' Merging refs/next/20101109/fsnotify $ git merge refs/next/20101109/fsnotify Merge made by recursive. fs/namei.c | 3 ++ fs/notify/fanotify/fanotify_user.c | 47 ++++++++++++++++++++++++++++------- fs/notify/mark.c | 11 -------- include/linux/fanotify.h | 7 ++++- include/linux/fsnotify.h | 3 -- include/linux/fsnotify_backend.h | 13 ++++++++- 6 files changed, 56 insertions(+), 28 deletions(-) Merging irda/for-next $ git merge irda/for-next Already up-to-date. Merging catalin/for-next $ git merge catalin/for-next Already up-to-date. Merging alacrity/linux-next $ git merge alacrity/linux-next Resolved 'include/linux/Kbuild' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master bc23d69] Merge remote branch 'alacrity/linux-next' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 25 + arch/x86/Kconfig | 2 + drivers/Makefile | 1 + drivers/net/Kconfig | 14 + drivers/net/Makefile | 1 + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ drivers/vbus/Kconfig | 25 + drivers/vbus/Makefile | 6 + drivers/vbus/bus-proxy.c | 248 +++++++ drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ include/linux/Kbuild | 4 + include/linux/ioq.h | 414 ++++++++++++ include/linux/shm_signal.h | 189 ++++++ include/linux/vbus_driver.h | 83 +++ include/linux/vbus_pci.h | 145 ++++ include/linux/venet.h | 133 ++++ lib/Kconfig | 21 + lib/Makefile | 2 + lib/ioq.c | 304 +++++++++ lib/shm_signal.c | 196 ++++++ 20 files changed, 4389 insertions(+), 0 deletions(-) create mode 100644 drivers/net/vbus-enet.c create mode 100644 drivers/vbus/Kconfig create mode 100644 drivers/vbus/Makefile create mode 100644 drivers/vbus/bus-proxy.c create mode 100644 drivers/vbus/pci-bridge.c create mode 100644 include/linux/ioq.h create mode 100644 include/linux/shm_signal.h create mode 100644 include/linux/vbus_driver.h create mode 100644 include/linux/vbus_pci.h create mode 100644 include/linux/venet.h create mode 100644 lib/ioq.c create mode 100644 lib/shm_signal.c Merging i7core_edac/linux_next $ git merge i7core_edac/linux_next Already up-to-date. Merging i7300_edac/linux_next $ git merge i7300_edac/linux_next Already up-to-date! Merge made by recursive. Merging devicetree/next-devicetree $ git merge devicetree/next-devicetree Already up-to-date. Merging spi/next-spi $ git merge spi/next-spi Already up-to-date. Merging tip/auto-latest $ git merge tip/auto-latest Auto-merging kernel/sched.c Merge made by recursive. arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/i387.h | 24 ++++++ arch/x86/include/asm/io_apic.h | 7 +- arch/x86/kernel/apic/apic.c | 102 ++++++++++++++++---------- arch/x86/kernel/apic/io_apic.c | 6 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 135 +++++++++++++++++++--------------- arch/x86/kernel/process.c | 1 - arch/x86/kernel/setup.c | 5 +- arch/x86/mm/tlb.c | 2 +- arch/x86/oprofile/op_model_amd.c | 1 + include/linux/rcupdate.h | 2 +- include/linux/sched.h | 5 +- include/linux/timer.h | 32 +++++++- include/linux/workqueue.h | 8 ++ kernel/irq/manage.c | 4 +- kernel/kthread.c | 2 +- kernel/posix-timers.c | 10 ++- kernel/profile.c | 6 +- kernel/sched.c | 6 +- kernel/softirq.c | 4 +- kernel/time/timecompare.c | 5 +- kernel/time/timekeeping.c | 9 ++- kernel/timer.c | 46 +++--------- kernel/trace/trace_selftest.c | 2 +- kernel/watchdog.c | 2 +- 25 files changed, 258 insertions(+), 169 deletions(-) Merging rcu/rcu/next $ git merge rcu/rcu/next Auto-merging include/linux/init_task.h Auto-merging include/linux/rcupdate.h Auto-merging include/linux/sched.h Auto-merging init/Kconfig Auto-merging kernel/sched.c Merge made by recursive. Documentation/RCU/trace.txt | 144 +++++++++++++-- include/linux/init_task.h | 9 +- include/linux/rcupdate.h | 2 - include/linux/rcutiny.h | 13 +- include/linux/rcutree.h | 2 + include/linux/sched.h | 11 +- init/Kconfig | 40 ++++- kernel/rcutiny.c | 105 +++++++---- kernel/rcutiny_plugin.h | 423 +++++++++++++++++++++++++++++++++++++++++-- kernel/rcutorture.c | 270 ++++++++++++++++++++++++++- kernel/rcutree.c | 85 +++------ kernel/rcutree.h | 16 +-- kernel/rcutree_plugin.h | 93 +++++++++- kernel/rcutree_trace.c | 12 +- kernel/sched.c | 69 ------- kernel/srcu.c | 8 +- 16 files changed, 1061 insertions(+), 241 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging xen/upstream/xen $ git merge xen/upstream/xen Resolved 'arch/x86/xen/mmu.c' using previous resolution. Resolved 'arch/x86/xen/setup.c' using previous resolution. Auto-merging arch/x86/xen/mmu.c CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c Auto-merging arch/x86/xen/setup.c CONFLICT (content): Merge conflict in arch/x86/xen/setup.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master cb007fe] Merge remote branch 'xen/upstream/xen' $ git diff -M --stat --summary HEAD^.. arch/x86/xen/setup.c | 32 +++++++++++++++++++++++++------- 1 files changed, 25 insertions(+), 7 deletions(-) Merging swiotlb-xen/master $ git merge swiotlb-xen/master Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 2 +- arch/x86/pci/xen.c | 8 +++++--- drivers/pci/xen-pcifront.c | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) Merging xen-pvhvm/linux-next $ git merge xen-pvhvm/linux-next Auto-merging arch/x86/include/asm/xen/page.h Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/mmu.c Auto-merging include/xen/interface/memory.h Merge made by recursive. arch/x86/include/asm/xen/interface.h | 6 +++--- arch/x86/include/asm/xen/interface_32.h | 5 +++++ arch/x86/include/asm/xen/interface_64.h | 13 +------------ arch/x86/include/asm/xen/page.h | 7 ++++--- arch/x86/xen/enlighten.c | 7 +++++++ arch/x86/xen/mmu.c | 14 ++++++++++++++ include/xen/interface/memory.h | 13 +++++++++++++ 7 files changed, 47 insertions(+), 18 deletions(-) Merging edac-amd/for-next $ git merge edac-amd/for-next Renaming drivers/edac/edac_mce_amd.h->drivers/edac/mce_amd.h Auto-merging drivers/edac/mce_amd.h Auto-merging drivers/edac/Kconfig Auto-merging drivers/edac/Makefile Auto-merging drivers/edac/amd64_edac.c Auto-merging drivers/edac/edac_device_sysfs.c Auto-merging drivers/edac/edac_mc_sysfs.c Merge made by recursive. Merging percpu/for-next $ git merge percpu/for-next Auto-merging mm/percpu.c Merge made by recursive. mm/percpu.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) Merging workqueues/for-next $ git merge workqueues/for-next Already up-to-date. Merging sfi/sfi-test $ git merge sfi/sfi-test Already up-to-date. Merging asm-generic/next $ git merge asm-generic/next Already up-to-date. Merging drivers-x86/linux-next $ git merge drivers-x86/linux-next Already up-to-date. Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging 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 Already up-to-date. Merging staging/staging-next $ git merge staging/staging-next Recorded preimage for 'drivers/staging/bcm/Bcmchar.c' Recorded preimage for 'drivers/staging/intel_sst/intel_sst_app_interface.c' Removing drivers/staging/bcm/Arp.c Auto-merging drivers/staging/bcm/Bcmchar.c CONFLICT (content): Merge conflict in drivers/staging/bcm/Bcmchar.c Removing drivers/staging/bcm/Debug.c Removing drivers/staging/bcm/HostMibs.h Removing drivers/staging/bcm/Interfacemain.h Removing drivers/staging/bcm/Osal_Misc.c Removing drivers/staging/bcm/osal_misc.h Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_linux.c Removing drivers/staging/brcm80211/include/epivers.h Removing drivers/staging/brcm80211/include/linuxver.h Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intel_sst_app_interface.c Removing drivers/staging/winbond/wbhal_f.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/staging/bcm/Bcmchar.c'. Recorded resolution for 'drivers/staging/intel_sst/intel_sst_app_interface.c'. [master 00ed98d] Merge remote branch 'staging/staging-next' $ git diff -M --stat --summary HEAD^.. drivers/staging/Kconfig | 4 + drivers/staging/Makefile | 2 + drivers/staging/batman-adv/main.c | 12 +- drivers/staging/batman-adv/main.h | 3 +- drivers/staging/batman-adv/routing.c | 16 +- drivers/staging/batman-adv/soft-interface.c | 2 +- drivers/staging/batman-adv/vis.c | 7 +- drivers/staging/bcm/Adapter.h | 130 +- drivers/staging/bcm/Arp.c | 94 - drivers/staging/bcm/Bcmchar.c | 992 +++------ drivers/staging/bcm/Bcmnet.c | 404 ++-- drivers/staging/bcm/CmHost.c | 129 +- drivers/staging/bcm/CmHost.h | 3 - drivers/staging/bcm/DDRInit.c | 13 - drivers/staging/bcm/Debug.c | 41 - drivers/staging/bcm/Debug.h | 88 +- drivers/staging/bcm/HandleControlPacket.c | 39 +- drivers/staging/bcm/HostMibs.h | 7 - drivers/staging/bcm/IPv6Protocol.c | 10 +- drivers/staging/bcm/IPv6ProtocolHdr.h | 3 - drivers/staging/bcm/InterfaceDld.c | 122 +- drivers/staging/bcm/InterfaceIdleMode.c | 20 +- drivers/staging/bcm/InterfaceIdleMode.h | 2 - drivers/staging/bcm/InterfaceInit.c | 314 +-- drivers/staging/bcm/InterfaceInit.h | 26 - drivers/staging/bcm/InterfaceIsr.c | 42 +- drivers/staging/bcm/InterfaceMisc.c | 27 +- drivers/staging/bcm/InterfaceMisc.h | 3 - drivers/staging/bcm/InterfaceRx.c | 40 +- drivers/staging/bcm/InterfaceTx.c | 63 +- drivers/staging/bcm/InterfaceTx.h | 6 - drivers/staging/bcm/Interfacemain.h | 10 - drivers/staging/bcm/LeakyBucket.c | 72 +- drivers/staging/bcm/Macros.h | 40 +- drivers/staging/bcm/Makefile | 4 +- drivers/staging/bcm/Misc.c | 513 +---- drivers/staging/bcm/Osal_Misc.c | 27 - drivers/staging/bcm/PHSModule.c | 234 +-- drivers/staging/bcm/PHSModule.h | 45 - drivers/staging/bcm/Protocol.h | 6 +- drivers/staging/bcm/Prototypes.h | 122 +- drivers/staging/bcm/Qos.c | 106 +- drivers/staging/bcm/TODO | 25 +- drivers/staging/bcm/Transmit.c | 393 +--- drivers/staging/bcm/cntrl_SignalingInterface.h | 254 --- drivers/staging/bcm/headers.h | 38 +- drivers/staging/bcm/hostmibs.c | 35 +- drivers/staging/bcm/led_control.c | 135 +- drivers/staging/bcm/nvm.c | 642 +----- drivers/staging/bcm/nvm.h | 80 - drivers/staging/bcm/osal_misc.h | 49 - drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 9 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 +- .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 1 + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1 + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 57 +- .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 1 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 24 +- drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +- drivers/staging/brcm80211/include/bcmdefs.h | 56 +- drivers/staging/brcm80211/include/bcmutils.h | 1 - drivers/staging/brcm80211/include/d11.h | 7 - drivers/staging/brcm80211/include/epivers.h | 44 - drivers/staging/brcm80211/include/linux_osl.h | 41 +- drivers/staging/brcm80211/include/linuxver.h | 38 - drivers/staging/brcm80211/include/osl.h | 2 - drivers/staging/brcm80211/include/wlioctl.h | 341 +--- drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 6 +- drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 6 +- drivers/staging/brcm80211/phy/wlc_phy_n.c | 6 +- drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3 + drivers/staging/brcm80211/phy/wlc_phytbl_n.c | 3 + drivers/staging/brcm80211/sys/wl_mac80211.c | 20 +- drivers/staging/brcm80211/sys/wlc_alloc.c | 7 +- drivers/staging/brcm80211/sys/wlc_ampdu.c | 5 +- drivers/staging/brcm80211/sys/wlc_antsel.c | 7 +- drivers/staging/brcm80211/sys/wlc_bmac.c | 7 +- drivers/staging/brcm80211/sys/wlc_channel.c | 7 +- drivers/staging/brcm80211/sys/wlc_event.c | 7 +- drivers/staging/brcm80211/sys/wlc_mac80211.c | 12 +- drivers/staging/brcm80211/sys/wlc_mac80211.h | 6 - drivers/staging/brcm80211/sys/wlc_phy_shim.c | 7 +- drivers/staging/brcm80211/sys/wlc_pub.h | 8 +- drivers/staging/brcm80211/sys/wlc_rate.c | 4 +- drivers/staging/brcm80211/sys/wlc_stf.c | 6 +- drivers/staging/brcm80211/util/aiutils.c | 6 +- drivers/staging/brcm80211/util/bcmotp.c | 3 +- drivers/staging/brcm80211/util/bcmsrom.c | 3 +- drivers/staging/brcm80211/util/bcmutils.c | 5 +- drivers/staging/brcm80211/util/bcmwifi.c | 4 + drivers/staging/brcm80211/util/hnddma.c | 3 +- drivers/staging/brcm80211/util/hndpmu.c | 6 +- drivers/staging/brcm80211/util/linux_osl.c | 97 +- drivers/staging/brcm80211/util/nicpci.c | 2 +- drivers/staging/brcm80211/util/sbutils.c | 3 + drivers/staging/brcm80211/util/siutils.c | 6 +- .../staging/comedi/drivers/addi-data/addi_common.c | 4 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- drivers/staging/comedi/drivers/rtd520.c | 2 +- drivers/staging/cptm1217/Kconfig | 11 + drivers/staging/cptm1217/Makefile | 2 + drivers/staging/cptm1217/TODO | 5 + drivers/staging/cptm1217/clearpad_tm1217.c | 675 ++++++ drivers/staging/cptm1217/cp_tm1217.h | 9 + drivers/staging/frontier/alphatrack.c | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 20 +- .../staging/ft1000/ft1000-usb/ft1000_download.c | 234 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 399 +--- drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 8 +- drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 3 +- drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 45 +- drivers/staging/iio/Kconfig | 6 +- drivers/staging/iio/Makefile | 7 +- drivers/staging/iio/TODO | 4 + drivers/staging/iio/accel/Kconfig | 27 + drivers/staging/iio/accel/Makefile | 12 + drivers/staging/iio/accel/accel.h | 20 + drivers/staging/iio/accel/adis16201.h | 150 ++ drivers/staging/iio/accel/adis16201_core.c | 659 ++++++ drivers/staging/iio/accel/adis16201_ring.c | 218 ++ drivers/staging/iio/accel/adis16201_trigger.c | 122 + drivers/staging/iio/accel/adis16203.h | 143 ++ drivers/staging/iio/accel/adis16203_core.c | 568 +++++ drivers/staging/iio/accel/adis16203_ring.c | 211 ++ drivers/staging/iio/accel/adis16203_trigger.c | 122 + drivers/staging/iio/accel/adis16204.h | 151 ++ drivers/staging/iio/accel/adis16204_core.c | 613 +++++ drivers/staging/iio/accel/adis16204_ring.c | 206 ++ drivers/staging/iio/accel/adis16204_trigger.c | 122 + drivers/staging/iio/accel/adis16209_ring.c | 2 +- drivers/staging/iio/adc/Kconfig | 77 +- drivers/staging/iio/adc/Makefile | 11 + drivers/staging/iio/adc/ad7150.c | 877 +++++++ drivers/staging/iio/adc/ad7152.c | 610 +++++ drivers/staging/iio/adc/ad7291.c | 1039 +++++++++ drivers/staging/iio/adc/ad7298.c | 501 ++++ drivers/staging/iio/adc/ad7314.c | 308 +++ drivers/staging/iio/adc/ad7745.c | 734 ++++++ drivers/staging/iio/adc/ad7816.c | 535 +++++ drivers/staging/iio/adc/adt7310.c | 952 ++++++++ drivers/staging/iio/adc/adt7410.c | 915 ++++++++ drivers/staging/iio/adc/adt75.c | 732 ++++++ drivers/staging/iio/addac/Kconfig | 25 + drivers/staging/iio/addac/Makefile | 7 + drivers/staging/iio/addac/adt7316-i2c.c | 170 ++ drivers/staging/iio/addac/adt7316-spi.c | 180 ++ drivers/staging/iio/addac/adt7316.c | 2402 ++++++++++++++++++++ drivers/staging/iio/addac/adt7316.h | 33 + drivers/staging/iio/dac/Kconfig | 11 + drivers/staging/iio/dac/Makefile | 5 + drivers/staging/iio/dac/ad5624r.h | 21 + drivers/staging/iio/dac/ad5624r_spi.c | 313 +++ drivers/staging/iio/dac/dac.h | 6 + drivers/staging/iio/dds/Kconfig | 46 + drivers/staging/iio/dds/Makefile | 10 + drivers/staging/iio/dds/ad5930.c | 170 ++ drivers/staging/iio/dds/ad9832.c | 266 +++ drivers/staging/iio/dds/ad9850.c | 156 ++ drivers/staging/iio/dds/ad9852.c | 314 +++ drivers/staging/iio/dds/ad9910.c | 454 ++++ drivers/staging/iio/dds/ad9951.c | 254 +++ drivers/staging/iio/gyro/Kconfig | 38 +- drivers/staging/iio/gyro/Makefile | 12 + drivers/staging/iio/gyro/adis16060.h | 101 + drivers/staging/iio/gyro/adis16060_core.c | 319 +++ drivers/staging/iio/gyro/adis16080.h | 102 + drivers/staging/iio/gyro/adis16080_core.c | 271 +++ drivers/staging/iio/gyro/adis16130.h | 108 + drivers/staging/iio/gyro/adis16130_core.c | 313 +++ drivers/staging/iio/gyro/adis16251.h | 185 ++ drivers/staging/iio/gyro/adis16251_core.c | 777 +++++++ drivers/staging/iio/gyro/adis16260_core.c | 2 +- drivers/staging/iio/imu/adis16350_core.c | 1 + drivers/staging/iio/meter/Kconfig | 61 + drivers/staging/iio/meter/Makefile | 15 + drivers/staging/iio/meter/ade7753.c | 730 ++++++ drivers/staging/iio/meter/ade7753.h | 140 ++ drivers/staging/iio/meter/ade7754.c | 756 ++++++ drivers/staging/iio/meter/ade7754.h | 161 ++ drivers/staging/iio/meter/ade7758.h | 171 ++ drivers/staging/iio/meter/ade7758_core.c | 866 +++++++ drivers/staging/iio/meter/ade7758_ring.c | 212 ++ drivers/staging/iio/meter/ade7758_trigger.c | 125 + drivers/staging/iio/meter/ade7759.c | 670 ++++++ drivers/staging/iio/meter/ade7759.h | 122 + drivers/staging/iio/meter/ade7854-i2c.c | 272 +++ drivers/staging/iio/meter/ade7854-spi.c | 360 +++ drivers/staging/iio/meter/ade7854.c | 680 ++++++ drivers/staging/iio/meter/ade7854.h | 245 ++ drivers/staging/iio/meter/meter.h | 396 ++++ drivers/staging/iio/resolver/Kconfig | 54 + drivers/staging/iio/resolver/Makefile | 7 + drivers/staging/iio/resolver/ad2s120x.c | 310 +++ drivers/staging/iio/resolver/ad2s1210.c | 872 +++++++ drivers/staging/iio/resolver/ad2s90.c | 159 ++ drivers/staging/iio/sysfs.h | 6 + drivers/staging/intel_sst/intel_sst.c | 50 +- .../staging/intel_sst/intel_sst_drv_interface.c | 62 +- drivers/staging/intel_sst/intel_sst_dsp.c | 67 +- drivers/staging/intel_sst/intel_sst_ipc.c | 144 +- drivers/staging/intel_sst/intel_sst_pvt.c | 36 +- drivers/staging/intel_sst/intel_sst_stream.c | 18 +- .../staging/intel_sst/intel_sst_stream_encoded.c | 205 +- drivers/staging/intel_sst/intelmid.c | 157 +- drivers/staging/intel_sst/intelmid_ctrl.c | 15 +- drivers/staging/intel_sst/intelmid_msic_control.c | 24 +- drivers/staging/intel_sst/intelmid_pvt.c | 27 +- drivers/staging/intel_sst/intelmid_v0_control.c | 32 +- drivers/staging/intel_sst/intelmid_v1_control.c | 28 +- drivers/staging/intel_sst/intelmid_v2_control.c | 94 +- drivers/staging/msm/Makefile | 4 +- drivers/staging/pohmelfs/crypto.c | 6 +- drivers/staging/rtl8192u/r8192U_core.c | 2 +- drivers/staging/solo6x10/Kconfig | 2 +- drivers/staging/solo6x10/TODO | 4 - drivers/staging/solo6x10/solo6010-core.c | 12 +- drivers/staging/solo6x10/solo6010-disp.c | 2 +- drivers/staging/solo6x10/solo6010-enc.c | 4 +- drivers/staging/solo6x10/solo6010-g723.c | 14 +- drivers/staging/solo6x10/solo6010-gpio.c | 4 +- drivers/staging/solo6x10/solo6010-i2c.c | 8 +- drivers/staging/solo6x10/solo6010-p2m.c | 152 +- drivers/staging/solo6x10/solo6010-v4l2-enc.c | 352 ++- drivers/staging/solo6x10/solo6010-v4l2.c | 184 ++- drivers/staging/solo6x10/solo6010.h | 35 +- drivers/staging/ste_rmi4/Kconfig | 9 + drivers/staging/ste_rmi4/Makefile | 4 + drivers/staging/ste_rmi4/TODO | 7 + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1179 ++++++++++ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 50 + drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/dpc.c | 4 +- drivers/staging/vt6656/rxtx.c | 3 +- drivers/staging/vt6656/tkip.c | 37 +- drivers/staging/winbond/core.h | 2 +- drivers/staging/winbond/mds.c | 8 +- drivers/staging/winbond/mds_f.h | 3 +- drivers/staging/winbond/mto.c | 4 +- drivers/staging/winbond/phy_calibration.c | 4 +- drivers/staging/winbond/phy_calibration.h | 2 +- drivers/staging/winbond/reg.c | 4 +- drivers/staging/winbond/wb35reg_f.h | 2 +- drivers/staging/winbond/wb35reg_s.h | 74 + drivers/staging/winbond/wb35rx.c | 4 +- drivers/staging/winbond/wb35rx_f.h | 2 +- drivers/staging/winbond/wb35tx.c | 8 +- drivers/staging/winbond/wb35tx_f.h | 1 - drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 11 - drivers/staging/winbond/wbhal_f.h | 81 - drivers/staging/winbond/wbusb.c | 16 +- drivers/staging/wlags49_h2/wl_sysfs.c | 4 +- drivers/staging/xgifb/XGI_main_26.c | 6 +- 258 files changed, 29974 insertions(+), 6248 deletions(-) delete mode 100644 drivers/staging/bcm/Arp.c delete mode 100644 drivers/staging/bcm/Debug.c delete mode 100644 drivers/staging/bcm/HostMibs.h delete mode 100644 drivers/staging/bcm/Interfacemain.h delete mode 100644 drivers/staging/bcm/Osal_Misc.c delete mode 100644 drivers/staging/bcm/osal_misc.h delete mode 100644 drivers/staging/brcm80211/include/epivers.h delete mode 100644 drivers/staging/brcm80211/include/linuxver.h create mode 100644 drivers/staging/cptm1217/Kconfig create mode 100644 drivers/staging/cptm1217/Makefile create mode 100644 drivers/staging/cptm1217/TODO create mode 100644 drivers/staging/cptm1217/clearpad_tm1217.c create mode 100644 drivers/staging/cptm1217/cp_tm1217.h create mode 100644 drivers/staging/iio/accel/adis16201.h create mode 100644 drivers/staging/iio/accel/adis16201_core.c create mode 100644 drivers/staging/iio/accel/adis16201_ring.c create mode 100644 drivers/staging/iio/accel/adis16201_trigger.c create mode 100644 drivers/staging/iio/accel/adis16203.h create mode 100644 drivers/staging/iio/accel/adis16203_core.c create mode 100644 drivers/staging/iio/accel/adis16203_ring.c create mode 100644 drivers/staging/iio/accel/adis16203_trigger.c create mode 100644 drivers/staging/iio/accel/adis16204.h create mode 100644 drivers/staging/iio/accel/adis16204_core.c create mode 100644 drivers/staging/iio/accel/adis16204_ring.c create mode 100644 drivers/staging/iio/accel/adis16204_trigger.c create mode 100644 drivers/staging/iio/adc/ad7150.c create mode 100644 drivers/staging/iio/adc/ad7152.c create mode 100644 drivers/staging/iio/adc/ad7291.c create mode 100644 drivers/staging/iio/adc/ad7298.c create mode 100644 drivers/staging/iio/adc/ad7314.c create mode 100644 drivers/staging/iio/adc/ad7745.c create mode 100644 drivers/staging/iio/adc/ad7816.c create mode 100644 drivers/staging/iio/adc/adt7310.c create mode 100644 drivers/staging/iio/adc/adt7410.c create mode 100644 drivers/staging/iio/adc/adt75.c create mode 100644 drivers/staging/iio/addac/Kconfig create mode 100644 drivers/staging/iio/addac/Makefile create mode 100644 drivers/staging/iio/addac/adt7316-i2c.c create mode 100644 drivers/staging/iio/addac/adt7316-spi.c create mode 100644 drivers/staging/iio/addac/adt7316.c create mode 100644 drivers/staging/iio/addac/adt7316.h create mode 100644 drivers/staging/iio/dac/Kconfig create mode 100644 drivers/staging/iio/dac/Makefile create mode 100644 drivers/staging/iio/dac/ad5624r.h create mode 100644 drivers/staging/iio/dac/ad5624r_spi.c create mode 100644 drivers/staging/iio/dac/dac.h create mode 100644 drivers/staging/iio/dds/Kconfig create mode 100644 drivers/staging/iio/dds/Makefile create mode 100644 drivers/staging/iio/dds/ad5930.c create mode 100644 drivers/staging/iio/dds/ad9832.c create mode 100644 drivers/staging/iio/dds/ad9850.c create mode 100644 drivers/staging/iio/dds/ad9852.c create mode 100644 drivers/staging/iio/dds/ad9910.c create mode 100644 drivers/staging/iio/dds/ad9951.c create mode 100644 drivers/staging/iio/gyro/adis16060.h create mode 100644 drivers/staging/iio/gyro/adis16060_core.c create mode 100644 drivers/staging/iio/gyro/adis16080.h create mode 100644 drivers/staging/iio/gyro/adis16080_core.c create mode 100644 drivers/staging/iio/gyro/adis16130.h create mode 100644 drivers/staging/iio/gyro/adis16130_core.c create mode 100644 drivers/staging/iio/gyro/adis16251.h create mode 100644 drivers/staging/iio/gyro/adis16251_core.c create mode 100644 drivers/staging/iio/meter/Kconfig create mode 100644 drivers/staging/iio/meter/Makefile create mode 100644 drivers/staging/iio/meter/ade7753.c create mode 100644 drivers/staging/iio/meter/ade7753.h create mode 100644 drivers/staging/iio/meter/ade7754.c create mode 100644 drivers/staging/iio/meter/ade7754.h create mode 100644 drivers/staging/iio/meter/ade7758.h create mode 100644 drivers/staging/iio/meter/ade7758_core.c create mode 100644 drivers/staging/iio/meter/ade7758_ring.c create mode 100644 drivers/staging/iio/meter/ade7758_trigger.c create mode 100644 drivers/staging/iio/meter/ade7759.c create mode 100644 drivers/staging/iio/meter/ade7759.h create mode 100644 drivers/staging/iio/meter/ade7854-i2c.c create mode 100644 drivers/staging/iio/meter/ade7854-spi.c create mode 100644 drivers/staging/iio/meter/ade7854.c create mode 100644 drivers/staging/iio/meter/ade7854.h create mode 100644 drivers/staging/iio/meter/meter.h create mode 100644 drivers/staging/iio/resolver/Kconfig create mode 100644 drivers/staging/iio/resolver/Makefile create mode 100644 drivers/staging/iio/resolver/ad2s120x.c create mode 100644 drivers/staging/iio/resolver/ad2s1210.c create mode 100644 drivers/staging/iio/resolver/ad2s90.c create mode 100644 drivers/staging/ste_rmi4/Kconfig create mode 100644 drivers/staging/ste_rmi4/Makefile create mode 100644 drivers/staging/ste_rmi4/TODO create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h rename drivers/staging/winbond/{wbhal_s.h => wbhal.h} (98%) delete mode 100644 drivers/staging/winbond/wbhal_f.h Merging slabh/slabh $ git merge slabh/slabh Already up-to-date. Merging bkl-trivial/trivial $ git merge bkl-trivial/trivial Already up-to-date. Merging bkl-llseek/llseek $ git merge bkl-llseek/llseek Already up-to-date. Merging bkl-vfs/vfs $ git merge bkl-vfs/vfs Already up-to-date. Merging bkl-config/config $ git merge bkl-config/config Already up-to-date. Merging irqflags/master $ git merge irqflags/master Already up-to-date. Merging cleancache/linux-next $ git merge cleancache/linux-next Resolved 'include/linux/fs.h' using previous resolution. Resolved 'mm/Kconfig' 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/ocfs2/super.c Auto-merging fs/super.c Auto-merging include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging mm/Kconfig CONFLICT (content): Merge conflict in mm/Kconfig Auto-merging mm/Makefile Auto-merging mm/filemap.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master f7fee9f] Merge remote 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