$ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 3561d43 Linux 2.6.37-rc3 Merging origin/master $ git merge origin/master Updating 3561d43..698fd6a2 Fast-forward Documentation/DocBook/sh.tmpl | 4 - Documentation/fb/00-INDEX | 32 +- Documentation/kernel-parameters.txt | 5 + Documentation/sh/clk.txt | 32 - MAINTAINERS | 8 +- arch/arm/boot/compressed/head.S | 2 +- arch/arm/boot/compressed/vmlinux.lds.in | 2 +- arch/arm/include/asm/assembler.h | 2 +- arch/arm/include/asm/mmu.h | 4 + arch/arm/include/asm/pgtable.h | 3 + arch/arm/lib/findbit.S | 6 +- arch/arm/mach-aaec2000/include/mach/vmalloc.h | 2 +- arch/arm/mach-bcmring/include/mach/vmalloc.h | 2 +- arch/arm/mach-clps711x/include/mach/vmalloc.h | 2 +- arch/arm/mach-davinci/dm355.c | 6 +- arch/arm/mach-davinci/dm365.c | 6 +- arch/arm/mach-davinci/dm644x.c | 4 +- arch/arm/mach-ebsa110/include/mach/vmalloc.h | 2 +- arch/arm/mach-footbridge/include/mach/vmalloc.h | 2 +- arch/arm/mach-h720x/include/mach/vmalloc.h | 2 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 - arch/arm/mach-integrator/include/mach/vmalloc.h | 2 +- arch/arm/mach-msm/include/mach/vmalloc.h | 2 +- arch/arm/mach-mx25/devices-imx25.h | 4 +- arch/arm/mach-mx3/mach-pcm037_eet.c | 5 +- arch/arm/mach-netx/include/mach/vmalloc.h | 2 +- arch/arm/mach-omap1/include/mach/vmalloc.h | 2 +- arch/arm/mach-omap2/include/mach/vmalloc.h | 2 +- arch/arm/mach-pnx4008/include/mach/vmalloc.h | 2 +- arch/arm/mach-rpc/include/mach/vmalloc.h | 2 +- arch/arm/mach-shark/include/mach/vmalloc.h | 2 +- arch/arm/mach-shmobile/clock-sh7372.c | 6 +- arch/arm/mach-ux500/cpu.c | 6 +- arch/arm/mach-versatile/include/mach/vmalloc.h | 2 +- arch/arm/mm/ioremap.c | 4 +- arch/arm/plat-mxc/devices/platform-imx-dma.c | 8 - arch/arm/plat-mxc/devices/platform-spi_imx.c | 1 + arch/arm/plat-nomadik/timer.c | 89 +- arch/sh/include/asm/processor_32.h | 7 +- arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 +- arch/sh/kernel/sys_sh.c | 2 +- arch/sh/kernel/vsyscall/vsyscall-trapa.S | 2 +- arch/tile/Kconfig | 12 + arch/tile/include/asm/cacheflush.h | 52 + arch/tile/include/asm/io.h | 15 +- arch/tile/include/asm/pci-bridge.h | 117 - arch/tile/include/asm/pci.h | 107 +- arch/tile/include/asm/processor.h | 10 + arch/tile/include/hv/drv_xgbe_impl.h | 300 +++ arch/tile/include/hv/drv_xgbe_intf.h | 615 +++++ arch/tile/include/hv/netio_errors.h | 122 + arch/tile/include/hv/netio_intf.h | 2975 +++++++++++++++++++++++ arch/tile/kernel/Makefile | 1 + arch/tile/kernel/pci.c | 621 +++++ arch/tile/kernel/setup.c | 2 +- arch/tile/lib/memchr_32.c | 35 +- arch/tile/lib/spinlock_32.c | 29 +- arch/um/drivers/line.c | 5 +- arch/x86/include/asm/fixmap.h | 4 +- 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 | 21 +- arch/x86/xen/mmu.c | 86 +- arch/x86/xen/setup.c | 12 +- drivers/char/virtio_console.c | 37 +- drivers/hwmon/i5k_amb.c | 2 + drivers/hwmon/lis3lv02d_i2c.c | 10 +- drivers/leds/leds-lp5521.c | 50 +- drivers/leds/leds-lp5523.c | 44 +- drivers/leds/leds-ss4200.c | 1 + drivers/md/md.c | 6 +- drivers/md/raid1.c | 1 + drivers/misc/isl29020.c | 4 +- drivers/misc/sgi-xp/xpc_partition.c | 25 +- drivers/net/Kconfig | 12 + drivers/net/Makefile | 1 + drivers/net/atl1c/atl1c_hw.c | 2 +- drivers/net/e1000/e1000_main.c | 12 +- drivers/net/irda/sh_sir.c | 2 +- drivers/net/phy/marvell.c | 164 ++- drivers/net/qlge/qlge_main.c | 6 +- drivers/net/tile/Makefile | 10 + drivers/net/tile/tilepro.c | 2406 ++++++++++++++++++ drivers/pci/Makefile | 1 + drivers/pci/quirks.c | 18 + drivers/scsi/arm/fas216.h | 2 +- drivers/sh/clk/core.c | 16 +- drivers/sh/clk/cpg.c | 7 +- drivers/usb/atm/ueagle-atm.c | 7 +- drivers/usb/gadget/atmel_usba_udc.c | 2 +- drivers/usb/host/ehci-dbg.c | 2 +- drivers/usb/host/ehci-hcd.c | 10 +- drivers/usb/host/ehci-mem.c | 26 +- drivers/usb/host/ehci-pci.c | 13 + drivers/usb/host/ehci-sched.c | 21 +- drivers/usb/host/ehci.h | 2 + drivers/usb/host/isp1362-hcd.c | 2 +- drivers/usb/host/xhci-mem.c | 4 +- drivers/usb/host/xhci-ring.c | 1 - drivers/usb/host/xhci.c | 73 +- drivers/usb/host/xhci.h | 5 + drivers/usb/misc/cypress_cy7c63.c | 6 +- drivers/usb/misc/trancevibrator.c | 2 +- drivers/usb/misc/usbled.c | 2 +- drivers/usb/misc/usbsevseg.c | 10 +- drivers/usb/otg/langwell_otg.c | 9 +- drivers/usb/storage/sierra_ms.c | 2 +- drivers/video/backlight/backlight.c | 12 +- drivers/video/fbcmap.c | 66 +- drivers/video/geode/lxfb_ops.c | 4 +- drivers/video/mx3fb.c | 4 + drivers/video/sh_mobile_lcdcfb.c | 4 +- drivers/video/sis/init.c | 685 +----- drivers/video/sis/init.h | 63 +- drivers/video/sis/init301.c | 467 ++--- drivers/video/sis/init301.h | 43 +- drivers/video/sis/initextlfb.c | 7 +- drivers/video/sis/osdef.h | 133 - drivers/video/sis/sis.h | 1 - drivers/video/sis/sis_main.c | 30 +- drivers/video/sis/vgatypes.h | 11 - drivers/video/sis/vstruct.h | 12 - drivers/virtio/virtio.c | 6 +- drivers/virtio/virtio_ring.c | 3 - drivers/xen/Makefile | 5 +- drivers/xen/balloon.c | 32 +- drivers/xen/events.c | 13 +- drivers/xen/evtchn.c | 100 +- drivers/xen/xenfs/privcmd.c | 13 +- drivers/xen/xenfs/super.c | 46 +- fs/fuse/file.c | 10 + fs/proc/task_mmu.c | 3 +- fs/reiserfs/ioctl.c | 7 +- include/linux/fb.h | 1 + include/linux/fs.h | 6 +- include/linux/marvell_phy.h | 1 + include/linux/mfd/wm8350/audio.h | 3 - include/linux/module.h | 2 +- include/linux/page_cgroup.h | 7 +- include/linux/sh_clk.h | 34 +- include/video/da8xx-fb.h | 1 - include/xen/interface/memory.h | 13 + include/xen/page.h | 7 + include/xen/privcmd.h | 5 +- init/Kconfig | 13 + mm/memcontrol.c | 66 +- mm/nommu.c | 1 + mm/page_alloc.c | 14 +- mm/pagewalk.c | 5 +- net/ceph/buffer.c | 2 +- net/core/request_sock.c | 4 +- net/ipv4/fib_trie.c | 2 +- net/ipv6/addrconf.c | 6 +- net/xfrm/xfrm_hash.c | 2 +- scripts/gfp-translate | 7 +- sound/atmel/abdac.c | 4 +- sound/core/pcm_lib.c | 2 +- sound/oss/dev_table.c | 6 +- sound/oss/midibuf.c | 4 +- sound/oss/pss.c | 6 +- sound/oss/sequencer.c | 4 +- sound/pci/asihpi/hpioctl.c | 2 +- sound/pci/azt3328.c | 26 +- sound/pci/ctxfi/ctpcm.c | 16 +- sound/pci/hda/patch_conexant.c | 2 + sound/pci/hda/patch_realtek.c | 28 +- sound/pci/hda/patch_sigmatel.c | 18 +- sound/pci/intel8x0.c | 6 + sound/pci/mixart/mixart_hwdep.h | 10 + sound/ppc/pmac.c | 12 +- sound/soc/atmel/Kconfig | 5 +- sound/soc/codecs/max98088.c | 11 +- sound/soc/codecs/uda134x.c | 1 + sound/soc/codecs/wm8350.c | 9 +- sound/soc/codecs/wm8776.c | 1 - sound/soc/codecs/wm8962.c | 5 +- sound/soc/codecs/wm8994.c | 2 + sound/soc/davinci/davinci-evm.c | 40 +- sound/soc/davinci/davinci-i2s.c | 15 +- sound/soc/davinci/davinci-mcasp.c | 13 +- sound/soc/davinci/davinci-sffsdr.c | 2 +- sound/soc/davinci/davinci-vcif.c | 13 +- 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 | 44 +- sound/soc/imx/imx-ssi.h | 4 + sound/soc/imx/phycore-ac97.c | 5 +- sound/soc/omap/omap-mcbsp.c | 8 + sound/soc/pxa/corgi.c | 5 + sound/soc/pxa/magician.c | 4 + sound/soc/pxa/poodle.c | 5 + sound/soc/pxa/spitz.c | 5 + sound/soc/pxa/tosa.c | 5 + sound/soc/s3c24xx/Kconfig | 1 + sound/soc/s3c24xx/rx1950_uda1380.c | 20 +- sound/soc/soc-core.c | 9 +- sound/soc/soc-dapm.c | 4 +- sound/spi/at73c213.c | 2 +- 201 files changed, 8830 insertions(+), 2265 deletions(-) delete mode 100644 Documentation/sh/clk.txt delete mode 100644 arch/tile/include/asm/pci-bridge.h create mode 100644 arch/tile/include/hv/drv_xgbe_impl.h create mode 100644 arch/tile/include/hv/drv_xgbe_intf.h create mode 100644 arch/tile/include/hv/netio_errors.h create mode 100644 arch/tile/include/hv/netio_intf.h create mode 100644 arch/tile/kernel/pci.c create mode 100644 drivers/net/tile/Makefile create mode 100644 drivers/net/tile/tilepro.c delete mode 100644 drivers/video/sis/osdef.h Merging fixes/fixes $ git merge fixes/fixes Already up-to-date. Merging arm-current/master $ git merge arm-current/master Already up-to-date. Merging m68k-current/for-linus $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge $ git merge powerpc-merge/merge Already up-to-date. Merging sparc-current/master $ git merge sparc-current/master Already up-to-date. Merging scsi-rc-fixes/master $ git merge scsi-rc-fixes/master Already up-to-date. Merging net-current/master $ git merge net-current/master Merge made by recursive. drivers/isdn/icn/icn.c | 7 +- drivers/net/wireless/ath/ath9k/recv.c | 2 +- drivers/net/wireless/ath/carl9170/main.c | 2 +- drivers/net/wireless/b43/sdio.c | 1 + drivers/ssb/b43_pci_bridge.c | 1 + include/linux/pci_ids.h | 1 + net/econet/af_econet.c | 91 ++++++++++++++---------------- net/ipv4/tcp.c | 2 +- net/unix/garbage.c | 7 ++ 9 files changed, 59 insertions(+), 55 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 Already up-to-date. Merging wireless-current/master $ git merge wireless-current/master Already up-to-date. 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 Removing Documentation/driver-model/interface.txt Auto-merging MAINTAINERS Merge made by recursive. Documentation/driver-model/interface.txt | 129 ------------------------------ MAINTAINERS | 2 +- drivers/uio/uio.c | 2 +- drivers/uio/uio_cif.c | 2 +- drivers/uio/uio_netx.c | 2 +- include/linux/cpu.h | 5 - include/linux/node.h | 5 - include/linux/uio_driver.h | 2 +- 8 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 Documentation/driver-model/interface.txt Merging tty.current/tty-linus $ git merge tty.current/tty-linus Merge made by recursive. drivers/serial/8250.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging usb.current/usb-linus $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus $ git merge staging.current/staging-linus Merge made by recursive. drivers/staging/asus_oled/asus_oled.c | 8 +- drivers/staging/comedi/drivers/usbdux.c | 4 +- drivers/staging/frontier/tranzport.c | 2 +- drivers/staging/iio/accel/adis16220_core.c | 2 +- .../staging/intel_sst/intel_sst_stream_encoded.c | 2 +- drivers/staging/line6/control.c | 204 ++++++++++---------- drivers/staging/line6/midi.c | 4 +- drivers/staging/line6/pcm.c | 4 +- drivers/staging/line6/pod.c | 32 ++-- drivers/staging/line6/toneport.c | 4 +- drivers/staging/line6/variax.c | 12 +- drivers/staging/quickstart/quickstart.c | 10 +- drivers/staging/rtl8187se/r8185b_init.c | 32 +++- drivers/staging/rtl8712/usb_halinit.c | 2 +- drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- drivers/staging/speakup/fakekey.c | 1 - drivers/staging/spectra/ffsport.c | 2 +- drivers/staging/udlfb/udlfb.c | 2 +- drivers/staging/winbond/sysdef.h | 3 + drivers/staging/zram/zram_sysfs.c | 4 +- 20 files changed, 179 insertions(+), 157 deletions(-) Merging cpufreq-current/fixes $ git merge cpufreq-current/fixes Merge made by recursive. arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) Merging input-current/for-linus $ git merge input-current/for-linus Merge made by recursive. drivers/input/touchscreen/usbtouchscreen.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Merging md-current/for-linus $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master $ git merge crypto-current/master Already up-to-date. Merging ide-curent/master $ git merge ide-curent/master Already up-to-date. Merging dwmw2/master $ git merge dwmw2/master Already up-to-date. Merging sh-current/sh-fixes-for-linus $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging rmobile-current/rmobile-fixes-for-linus $ git merge rmobile-current/rmobile-fixes-for-linus Auto-merging arch/arm/mach-shmobile/clock-sh7372.c Merge made by recursive. arch/arm/mach-shmobile/clock-sh7372.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Merging fbdev-current/fbdev-fixes-for-linus $ git merge fbdev-current/fbdev-fixes-for-linus Already up-to-date. Merging gcl-current/merge $ git merge gcl-current/merge Already up-to-date. Merging arm/devel $ git merge arm/devel Auto-merging arch/arm/include/asm/assembler.h 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 +- arch/arm/include/asm/hardirq.h | 18 ++ arch/arm/include/asm/hardware/entry-macro-gic.S | 68 +++++ .../plat => include/asm/hardware}/timer-sp.h | 0 arch/arm/include/asm/mach/irq.h | 2 +- arch/arm/include/asm/smp.h | 8 +- 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 | 6 +- arch/arm/kernel/fiq.c | 10 +- arch/arm/kernel/irq.c | 23 ++- arch/arm/kernel/smp.c | 159 +++++------- 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-cns3xxx/include/mach/entry-macro.S | 61 +----- arch/arm/mach-integrator/integrator_cp.c | 2 +- arch/arm/mach-msm/include/mach/smp.h | 4 +- arch/arm/mach-omap2/include/mach/entry-macro.S | 92 +++----- arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mach-realview/core.c | 2 +- arch/arm/mach-realview/include/mach/entry-macro.S | 60 +----- arch/arm/mach-realview/include/mach/smp.h | 4 +- arch/arm/mach-realview/platsmp.c | 2 +- arch/arm/mach-s5pv310/include/mach/smp.h | 4 +- arch/arm/mach-s5pv310/platsmp.c | 2 +- arch/arm/mach-sa1100/cpu-sa1100.c | 51 ++-- arch/arm/mach-tegra/include/mach/entry-macro.S | 64 +----- arch/arm/mach-tegra/include/mach/smp.h | 11 +- arch/arm/mach-ux500/include/mach/entry-macro.S | 67 +----- arch/arm/mach-ux500/include/mach/smp.h | 4 +- arch/arm/mach-ux500/platsmp.c | 2 +- arch/arm/mach-versatile/core.c | 2 +- arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- arch/arm/mach-vexpress/include/mach/entry-macro.S | 57 +---- arch/arm/mach-vexpress/include/mach/smp.h | 4 +- arch/arm/mach-vexpress/platsmp.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-omap/include/plat/smp.h | 4 +- arch/arm/plat-versatile/Makefile | 1 - drivers/mmc/host/mmci.c | 180 +++++++++++-- drivers/mmc/host/mmci.h | 9 + drivers/rtc/rtc-sa1100.c | 63 ++++- 56 files changed, 965 insertions(+), 659 deletions(-) create mode 100644 Documentation/arm/swp_emulation rename arch/arm/{plat-versatile => common}/timer-sp.c (98%) create mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S 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 Merge made by recursive. arch/arm/mach-davinci/Kconfig | 4 +++- arch/arm/mach-davinci/aemif.c | 2 +- arch/arm/mach-davinci/board-da850-evm.c | 14 +++++++------- arch/arm/mach-davinci/clock.c | 4 ++-- arch/arm/mach-davinci/devices-tnetv107x.c | 15 ++++++++++++++- arch/arm/mach-davinci/psc.c | 13 ++++--------- arch/arm/mach-davinci/time.c | 24 +++++++++++++++++++++++- arch/arm/mach-davinci/tnetv107x.c | 23 ++++++++++++----------- 8 files changed, 66 insertions(+), 33 deletions(-) Merging i.MX/for-next $ git merge i.MX/for-next Removing arch/arm/mach-imx/devices.c Removing arch/arm/mach-imx/devices.h Removing arch/arm/mach-mx25/Kconfig Removing arch/arm/mach-mx25/Makefile Removing arch/arm/mach-mx25/Makefile.boot Removing arch/arm/mach-mx25/devices-imx25.h Removing arch/arm/mach-mx25/devices.c Removing arch/arm/mach-mx25/devices.h Removing arch/arm/plat-mxc/devices/platform-esdhc.c Merge made by recursive. arch/arm/Makefile | 2 +- arch/arm/configs/mx3_defconfig | 1 + arch/arm/mach-imx/Kconfig | 132 ++++- arch/arm/mach-imx/Makefile | 8 +- arch/arm/mach-imx/Makefile.boot | 4 + .../{mach-mx25/clock.c => mach-imx/clock-imx25.c} | 0 arch/arm/mach-imx/clock-imx27.c | 22 +- arch/arm/mach-imx/cpu-imx27.c | 14 +- arch/arm/mach-imx/devices-imx21.h | 24 + arch/arm/mach-imx/devices-imx25.h | 87 +++ arch/arm/mach-imx/devices-imx27.h | 35 ++ arch/arm/mach-imx/devices.c | 553 -------------------- arch/arm/mach-imx/devices.h | 29 - arch/arm/mach-imx/dma-v1.c | 2 +- arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 17 +- .../eukrea_mbimxsd25-baseboard.c} | 10 +- arch/arm/mach-imx/mach-cpuimx27.c | 21 +- .../mach-eukrea_cpuimx25.c} | 19 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 12 +- arch/arm/mach-imx/mach-imx27lite.c | 1 - arch/arm/mach-imx/mach-mx1ads.c | 1 - arch/arm/mach-imx/mach-mx21ads.c | 20 +- arch/arm/{mach-mx25 => mach-imx}/mach-mx25_3ds.c | 22 +- arch/arm/mach-imx/mach-mx27_3ds.c | 11 +- arch/arm/mach-imx/mach-mx27ads.c | 17 +- arch/arm/mach-imx/mach-mxt_td60.c | 11 +- arch/arm/mach-imx/mach-pca100.c | 33 +- arch/arm/mach-imx/mach-pcm038.c | 12 +- arch/arm/mach-imx/mach-scb9328.c | 1 - arch/arm/mach-imx/mm-imx1.c | 7 +- arch/arm/mach-imx/mm-imx21.c | 21 +- arch/arm/{mach-mx25/mm.c => mach-imx/mm-imx25.c} | 27 +- arch/arm/mach-imx/mm-imx27.c | 21 +- arch/arm/mach-imx/pcm970-baseboard.c | 12 +- arch/arm/mach-imx/pm-imx27.c | 3 + arch/arm/mach-mx25/Kconfig | 34 -- arch/arm/mach-mx25/Makefile | 5 - arch/arm/mach-mx25/Makefile.boot | 3 - arch/arm/mach-mx25/devices-imx25.h | 54 -- arch/arm/mach-mx25/devices.c | 308 ----------- arch/arm/mach-mx25/devices.h | 13 - arch/arm/mach-mx3/Kconfig | 81 +++- arch/arm/mach-mx3/Makefile | 7 +- arch/arm/mach-mx3/clock-imx31.c | 2 +- arch/arm/mach-mx3/cpu.c | 31 +- arch/arm/mach-mx3/devices-imx31.h | 27 + arch/arm/mach-mx3/devices-imx35.h | 41 ++- arch/arm/mach-mx3/devices.c | 271 +--------- arch/arm/mach-mx3/devices.h | 10 - arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 4 +- arch/arm/mach-mx3/mach-armadillo5x0.c | 14 +- arch/arm/mach-mx3/mach-cpuimx35.c | 22 +- arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 +- arch/arm/mach-mx3/mach-mx31_3ds.c | 12 +- arch/arm/mach-mx3/mach-mx31lilly.c | 9 +- arch/arm/mach-mx3/mach-mx31lite.c | 5 +- arch/arm/mach-mx3/mach-mx31moboard.c | 20 +- arch/arm/mach-mx3/mach-mx35_3ds.c | 15 +- arch/arm/mach-mx3/mach-pcm037.c | 23 +- arch/arm/mach-mx3/mach-pcm043.c | 34 +- arch/arm/mach-mx3/mm.c | 84 ++-- arch/arm/mach-mx3/mx31lilly-db.c | 5 +- arch/arm/mach-mx3/mx31lite-db.c | 8 +- arch/arm/mach-mx3/mx31moboard-devboard.c | 20 +- arch/arm/mach-mx3/mx31moboard-marxbot.c | 21 +- arch/arm/mach-mx3/mx31moboard-smartbot.c | 16 +- arch/arm/mach-mx5/Kconfig | 10 +- arch/arm/mach-mx5/Makefile | 2 +- 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 | 50 ++- arch/arm/mach-mx5/board-mx51_efikamx.c | 245 +++++++++- .../mach-mx5/{clock-mx51.c => clock-mx51-mx53.c} | 75 +++- arch/arm/mach-mx5/cpu.c | 118 +++-- arch/arm/mach-mx5/crm_regs.h | 6 +- arch/arm/mach-mx5/devices-imx51.h | 9 +- arch/arm/mach-mx5/devices.c | 27 + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 6 +- arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 4 +- arch/arm/mach-mx5/mm.c | 73 ++- arch/arm/mach-mxc91231/mm.c | 53 +-- arch/arm/plat-mxc/Kconfig | 15 +- arch/arm/plat-mxc/Makefile | 5 +- arch/arm/plat-mxc/audmux-v2.c | 4 +- arch/arm/plat-mxc/{irq.c => avic.c} | 0 arch/arm/plat-mxc/devices.c | 23 +- arch/arm/plat-mxc/devices/Kconfig | 52 ++- arch/arm/plat-mxc/devices/Makefile | 16 +- arch/arm/plat-mxc/devices/platform-esdhc.c | 71 --- arch/arm/plat-mxc/devices/platform-fec.c | 6 +- arch/arm/plat-mxc/devices/platform-flexcan.c | 48 ++- arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 56 ++ arch/arm/plat-mxc/devices/platform-imx-dma.c | 123 ++++- arch/arm/plat-mxc/devices/platform-imx-fb.c | 52 ++ arch/arm/plat-mxc/devices/platform-imx-i2c.c | 12 +- arch/arm/plat-mxc/devices/platform-imx-keypad.c | 62 +++ arch/arm/plat-mxc/devices/platform-imx-ssi.c | 12 +- arch/arm/plat-mxc/devices/platform-imx-uart.c | 12 +- arch/arm/plat-mxc/devices/platform-imx2-wdt.c | 56 ++ arch/arm/plat-mxc/devices/platform-imx21-hcd.c | 41 ++ arch/arm/plat-mxc/devices/platform-imx_udc.c | 75 +++ arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | 41 ++ arch/arm/plat-mxc/devices/platform-mx1-camera.c | 42 ++ arch/arm/plat-mxc/devices/platform-mx2-camera.c | 64 +++ arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 69 +++ arch/arm/plat-mxc/devices/platform-mxc-mmc.c | 72 +++ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 8 +- arch/arm/plat-mxc/devices/platform-mxc_pwm.c | 60 +++ arch/arm/plat-mxc/devices/platform-mxc_rnga.c | 56 ++ arch/arm/plat-mxc/devices/platform-mxc_w1.c | 50 ++ .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 74 +++ arch/arm/plat-mxc/devices/platform-spi_imx.c | 12 +- arch/arm/plat-mxc/ehci.c | 8 +- arch/arm/plat-mxc/gpio.c | 97 ++++- arch/arm/plat-mxc/include/mach/common.h | 7 +- arch/arm/plat-mxc/include/mach/debug-macro.S | 23 +- arch/arm/plat-mxc/include/mach/devices-common.h | 173 ++++++- arch/arm/plat-mxc/include/mach/hardware.h | 88 +++- arch/arm/plat-mxc/include/mach/imxfb.h | 3 + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 28 +- arch/arm/plat-mxc/include/mach/iomux-mx53.h | 303 +++++++++++ arch/arm/plat-mxc/include/mach/iomux-v3.h | 38 ++- arch/arm/plat-mxc/include/mach/memory.h | 5 +- arch/arm/plat-mxc/include/mach/mx1.h | 155 +----- arch/arm/plat-mxc/include/mach/mx21.h | 50 +-- arch/arm/plat-mxc/include/mach/mx25.h | 41 +- arch/arm/plat-mxc/include/mach/mx27.h | 105 +--- arch/arm/plat-mxc/include/mach/mx2x.h | 149 ------ arch/arm/plat-mxc/include/mach/mx31.h | 87 +--- arch/arm/plat-mxc/include/mach/mx35.h | 51 +-- arch/arm/plat-mxc/include/mach/mx3x.h | 198 +------- arch/arm/plat-mxc/include/mach/mx51.h | 55 +-- arch/arm/plat-mxc/include/mach/mx53.h | 353 +++++++++++++ arch/arm/plat-mxc/include/mach/mxc.h | 16 + arch/arm/plat-mxc/include/mach/mxc91231.h | 23 +- arch/arm/plat-mxc/include/mach/sdma.h | 46 ++ arch/arm/plat-mxc/iomux-v3.c | 22 +- arch/arm/plat-mxc/ssi-fiq.S | 2 + arch/arm/plat-mxc/system.c | 8 + drivers/dma/imx-sdma.c | 174 +++---- 141 files changed, 3704 insertions(+), 3001 deletions(-) rename arch/arm/{mach-mx25/clock.c => mach-imx/clock-imx25.c} (100%) create mode 100644 arch/arm/mach-imx/devices-imx25.h delete mode 100644 arch/arm/mach-imx/devices.c delete mode 100644 arch/arm/mach-imx/devices.h rename arch/arm/{mach-mx25/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd25-baseboard.c} (96%) rename arch/arm/{mach-mx25/mach-cpuimx25.c => mach-imx/mach-eukrea_cpuimx25.c} (89%) rename arch/arm/{mach-mx25 => mach-imx}/mach-mx25_3ds.c (90%) rename arch/arm/{mach-mx25/mm.c => mach-imx/mm-imx25.c} (69%) delete mode 100644 arch/arm/mach-mx25/Kconfig delete mode 100644 arch/arm/mach-mx25/Makefile delete mode 100644 arch/arm/mach-mx25/Makefile.boot delete mode 100644 arch/arm/mach-mx25/devices-imx25.h delete mode 100644 arch/arm/mach-mx25/devices.c delete mode 100644 arch/arm/mach-mx25/devices.h rename arch/arm/mach-mx5/{clock-mx51.c => clock-mx51-mx53.c} (94%) rename arch/arm/plat-mxc/{irq.c => avic.c} (100%) delete mode 100644 arch/arm/plat-mxc/devices/platform-esdhc.c create mode 100644 arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx-fb.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx-keypad.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx2-wdt.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx21-hcd.c create mode 100644 arch/arm/plat-mxc/devices/platform-imx_udc.c create mode 100644 arch/arm/plat-mxc/devices/platform-imxdi_rtc.c create mode 100644 arch/arm/plat-mxc/devices/platform-mx1-camera.c create mode 100644 arch/arm/plat-mxc/devices/platform-mx2-camera.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc-ehci.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc-mmc.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_pwm.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rnga.c create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_w1.c create mode 100644 arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h create mode 100644 arch/arm/plat-mxc/include/mach/mx53.h Merging msm/for-next $ git merge msm/for-next Merge made by recursive. arch/arm/mach-msm/io.c | 1 + arch/arm/mach-msm/sirc.c | 3 --- arch/arm/mach-msm/smd.c | 17 ++++++----------- arch/arm/mach-msm/smd_debug.c | 2 ++ 4 files changed, 9 insertions(+), 14 deletions(-) Merging omap/for-next $ git merge omap/for-next Merge made by recursive. arch/arm/mach-omap1/Kconfig | 11 +- arch/arm/mach-omap1/Makefile | 4 +- arch/arm/mach-omap1/board-ams-delta.c | 2 - arch/arm/mach-omap1/serial.c | 6 +- arch/arm/mach-omap2/Kconfig | 15 + arch/arm/mach-omap2/Makefile | 3 + arch/arm/mach-omap2/board-4430sdp.c | 14 + arch/arm/mach-omap2/board-am3517crane.c | 69 ++ arch/arm/mach-omap2/board-omap4panda.c | 16 + arch/arm/mach-omap2/board-rx51-peripherals.c | 12 +- arch/arm/mach-omap2/cm-regbits-24xx.h | 4 + arch/arm/mach-omap2/mux.c | 369 ++++-- arch/arm/mach-omap2/mux.h | 83 ++- arch/arm/mach-omap2/mux2420.c | 10 +- arch/arm/mach-omap2/mux2430.c | 10 +- arch/arm/mach-omap2/mux34xx.c | 9 +- arch/arm/mach-omap2/mux44xx.c | 1625 +++++++++++++++++++++++++ arch/arm/mach-omap2/mux44xx.h | 298 +++++ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 145 +++- arch/arm/mach-omap2/omap_hwmod_2430_data.c | 155 +++- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 233 ++++ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 237 ++++ arch/arm/mach-omap2/prm-regbits-34xx.h | 3 + arch/arm/mach-omap2/serial.c | 15 +- arch/arm/plat-omap/gpio.c | 5 + arch/arm/plat-omap/i2c.c | 124 +-- arch/arm/plat-omap/include/plat/i2c.h | 13 + arch/arm/plat-omap/include/plat/l4_3xxx.h | 24 + arch/arm/plat-omap/include/plat/omap-serial.h | 3 - arch/arm/plat-omap/include/plat/uncompress.h | 1 + arch/arm/plat-omap/mcbsp.c | 16 +- drivers/i2c/busses/i2c-omap.c | 69 +- drivers/input/serio/Kconfig | 1 - drivers/serial/omap-serial.c | 6 +- include/linux/i2c-omap.h | 5 + include/linux/serial_reg.h | 12 + 36 files changed, 3314 insertions(+), 313 deletions(-) create mode 100644 arch/arm/mach-omap2/board-am3517crane.c create mode 100644 arch/arm/mach-omap2/mux44xx.c create mode 100644 arch/arm/mach-omap2/mux44xx.h create mode 100644 arch/arm/plat-omap/include/plat/l4_3xxx.h 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 Merge made by recursive. arch/arm/mach-s3c2410/h1940-bluetooth.c | 8 +- arch/arm/mach-s3c2416/irq.c | 5 +- arch/arm/mach-s3c2443/irq.c | 5 +- arch/arm/mach-s3c64xx/clock.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 60 +++-- arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- arch/arm/mach-s5p6442/dev-audio.c | 44 +++- arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 2 +- arch/arm/mach-s5p64x0/dev-audio.c | 55 ++--- arch/arm/mach-s5pc100/dev-audio.c | 54 +++- arch/arm/mach-s5pv210/clock.c | 10 +- arch/arm/mach-s5pv210/dev-audio.c | 56 +++- arch/arm/mach-s5pv210/mach-smdkc110.c | 1 + arch/arm/mach-s5pv210/mach-smdkv210.c | 1 + arch/arm/mach-s5pv310/Kconfig | 1 + arch/arm/mach-s5pv310/Makefile | 3 +- arch/arm/mach-s5pv310/dev-audio.c | 364 ++++++++++++++++++++++++++ arch/arm/mach-s5pv310/dma.c | 168 ++++++++++++ arch/arm/mach-s5pv310/include/mach/dma.h | 26 ++ arch/arm/mach-s5pv310/include/mach/irqs.h | 3 + arch/arm/mach-s5pv310/include/mach/map.h | 21 ++ arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 6 +- arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 6 +- arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 6 +- arch/arm/plat-samsung/include/plat/audio.h | 24 ++ arch/arm/plat-samsung/include/plat/devs.h | 9 + 28 files changed, 822 insertions(+), 124 deletions(-) create mode 100644 arch/arm/mach-s5pv310/dev-audio.c create mode 100644 arch/arm/mach-s5pv310/dma.c create mode 100644 arch/arm/mach-s5pv310/include/mach/dma.h 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/boards/ad7160eval.c | 1 + arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 + arch/blackfin/mach-bf527/boards/ezbrd.c | 1 + arch/blackfin/mach-bf527/boards/ezkit.c | 1 + 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/boards/cm_bf548.c | 1 + arch/blackfin/mach-bf548/boards/ezkit.c | 1 + 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 + 102 files changed, 8445 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/m68k/include/asm/mcfcache.h Removing arch/m68knommu/mm/fault.c Removing arch/m68knommu/mm/memory.c Merge made by recursive. arch/m68k/include/asm/cacheflush_no.h | 95 ++++++-------- 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 | 14 ++- arch/m68k/include/asm/m520xsim.h | 17 +++- arch/m68k/include/asm/m523xsim.h | 11 ++ arch/m68k/include/asm/m5249sim.h | 10 ++ arch/m68k/include/asm/m5272sim.h | 8 + arch/m68k/include/asm/m527xsim.h | 10 ++ arch/m68k/include/asm/m528xsim.h | 11 ++ arch/m68k/include/asm/m52xxacr.h | 94 ++++++++++++++ arch/m68k/include/asm/m5307sim.h | 43 +++---- arch/m68k/include/asm/m532xsim.h | 33 ++---- arch/m68k/include/asm/m53xxacr.h | 101 +++++++++++++++ arch/m68k/include/asm/m5407sim.h | 42 +----- arch/m68k/include/asm/m54xxacr.h | 97 ++++++++++++++ arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 23 +++- arch/m68k/include/asm/mcfcache.h | 150 ---------------------- arch/m68k/include/asm/mcfsim.h | 4 +- arch/m68k/include/asm/mcfuart.h | 45 +------- arch/m68k/include/asm/processor.h | 13 +- arch/m68knommu/Kconfig | 99 +++++++++++++-- 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 | 4 +- arch/m68knommu/platform/coldfire/cache.c | 48 +++++++ arch/m68knommu/platform/coldfire/entry.S | 56 ++------- arch/m68knommu/platform/coldfire/head.S | 26 +++- 37 files changed, 722 insertions(+), 617 deletions(-) create mode 100644 arch/m68k/include/asm/m52xxacr.h create mode 100644 arch/m68k/include/asm/m53xxacr.h 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} (73%) delete mode 100644 arch/m68k/include/asm/mcfcache.h 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%) create mode 100644 arch/m68knommu/platform/coldfire/cache.c Merging microblaze/next $ git merge microblaze/next Merge made by recursive. arch/microblaze/kernel/vmlinux.lds.S | 16 +++------------- arch/microblaze/lib/memmove.c | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) 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/Kconfig | 128 ++++++----- arch/s390/Kconfig.debug | 6 +- arch/s390/defconfig | 152 +++++-------- arch/s390/include/asm/hardirq.h | 16 -- arch/s390/include/asm/irq.h | 25 +- arch/s390/include/asm/kprobes.h | 20 +-- arch/s390/include/asm/timex.h | 20 ++ arch/s390/kernel/irq.c | 32 +++- arch/s390/kernel/kprobes.c | 465 +++++++++++++++++++-------------------- arch/s390/kernel/nmi.c | 13 +- arch/s390/kernel/smp.c | 1 + arch/s390/kernel/time.c | 3 + arch/s390/kernel/vtime.c | 1 + arch/s390/kvm/Kconfig | 7 +- arch/s390/lib/delay.c | 16 +- arch/s390/mm/fault.c | 2 + drivers/s390/block/Kconfig | 24 ++- drivers/s390/block/dasd_diag.c | 2 + drivers/s390/char/Kconfig | 69 ++++--- drivers/s390/char/sclp.c | 6 +- drivers/s390/cio/qdio_main.c | 2 + drivers/s390/cio/qdio_thinint.c | 2 + drivers/s390/kvm/kvm_virtio.c | 3 + drivers/s390/net/Kconfig | 51 +++-- net/iucv/iucv.c | 2 + 25 files changed, 544 insertions(+), 524 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 Auto-merging arch/arm/mach-shmobile/clock-sh7372.c Auto-merging arch/arm/mm/Kconfig Merge made by recursive. .mailmap | 1 + arch/arm/Kconfig | 9 +- arch/arm/configs/ag5evm_defconfig | 83 + arch/arm/mach-shmobile/Kconfig | 26 +- arch/arm/mach-shmobile/Makefile | 3 + arch/arm/mach-shmobile/board-ag5evm.c | 222 ++ arch/arm/mach-shmobile/board-ap4evb.c | 147 +- arch/arm/mach-shmobile/clock-sh7372.c | 29 +- arch/arm/mach-shmobile/clock-sh73a0.c | 120 + arch/arm/mach-shmobile/include/mach/common.h | 5 + .../mach-shmobile/include/mach/entry-macro-gic.S | 89 + .../mach-shmobile/include/mach/entry-macro-intc.S | 39 + arch/arm/mach-shmobile/include/mach/entry-macro.S | 30 +- arch/arm/mach-shmobile/include/mach/irqs.h | 3 + arch/arm/mach-shmobile/include/mach/sh73a0.h | 446 ++++ arch/arm/mach-shmobile/pfc-sh73a0.c | 2679 ++++++++++++++++++++ arch/arm/mach-shmobile/setup-sh73a0.c | 349 +++ arch/arm/mm/Kconfig | 2 +- drivers/serial/sh-sci.h | 7 + include/sound/sh_fsi.h | 6 +- sound/soc/sh/fsi.c | 25 +- 21 files changed, 4215 insertions(+), 105 deletions(-) create mode 100644 arch/arm/configs/ag5evm_defconfig create mode 100644 arch/arm/mach-shmobile/board-ag5evm.c create mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro-gic.S create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro-intc.S create mode 100644 arch/arm/mach-shmobile/include/mach/sh73a0.h create mode 100644 arch/arm/mach-shmobile/pfc-sh73a0.c create mode 100644 arch/arm/mach-shmobile/setup-sh73a0.c 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 efac955] 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 Auto-merging fs/ceph/dir.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/mds_client.c Auto-merging fs/ceph/super.c Merge made by recursive. fs/ceph/dir.c | 20 ++++++++++++++++++++ fs/ceph/export.c | 2 +- fs/ceph/inode.c | 4 ++++ fs/ceph/mds_client.c | 32 +++++++++++++++++++++----------- fs/ceph/mds_client.h | 1 + fs/ceph/super.c | 3 ++- fs/ceph/super.h | 2 ++ include/linux/ceph/ceph_fs.h | 16 +++++++++++++--- net/ceph/ceph_hash.c | 3 +++ 9 files changed, 67 insertions(+), 16 deletions(-) Merging cifs/master $ git merge cifs/master Merge made by recursive. fs/cifs/Kconfig | 1 + fs/cifs/cifsacl.c | 44 ++++++++++++++++++++++++++------------------ fs/cifs/cifsproto.h | 2 +- fs/cifs/file.c | 4 +++- fs/cifs/inode.c | 12 ++++++------ fs/cifs/readdir.c | 29 ++++++++++++++++------------- 6 files changed, 53 insertions(+), 39 deletions(-) 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/crypto.c | 30 ++++++++++++++---------------- fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- fs/ecryptfs/file.c | 28 +++++++++++++--------------- fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ fs/ecryptfs/keystore.c | 26 +++++++++++++------------- fs/ecryptfs/kthread.c | 19 +++++++++++++++---- fs/ecryptfs/main.c | 12 +++++++----- fs/ecryptfs/mmap.c | 35 +++++++++++++++++++++-------------- include/linux/magic.h | 1 + 9 files changed, 100 insertions(+), 88 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/glock.c | 31 ++++++++++++++++++------------- fs/gfs2/glock.h | 2 ++ fs/gfs2/inode.c | 9 --------- fs/gfs2/ops_inode.c | 18 +----------------- fs/gfs2/quota.c | 28 +++++++++++++++++++--------- fs/gfs2/xattr.c | 23 +---------------------- 6 files changed, 41 insertions(+), 70 deletions(-) Merging hfsplus/for-next $ git merge hfsplus/for-next Merge made by recursive. fs/hfsplus/bnode.c | 2 +- fs/hfsplus/brec.c | 2 +- fs/hfsplus/btree.c | 2 +- fs/hfsplus/catalog.c | 10 ++- fs/hfsplus/dir.c | 1 + fs/hfsplus/extents.c | 50 ++++++++++----- fs/hfsplus/hfsplus_fs.h | 83 +++++++++++++----------- fs/hfsplus/inode.c | 63 ++++++++++++------- fs/hfsplus/ioctl.c | 4 +- fs/hfsplus/options.c | 37 +++++++++++ fs/hfsplus/part_tbl.c | 124 ++++++++++++++++++++--------------- fs/hfsplus/super.c | 96 ++++++++++++++++------------ fs/hfsplus/wrapper.c | 163 ++++++++++++++++++++++++++++++----------------- 13 files changed, 400 insertions(+), 237 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 6dce2d2] 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/nfs/dir.c | 62 +++++++++++++++++++++++++--------------------- fs/nfs/direct.c | 2 +- fs/nfs/internal.h | 9 +++++++ fs/nfs/nfs2xdr.c | 4 ++- fs/nfs/nfs3xdr.c | 4 ++- fs/nfs/nfs4xdr.c | 6 ++++- include/linux/nfs_xdr.h | 1 + net/sunrpc/clnt.c | 24 +++++++++++------- 8 files changed, 71 insertions(+), 41 deletions(-) Merging nfsd/nfsd-next $ git merge nfsd/nfsd-next Auto-merging fs/nfsd/nfs4state.c Auto-merging net/sunrpc/svc_xprt.c Merge made by recursive. fs/nfsd/nfs4state.c | 11 ++++-- fs/nfsd/nfs4xdr.c | 22 ++++++++---- net/sunrpc/svc_xprt.c | 87 +++++++++++++++++++++++-------------------------- 3 files changed, 64 insertions(+), 56 deletions(-) Merging nilfs2/for-next $ git merge nilfs2/for-next Auto-merging MAINTAINERS Merge made by recursive. MAINTAINERS | 1 + fs/nilfs2/bmap.c | 45 +++++++++++++++++++++++++++++++++++---------- fs/nilfs2/dat.c | 2 +- fs/nilfs2/ifile.c | 11 +++-------- fs/nilfs2/inode.c | 19 +++++-------------- fs/nilfs2/ioctl.c | 4 ++-- fs/nilfs2/mdt.c | 6 ------ fs/nilfs2/segment.c | 30 +++++------------------------- fs/nilfs2/super.c | 23 ++++++++++++++++------- 9 files changed, 68 insertions(+), 73 deletions(-) Merging ocfs2/linux-next $ git merge ocfs2/linux-next Merge made by recursive. fs/ocfs2/cluster/heartbeat.c | 14 ++++++++++---- fs/ocfs2/dcache.c | 1 - fs/ocfs2/dlm/dlmdomain.c | 2 +- fs/ocfs2/ocfs2.h | 6 +++--- fs/ocfs2/stack_user.c | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) 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 Resolved 'drivers/pci/pci-sysfs.c' using previous resolution. Auto-merging drivers/pci/msi.c Auto-merging drivers/pci/pci-sysfs.c CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c Auto-merging drivers/pci/proc.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 232da95] Merge remote branch 'pci/linux-next' $ git diff -M --stat --summary HEAD^.. drivers/pci/msi.c | 5 +++-- drivers/pci/msi.h | 6 ------ include/linux/pci_regs.h | 8 ++++++++ 3 files changed, 11 insertions(+), 8 deletions(-) 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 e02d7d5] Merge remote branch 'hid/for-next' $ git diff -M --stat --summary HEAD^.. drivers/hid/Kconfig | 10 +++ drivers/hid/Makefile | 13 ++-- 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 +- drivers/hid/hid-prodikeys.c | 6 +- drivers/hid/hid-wacom.c | 2 +- drivers/hid/usbhid/Makefile | 6 +- drivers/input/mouse/bcm5974.c | 40 ++++++++++ 12 files changed, 294 insertions(+), 20 deletions(-) create mode 100644 drivers/hid/hid-emsff.c Merging quilt/i2c $ git merge quilt/i2c Merge made by recursive. drivers/i2c/busses/i2c-nforce2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging bjdooks-i2c/next-i2c $ git merge bjdooks-i2c/next-i2c Merge made by recursive. drivers/i2c/busses/Kconfig | 8 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-eg20t.c | 900 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 909 insertions(+), 0 deletions(-) create mode 100644 drivers/i2c/busses/i2c-eg20t.c Merging quilt/jdelvare-hwmon $ git merge quilt/jdelvare-hwmon Merge made by recursive. Documentation/feature-removal-schedule.txt | 10 +++++ Documentation/hwmon/adm9240 | 2 +- Documentation/hwmon/w83793 | 2 +- drivers/hwmon/adm9240.c | 32 +++++++++++++++-- drivers/hwmon/it87.c | 30 +++++++-------- drivers/hwmon/lm78.c | 14 ++++---- drivers/hwmon/pc87360.c | 53 ++++++++++++---------------- drivers/hwmon/pc87427.c | 26 +++++++------- drivers/hwmon/w83781d.c | 29 +++++++-------- drivers/hwmon/w83792d.c | 44 +++++++++++++++++++++-- drivers/hwmon/w83793.c | 33 ++++++++++++++++-- 11 files changed, 183 insertions(+), 92 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/adt7470.c | 4 +- drivers/hwmon/applesmc.c | 1632 +++++++++++++++--------------------------- 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/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/lm95241.c | 495 ++++++------- 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 +- 28 files changed, 1004 insertions(+), 1525 deletions(-) Merging quilt/kernel-doc $ git merge quilt/kernel-doc Already up-to-date. Merging v4l-dvb/master $ git merge v4l-dvb/master Removing drivers/input/misc/winbond-cir.c Removing drivers/media/IR/ir-functions.c Removing drivers/media/IR/ir-keytable.c Removing drivers/media/IR/ir-sysfs.c Removing drivers/media/IR/rc-map.c Removing drivers/media/dvb/frontends/s921_core.c Removing drivers/media/dvb/frontends/s921_core.h Removing drivers/media/dvb/frontends/s921_module.c Removing drivers/media/dvb/frontends/s921_module.h Auto-merging drivers/media/dvb/ngene/ngene-core.c Auto-merging drivers/media/video/cx88/cx88-video.c Auto-merging drivers/media/video/pwc/pwc-if.c Auto-merging drivers/media/video/saa7164/saa7164.h Removing include/media/ir-common.h Removing include/media/ir-core.h Merge made by recursive. Documentation/dvb/lmedm04.txt | 2 +- Documentation/video4linux/CARDLIST.em28xx | 2 +- drivers/input/misc/Kconfig | 18 - drivers/input/misc/Makefile | 1 - drivers/input/misc/winbond-cir.c | 1608 ------------------- drivers/media/IR/ir-functions.c | 356 ----- drivers/media/IR/ir-keytable.c | 710 --------- drivers/media/IR/ir-sysfs.c | 362 ----- drivers/media/IR/rc-map.c | 107 -- drivers/media/Kconfig | 2 +- drivers/media/Makefile | 2 +- drivers/media/common/tuners/max2165.c | 10 +- drivers/media/dvb/dm1105/Kconfig | 3 +- drivers/media/dvb/dm1105/dm1105.c | 44 +- drivers/media/dvb/dvb-usb/Kconfig | 10 +- drivers/media/dvb/dvb-usb/Makefile | 3 + drivers/media/dvb/dvb-usb/a800.c | 6 +- drivers/media/dvb/dvb-usb/af9005-remote.c | 16 +- drivers/media/dvb/dvb-usb/af9005.c | 16 +- drivers/media/dvb/dvb-usb/af9005.h | 4 +- drivers/media/dvb/dvb-usb/af9015.c | 22 +- drivers/media/dvb/dvb-usb/anysee.c | 4 +- drivers/media/dvb/dvb-usb/az6027.c | 6 +- drivers/media/dvb/dvb-usb/cinergyT2-core.c | 6 +- drivers/media/dvb/dvb-usb/cxusb.c | 62 +- drivers/media/dvb/dvb-usb/dib0700.h | 2 +- drivers/media/dvb/dvb-usb/dib0700_core.c | 18 +- drivers/media/dvb/dvb-usb/dib0700_devices.c | 146 +- drivers/media/dvb/dvb-usb/dibusb-common.c | 4 +- drivers/media/dvb/dvb-usb/dibusb-mb.c | 16 +- drivers/media/dvb/dvb-usb/dibusb-mc.c | 4 +- drivers/media/dvb/dvb-usb/dibusb.h | 2 +- drivers/media/dvb/dvb-usb/digitv.c | 14 +- drivers/media/dvb/dvb-usb/dtt200u.c | 18 +- drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 103 +- drivers/media/dvb/dvb-usb/dvb-usb.h | 29 +- drivers/media/dvb/dvb-usb/dw2102.c | 54 +- drivers/media/dvb/dvb-usb/gp8psk.c | 28 + drivers/media/dvb/dvb-usb/gp8psk.h | 8 +- drivers/media/dvb/dvb-usb/lmedm04.c | 202 ++-- drivers/media/dvb/dvb-usb/m920x.c | 24 +- drivers/media/dvb/dvb-usb/nova-t-usb2.c | 18 +- drivers/media/dvb/dvb-usb/opera1.c | 16 +- drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 ++++++++++ drivers/media/dvb/dvb-usb/vp702x.c | 12 +- drivers/media/dvb/dvb-usb/vp7045.c | 12 +- drivers/media/dvb/frontends/Kconfig | 10 +- drivers/media/dvb/frontends/Makefile | 2 +- drivers/media/dvb/frontends/atbm8830.c | 8 +- drivers/media/dvb/frontends/au8522_decoder.c | 51 +- drivers/media/dvb/frontends/au8522_priv.h | 2 + drivers/media/dvb/frontends/ix2505v.c | 2 +- drivers/media/dvb/frontends/lgs8gxx.c | 11 +- drivers/media/dvb/frontends/mb86a20s.c | 615 +++++++ drivers/media/dvb/frontends/mb86a20s.h | 52 + drivers/media/dvb/frontends/s921.c | 548 +++++++ drivers/media/dvb/frontends/s921.h | 47 + drivers/media/dvb/frontends/s921_core.c | 216 --- drivers/media/dvb/frontends/s921_core.h | 114 -- drivers/media/dvb/frontends/s921_module.c | 192 --- drivers/media/dvb/frontends/s921_module.h | 49 - drivers/media/dvb/frontends/stb0899_drv.c | 2 +- drivers/media/dvb/frontends/stb6100.c | 198 ++- drivers/media/dvb/frontends/stv090x.c | 22 + drivers/media/dvb/frontends/stv090x.h | 15 + drivers/media/dvb/mantis/Kconfig | 2 +- drivers/media/dvb/mantis/hopper_cards.c | 2 + drivers/media/dvb/mantis/hopper_vp3028.c | 6 +- drivers/media/dvb/mantis/mantis_cards.c | 2 + drivers/media/dvb/mantis/mantis_common.h | 4 +- drivers/media/dvb/mantis/mantis_dvb.c | 17 +- drivers/media/dvb/mantis/mantis_input.c | 76 +- drivers/media/dvb/mantis/mantis_ioc.c | 4 +- drivers/media/dvb/mantis/mantis_ioc.h | 2 +- drivers/media/dvb/mantis/mantis_vp1033.c | 2 +- drivers/media/dvb/mantis/mantis_vp1034.c | 10 +- drivers/media/dvb/mantis/mantis_vp1041.c | 6 +- drivers/media/dvb/mantis/mantis_vp2033.c | 4 +- drivers/media/dvb/mantis/mantis_vp2040.c | 4 +- drivers/media/dvb/mantis/mantis_vp3030.c | 8 +- drivers/media/dvb/ngene/ngene-core.c | 3 +- drivers/media/dvb/siano/Kconfig | 2 +- drivers/media/dvb/siano/smscoreapi.c | 2 +- drivers/media/dvb/siano/smsir.c | 52 +- drivers/media/dvb/siano/smsir.h | 5 +- drivers/media/dvb/ttpci/Kconfig | 3 +- drivers/media/dvb/ttpci/budget-ci.c | 53 +- drivers/media/radio/radio-aimslab.c | 16 +- drivers/media/radio/radio-aztech.c | 6 +- drivers/media/radio/radio-cadet.c | 12 +- drivers/media/radio/radio-gemtek-pci.c | 6 +- drivers/media/radio/radio-gemtek.c | 14 +- drivers/media/radio/radio-maestro.c | 14 +- drivers/media/radio/radio-maxiradio.c | 2 +- drivers/media/radio/radio-miropcm20.c | 6 +- drivers/media/radio/radio-rtrack2.c | 10 +- drivers/media/radio/radio-sf16fmi.c | 7 +- drivers/media/radio/radio-sf16fmr2.c | 11 +- drivers/media/radio/radio-si4713.c | 5 +- drivers/media/radio/radio-tea5764.c | 49 +- drivers/media/radio/radio-terratec.c | 8 +- drivers/media/radio/radio-timb.c | 5 +- drivers/media/radio/radio-trust.c | 18 +- drivers/media/radio/radio-typhoon.c | 16 +- drivers/media/radio/radio-zoltrix.c | 30 +- drivers/media/radio/si4713-i2c.c | 74 +- drivers/media/radio/si4713-i2c.h | 5 +- drivers/media/{IR => rc}/Kconfig | 57 +- drivers/media/{IR => rc}/Makefile | 7 +- drivers/media/{IR => rc}/ene_ir.c | 131 +- drivers/media/{IR => rc}/ene_ir.h | 3 +- drivers/media/{IR => rc}/imon.c | 105 +- drivers/media/{IR => rc}/ir-jvc-decoder.c | 17 +- drivers/media/{IR => rc}/ir-lirc-codec.c | 127 +- drivers/media/{IR => rc}/ir-nec-decoder.c | 19 +- drivers/media/{IR/ir-raw-event.c => rc/ir-raw.c} | 195 ++-- drivers/media/{IR => rc}/ir-rc5-decoder.c | 17 +- drivers/media/{IR => rc}/ir-rc5-sz-decoder.c | 17 +- drivers/media/{IR => rc}/ir-rc6-decoder.c | 21 +- drivers/media/{IR => rc}/ir-sony-decoder.c | 15 +- drivers/media/{IR => rc}/keymaps/Kconfig | 2 +- drivers/media/{IR => rc}/keymaps/Makefile | 1 + .../{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-anysee.c | 10 +- .../media/{IR => rc}/keymaps/rc-apac-viewcomp.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c | 10 +- .../{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-a16d.c | 10 +- .../{IR => rc}/keymaps/rc-avermedia-cardbus.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-dvbt.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-m135a.c | 10 +- .../{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c | 10 +- .../media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-avermedia.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-avertv-303.c | 10 +- .../{IR => rc}/keymaps/rc-azurewave-ad-tu700.c | 10 +- .../media/{IR => rc}/keymaps/rc-behold-columbus.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-behold.c | 10 +- .../media/{IR => rc}/keymaps/rc-budget-ci-old.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-cinergy.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c | 10 +- .../{IR => rc}/keymaps/rc-digitalnow-tinytwin.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-digittrade.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c | 10 +- .../media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c | 10 +- .../{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-em-terratec.c | 10 +- .../{IR => rc}/keymaps/rc-encore-enltv-fm53.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c | 10 +- .../media/{IR => rc}/keymaps/rc-encore-enltv2.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-eztv.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-flydvb.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-flyvideo.c | 10 +- .../media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c | 10 +- .../media/{IR => rc}/keymaps/rc-gadmei-rm008z.c | 10 +- .../{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-gotview7135.c | 10 +- .../media/{IR => rc}/keymaps/rc-hauppauge-new.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-imon-mce.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-imon-pad.c | 10 +- .../media/{IR => rc}/keymaps/rc-iodata-bctv7e.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-kaiomy.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c | 10 +- .../{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c | 10 +- .../media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-lirc.c | 12 +- drivers/media/{IR => rc}/keymaps/rc-lme2510.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-manli.c | 10 +- .../media/{IR => rc}/keymaps/rc-msi-digivox-ii.c | 10 +- .../media/{IR => rc}/keymaps/rc-msi-digivox-iii.c | 10 +- .../{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c | 10 +- .../media/{IR => rc}/keymaps/rc-msi-tvanywhere.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-nebula.c | 10 +- .../keymaps/rc-nec-terratec-cinergy-xs.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-norwood.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-npgtech.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c | 10 +- .../media/{IR => rc}/keymaps/rc-pinnacle-color.c | 10 +- .../media/{IR => rc}/keymaps/rc-pinnacle-grey.c | 10 +- .../media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c | 10 +- .../media/{IR => rc}/keymaps/rc-pixelview-mk12.c | 10 +- .../media/{IR => rc}/keymaps/rc-pixelview-new.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-pixelview.c | 10 +- .../{IR => rc}/keymaps/rc-powercolor-real-angel.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-purpletv.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-pv951.c | 10 +- .../{IR => rc}/keymaps/rc-rc5-hauppauge-new.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c | 31 +- .../{IR => rc}/keymaps/rc-real-audio-220-32-keys.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-streamzap.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-tbs-nec.c | 10 +- drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 ++ .../{IR => rc}/keymaps/rc-terratec-cinergy-xs.c | 10 +- .../media/{IR => rc}/keymaps/rc-terratec-slim.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c | 10 +- .../{IR => rc}/keymaps/rc-total-media-in-hand.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-trekstor.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-tt-1500.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c | 10 +- .../media/{IR => rc}/keymaps/rc-videomate-s350.c | 10 +- .../media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c | 10 +- .../{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c | 10 +- drivers/media/{IR => rc}/keymaps/rc-winfast.c | 10 +- drivers/media/{IR => rc}/lirc_dev.c | 0 drivers/media/{IR => rc}/mceusb.c | 238 ++-- drivers/media/{IR => rc}/nuvoton-cir.c | 97 +- drivers/media/{IR => rc}/nuvoton-cir.h | 3 +- .../media/{IR/ir-core-priv.h => rc/rc-core-priv.h} | 28 +- drivers/media/rc/rc-main.c | 1135 +++++++++++++ drivers/media/{IR => rc}/streamzap.c | 68 +- drivers/media/rc/winbond-cir.c | 932 +++++++++++ drivers/media/video/Kconfig | 11 +- drivers/media/video/Makefile | 1 + drivers/media/video/arv.c | 2 +- drivers/media/video/au0828/au0828-cards.c | 4 +- drivers/media/video/au0828/au0828-video.c | 106 ++- drivers/media/video/au0828/au0828.h | 6 +- drivers/media/video/bt8xx/Kconfig | 4 +- drivers/media/video/bt8xx/bttv-cards.c | 22 +- drivers/media/video/bt8xx/bttv-input.c | 183 ++- drivers/media/video/bt8xx/bttv.h | 1 - drivers/media/video/bt8xx/bttvp.h | 44 +- drivers/media/video/bw-qcam.c | 2 +- drivers/media/video/c-qcam.c | 2 +- drivers/media/video/cafe_ccic.c | 10 +- drivers/media/video/cx18/Kconfig | 3 +- drivers/media/video/cx18/cx18-alsa-pcm.c | 8 +- drivers/media/video/cx18/cx18-i2c.c | 10 +- drivers/media/video/cx18/cx18-streams.c | 2 +- drivers/media/video/cx231xx/Kconfig | 19 +- drivers/media/video/cx231xx/Makefile | 5 +- drivers/media/video/cx231xx/cx231xx-417.c | 4 +- drivers/media/video/cx231xx/cx231xx-avcore.c | 1 + drivers/media/video/cx231xx/cx231xx-cards.c | 63 +- drivers/media/video/cx231xx/cx231xx-core.c | 4 +- drivers/media/video/cx231xx/cx231xx-dvb.c | 40 + drivers/media/video/cx231xx/cx231xx-input.c | 101 ++ drivers/media/video/cx231xx/cx231xx.h | 26 +- drivers/media/video/cx23885/Kconfig | 2 +- drivers/media/video/cx23885/cx23885-cards.c | 2 +- drivers/media/video/cx23885/cx23885-input.c | 70 +- drivers/media/video/cx23885/cx23885-video.c | 4 +- drivers/media/video/cx23885/cx23885.h | 5 +- drivers/media/video/cx23885/cx23888-ir.c | 2 +- drivers/media/video/cx25840/cx25840-ir.c | 2 +- drivers/media/video/cx88/Kconfig | 3 +- drivers/media/video/cx88/cx88-cards.c | 9 +- drivers/media/video/cx88/cx88-input.c | 241 +-- drivers/media/video/cx88/cx88-video.c | 7 +- drivers/media/video/davinci/vpfe_capture.c | 1 - drivers/media/video/davinci/vpif_capture.c | 1 - drivers/media/video/davinci/vpif_display.c | 2 +- drivers/media/video/em28xx/Kconfig | 5 +- drivers/media/video/em28xx/em28xx-cards.c | 84 +- drivers/media/video/em28xx/em28xx-dvb.c | 16 + drivers/media/video/em28xx/em28xx-input.c | 78 +- drivers/media/video/em28xx/em28xx.h | 4 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- drivers/media/video/fsl-viu.c | 2 +- drivers/media/video/gspca/cpia1.c | 12 +- drivers/media/video/gspca/gspca.c | 16 +- drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 +- drivers/media/video/gspca/ov519.c | 1679 ++++++++++++-------- drivers/media/video/gspca/pac207.c | 4 +- drivers/media/video/gspca/sonixb.c | 4 +- drivers/media/video/gspca/sonixj.c | 18 +- drivers/media/video/gspca/spca561.c | 2 +- drivers/media/video/gspca/stv06xx/stv06xx.c | 57 +- drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 11 +- drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 18 +- drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 3 + drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 4 + drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 21 +- drivers/media/video/gspca/stv06xx/stv06xx_st6422.h | 3 + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 9 +- drivers/media/video/gspca/t613.c | 2 +- drivers/media/video/gspca/tv8532.c | 2 +- drivers/media/video/gspca/w996Xcf.c | 325 ++--- drivers/media/video/gspca/xirlink_cit.c | 194 ++- drivers/media/video/gspca/zc3xx.c | 2 +- drivers/media/video/imx074.c | 1 - drivers/media/video/ir-kbd-i2c.c | 75 +- drivers/media/video/ivtv/Kconfig | 3 +- drivers/media/video/ivtv/ivtv-i2c.c | 28 +- drivers/media/video/meye.c | 14 +- drivers/media/video/mt9m001.c | 1 - drivers/media/video/mt9m111.c | 1 - drivers/media/video/mt9t031.c | 1 - drivers/media/video/mt9v022.c | 1 - drivers/media/video/mx3_camera.c | 3 +- drivers/media/video/mxb.c | 12 +- drivers/media/video/pms.c | 2 +- drivers/media/video/pvrusb2/pvrusb2-hdw.c | 6 +- drivers/media/video/pwc/pwc-ctrl.c | 7 +- drivers/media/video/pwc/pwc-if.c | 68 +- drivers/media/video/pwc/pwc-v4l.c | 13 +- drivers/media/video/pwc/pwc.h | 1 - drivers/media/video/rj54n1cb0c.c | 1 - drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- drivers/media/video/s5p-fimc/fimc-core.c | 2 +- drivers/media/video/saa7134/Kconfig | 2 +- drivers/media/video/saa7134/saa7134-cards.c | 118 ++- drivers/media/video/saa7134/saa7134-core.c | 4 +- drivers/media/video/saa7134/saa7134-dvb.c | 69 + drivers/media/video/saa7134/saa7134-input.c | 365 +---- drivers/media/video/saa7134/saa7134-tvaudio.c | 12 +- drivers/media/video/saa7134/saa7134.h | 26 +- drivers/media/video/saa7164/saa7164-api.c | 123 +- drivers/media/video/saa7164/saa7164-buffer.c | 92 +- drivers/media/video/saa7164/saa7164-bus.c | 16 +- drivers/media/video/saa7164/saa7164-cards.c | 2 +- drivers/media/video/saa7164/saa7164-cmd.c | 10 +- drivers/media/video/saa7164/saa7164-core.c | 40 +- drivers/media/video/saa7164/saa7164-encoder.c | 33 +- drivers/media/video/saa7164/saa7164-fw.c | 8 +- drivers/media/video/saa7164/saa7164-i2c.c | 4 +- drivers/media/video/saa7164/saa7164-vbi.c | 37 +- drivers/media/video/saa7164/saa7164.h | 17 +- drivers/media/video/sh_vou.c | 15 +- drivers/media/video/sn9c102/sn9c102_core.c | 2 +- drivers/media/video/soc_camera.c | 2 +- drivers/media/video/sr030pc30.c | 2 +- drivers/media/video/tea6415c.c | 2 +- drivers/media/video/timblogiw.c | 894 +++++++++++ drivers/media/video/tlg2300/Kconfig | 4 +- drivers/media/video/usbvision/usbvision-i2c.c | 6 +- drivers/media/video/v4l2-common.c | 15 +- drivers/media/video/v4l2-dev.c | 85 +- drivers/media/video/v4l2-device.c | 1 + drivers/media/video/via-camera.c | 2 +- drivers/media/video/videobuf-dma-sg.c | 3 +- drivers/media/video/vino.c | 4 +- drivers/media/video/w9966.c | 2 +- drivers/media/video/zoran/zoran_card.c | 5 +- drivers/mfd/timberdale.c | 61 +- drivers/mfd/timberdale.h | 2 +- drivers/staging/cx25821/Kconfig | 4 +- drivers/staging/cx25821/cx25821-alsa.c | 71 +- drivers/staging/cx25821/cx25821-audio-upstream.c | 66 +- drivers/staging/cx25821/cx25821-cards.c | 2 + drivers/staging/cx25821/cx25821-core.c | 191 ++-- drivers/staging/cx25821/cx25821-i2c.c | 19 +- drivers/staging/cx25821/cx25821-medusa-video.c | 7 +- .../staging/cx25821/cx25821-video-upstream-ch2.c | 63 +- drivers/staging/cx25821/cx25821-video-upstream.c | 90 +- drivers/staging/cx25821/cx25821-video.c | 82 +- drivers/staging/cx25821/cx25821-video.h | 9 +- drivers/staging/cx25821/cx25821.h | 9 +- drivers/staging/go7007/Kconfig | 4 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/tm6000/Kconfig | 2 +- drivers/staging/tm6000/tm6000-cards.c | 11 +- drivers/staging/tm6000/tm6000-core.c | 27 +- drivers/staging/tm6000/tm6000-i2c.c | 39 +- drivers/staging/tm6000/tm6000-input.c | 100 +- include/media/ir-common.h | 107 -- include/media/ir-core.h | 214 --- include/media/ir-kbd-i2c.h | 13 +- include/media/rc-core.h | 220 +++ include/media/rc-map.h | 43 +- include/media/si4713.h | 3 +- include/media/timb_radio.h | 1 - include/media/timb_video.h | 33 + include/media/v4l2-common.h | 16 +- include/media/v4l2-device.h | 2 + 372 files changed, 10794 insertions(+), 8467 deletions(-) delete mode 100644 drivers/input/misc/winbond-cir.c delete mode 100644 drivers/media/IR/ir-functions.c delete mode 100644 drivers/media/IR/ir-keytable.c delete mode 100644 drivers/media/IR/ir-sysfs.c delete mode 100644 drivers/media/IR/rc-map.c create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c create mode 100644 drivers/media/dvb/frontends/mb86a20s.c create mode 100644 drivers/media/dvb/frontends/mb86a20s.h create mode 100644 drivers/media/dvb/frontends/s921.c create mode 100644 drivers/media/dvb/frontends/s921.h delete mode 100644 drivers/media/dvb/frontends/s921_core.c delete mode 100644 drivers/media/dvb/frontends/s921_core.h delete mode 100644 drivers/media/dvb/frontends/s921_module.c delete mode 100644 drivers/media/dvb/frontends/s921_module.h rename drivers/media/{IR => rc}/Kconfig (81%) rename drivers/media/{IR => rc}/Makefile (78%) rename drivers/media/{IR => rc}/ene_ir.c (91%) rename drivers/media/{IR => rc}/ene_ir.h (99%) rename drivers/media/{IR => rc}/imon.c (96%) rename drivers/media/{IR => rc}/ir-jvc-decoder.c (91%) rename drivers/media/{IR => rc}/ir-lirc-codec.c (71%) rename drivers/media/{IR => rc}/ir-nec-decoder.c (92%) rename drivers/media/{IR/ir-raw-event.c => rc/ir-raw.c} (62%) rename drivers/media/{IR => rc}/ir-rc5-decoder.c (91%) rename drivers/media/{IR => rc}/ir-rc5-sz-decoder.c (88%) rename drivers/media/{IR => rc}/ir-rc6-decoder.c (92%) rename drivers/media/{IR => rc}/ir-sony-decoder.c (91%) rename drivers/media/{IR => rc}/keymaps/Kconfig (96%) rename drivers/media/{IR => rc}/keymaps/Makefile (98%) rename drivers/media/{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-anysee.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-apac-viewcomp.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-a16d.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-cardbus.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-dvbt.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m135a.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avermedia.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-avertv-303.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-azurewave-ad-tu700.c (93%) rename drivers/media/{IR => rc}/keymaps/rc-behold-columbus.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-behold.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-budget-ci-old.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-cinergy.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c (93%) rename drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c (96%) rename drivers/media/{IR => rc}/keymaps/rc-digitalnow-tinytwin.c (93%) rename drivers/media/{IR => rc}/keymaps/rc-digittrade.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-em-terratec.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv-fm53.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv2.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c (85%) rename drivers/media/{IR => rc}/keymaps/rc-eztv.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-flydvb.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-flyvideo.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-gadmei-rm008z.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-gotview7135.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-hauppauge-new.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-imon-mce.c (95%) rename drivers/media/{IR => rc}/keymaps/rc-imon-pad.c (95%) rename drivers/media/{IR => rc}/keymaps/rc-iodata-bctv7e.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-kaiomy.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-lirc.c (79%) rename drivers/media/{IR => rc}/keymaps/rc-lme2510.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-manli.c (94%) rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-ii.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-iii.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-nebula.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-nec-terratec-cinergy-xs.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-norwood.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-npgtech.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-color.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-grey.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-pixelview-mk12.c (90%) rename drivers/media/{IR => rc}/keymaps/rc-pixelview-new.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-pixelview.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-powercolor-real-angel.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-purpletv.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-pv951.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-rc5-hauppauge-new.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c (76%) rename drivers/media/{IR => rc}/keymaps/rc-real-audio-220-32-keys.c (86%) rename drivers/media/{IR => rc}/keymaps/rc-streamzap.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-tbs-nec.c (88%) create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c rename drivers/media/{IR => rc}/keymaps/rc-terratec-cinergy-xs.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-terratec-slim.c (91%) rename drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-total-media-in-hand.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-trekstor.c (92%) rename drivers/media/{IR => rc}/keymaps/rc-tt-1500.c (89%) rename drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-videomate-s350.c (88%) rename drivers/media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c (87%) rename drivers/media/{IR => rc}/keymaps/rc-winfast.c (92%) rename drivers/media/{IR => rc}/lirc_dev.c (100%) rename drivers/media/{IR => rc}/mceusb.c (89%) rename drivers/media/{IR => rc}/nuvoton-cir.c (95%) rename drivers/media/{IR => rc}/nuvoton-cir.h (99%) rename drivers/media/{IR/ir-core-priv.h => rc/rc-core-priv.h} (84%) create mode 100644 drivers/media/rc/rc-main.c rename drivers/media/{IR => rc}/streamzap.c (92%) create mode 100644 drivers/media/rc/winbond-cir.c create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c create mode 100644 drivers/media/video/timblogiw.c delete mode 100644 include/media/ir-common.h delete mode 100644 include/media/ir-core.h create mode 100644 include/media/rc-core.h create mode 100644 include/media/timb_video.h $ git am -3 ../patches/0001-media-const-and-__devinitdata-do-not-mix.patch Applying: media: const and __devinitdata do not mix $ git reset HEAD^ Unstaged changes after reset: M drivers/media/video/timblogiw.c $ git add . $ git commit -v -a --amend [master c4c43aa] Merge remote branch 'v4l-dvb/master' Merging kbuild/for-next $ git merge kbuild/for-next Merge made by recursive. scripts/basic/fixdep.c | 109 ++++++++++++++++++++++++++-------------------- scripts/package/builddeb | 6 ++- 2 files changed, 65 insertions(+), 50 deletions(-) Merging kconfig/for-next $ git merge kconfig/for-next Already up-to-date! Merge made by recursive. Merging ide/master $ git merge ide/master Already up-to-date. Merging libata/NEXT $ git merge libata/NEXT Merge made by recursive. drivers/ata/Kconfig | 8 + drivers/ata/Makefile | 1 + drivers/ata/acard-ahci.c | 528 +++++++++++++++++++++++++++++++++++ drivers/ata/ahci.h | 3 + drivers/ata/libahci.c | 11 +- drivers/ata/libata-scsi.c | 60 ++--- drivers/scsi/ipr.c | 2 +- drivers/scsi/libsas/sas_scsi_host.c | 3 +- include/linux/libata.h | 6 +- 9 files changed, 574 insertions(+), 48 deletions(-) create mode 100644 drivers/ata/acard-ahci.c Merging infiniband/for-next $ git merge infiniband/for-next Already up-to-date. Merging acpi/test $ git merge acpi/test Merge made by recursive. drivers/pnp/Makefile | 6 ++++-- drivers/pnp/core.c | 7 +------ drivers/pnp/isapnp/Makefile | 6 +++--- drivers/pnp/pnpacpi/Makefile | 3 ++- drivers/pnp/pnpbios/Makefile | 5 +++-- include/acpi/video.h | 3 +++ 6 files changed, 16 insertions(+), 14 deletions(-) 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/net.c | 160 ++++++++++++++++++++--------------- drivers/firewire/nosy.c | 3 +- drivers/firewire/ohci.c | 30 +++--- 8 files changed, 145 insertions(+), 106 deletions(-) Merging ubi/linux-next $ git merge ubi/linux-next Merge made by recursive. drivers/mtd/ubi/scan.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) Merging kvm/linux-next $ git merge kvm/linux-next Auto-merging Documentation/kernel-parameters.txt Merge made by recursive. Documentation/kernel-parameters.txt | 3 + Documentation/kvm/api.txt | 178 +++++++++++++++++++ Documentation/kvm/cpuid.txt | 3 + Documentation/kvm/msr.txt | 36 ++++- arch/ia64/include/asm/kvm_host.h | 4 + arch/ia64/kvm/kvm-ia64.c | 28 +--- arch/powerpc/kvm/book3s.c | 4 +- arch/powerpc/kvm/powerpc.c | 20 +-- arch/s390/kvm/kvm-s390.c | 23 +-- arch/x86/include/asm/kvm_emulate.h | 5 +- arch/x86/include/asm/kvm_host.h | 30 +++- arch/x86/include/asm/kvm_para.h | 24 +++ arch/x86/include/asm/traps.h | 1 + arch/x86/include/asm/vmx.h | 1 + arch/x86/kernel/entry_32.S | 10 + arch/x86/kernel/entry_64.S | 3 + arch/x86/kernel/kvm.c | 315 ++++++++++++++++++++++++++++++++++ arch/x86/kernel/kvmclock.c | 13 +-- arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/Makefile | 3 +- arch/x86/kvm/emulate.c | 121 ++++++------- arch/x86/kvm/lapic.c | 3 +- arch/x86/kvm/mmu.c | 111 ++++++++++--- arch/x86/kvm/paging_tmpl.h | 36 +++-- arch/x86/kvm/svm.c | 121 ++++++++------ arch/x86/kvm/vmx.c | 85 ++++++---- arch/x86/kvm/x86.c | 254 ++++++++++++++++++++++++---- fs/ncpfs/mmap.c | 2 + include/linux/kvm.h | 1 + include/linux/kvm_host.h | 71 +++++++-- include/linux/kvm_types.h | 7 + include/linux/mm.h | 5 + include/trace/events/kvm.h | 121 +++++++++++++ mm/filemap.c | 3 + mm/memory.c | 31 +++- mm/shmem.c | 8 +- virt/kvm/Kconfig | 3 + virt/kvm/assigned-dev.c | 125 +++++--------- virt/kvm/async_pf.c | 216 +++++++++++++++++++++++ virt/kvm/async_pf.h | 36 ++++ virt/kvm/kvm_main.c | 322 ++++++++++++++++++++++++++--------- 41 files changed, 1926 insertions(+), 461 deletions(-) create mode 100644 virt/kvm/async_pf.c create mode 100644 virt/kvm/async_pf.h Merging dlm/next $ git merge dlm/next Merge made by recursive. fs/dlm/lowcomms.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) Merging swiotlb/master $ git merge swiotlb/master Already up-to-date. Merging ibft/master $ git merge ibft/master Already up-to-date. Merging scsi/master $ git merge scsi/master Already up-to-date. Merging async_tx/next $ git merge async_tx/next Already up-to-date. Merging net/master $ git merge net/master Auto-merging drivers/net/Kconfig Auto-merging drivers/net/qlge/qlge_main.c Auto-merging drivers/net/wireless/ath/ath9k/recv.c Auto-merging drivers/net/wireless/ath/carl9170/main.c Auto-merging net/ipv4/tcp.c Auto-merging net/ipv6/addrconf.c Auto-merging security/selinux/hooks.c Merge made by recursive. Documentation/networking/ip-sysctl.txt | 24 +- Documentation/networking/stmmac.txt | 48 +- arch/arm/mach-omap2/board-omap3pandora.c | 32 +- drivers/atm/fore200e.c | 2 +- drivers/block/aoe/aoecmd.c | 6 +- drivers/infiniband/core/addr.c | 8 +- drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 +- drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- drivers/isdn/hisax/avm_pci.c | 2 +- drivers/isdn/hisax/callc.c | 4 +- drivers/isdn/hisax/hfc_2bds0.c | 4 +- drivers/isdn/hisax/hfc_2bs0.c | 2 +- drivers/isdn/hisax/hfc_pci.c | 4 +- drivers/isdn/hisax/hfc_sx.c | 6 +- drivers/isdn/hisax/hisax.h | 2 + drivers/isdn/hisax/ipacx.c | 2 +- drivers/isdn/hisax/isar.c | 6 +- drivers/isdn/hisax/isdnl1.h | 1 + drivers/isdn/hisax/isdnl3.c | 2 +- drivers/isdn/hisax/netjet.c | 10 +- drivers/isdn/hisax/st5481_d.c | 6 +- drivers/isdn/i4l/isdn_concap.c | 2 +- drivers/isdn/i4l/isdn_net.c | 20 +- drivers/isdn/i4l/isdn_ppp.c | 26 +- drivers/isdn/mISDN/layer1.c | 10 +- drivers/isdn/mISDN/layer2.c | 12 +- drivers/isdn/mISDN/tei.c | 23 +- drivers/net/3c507.c | 2 +- drivers/net/3c515.c | 2 +- drivers/net/82596.c | 2 +- drivers/net/Kconfig | 255 ++-- drivers/net/arm/w90p910_ether.c | 2 +- drivers/net/at1700.c | 2 +- drivers/net/atarilance.c | 2 +- drivers/net/ax88796.c | 8 +- drivers/net/bnx2x/bnx2x_link.c | 4 +- drivers/net/bnx2x/bnx2x_main.c | 2 +- drivers/net/bonding/bond_3ad.c | 3 +- drivers/net/bonding/bond_main.c | 18 +- drivers/net/bonding/bonding.h | 2 +- drivers/net/can/mscan/mscan.c | 2 +- drivers/net/can/pch_can.c | 410 +++--- drivers/net/can/sja1000/sja1000_of_platform.c | 8 +- drivers/net/cnic.c | 2 +- drivers/net/cxgb4vf/adapter.h | 2 +- drivers/net/cxgb4vf/cxgb4vf_main.c | 32 +- drivers/net/cxgb4vf/sge.c | 9 +- drivers/net/cxgb4vf/t4vf_hw.c | 5 +- drivers/net/dm9000.c | 2 +- drivers/net/e1000e/82571.c | 143 ++- drivers/net/e1000e/defines.h | 1 + drivers/net/e1000e/netdev.c | 51 +- drivers/net/eepro.c | 2 +- drivers/net/enic/enic.h | 2 +- drivers/net/enic/enic_main.c | 4 +- drivers/net/fec_mpc52xx.c | 19 +- drivers/net/igbvf/Makefile | 2 +- drivers/net/igbvf/defines.h | 2 +- drivers/net/igbvf/ethtool.c | 2 +- drivers/net/igbvf/igbvf.h | 3 +- drivers/net/igbvf/mbx.c | 2 +- drivers/net/igbvf/mbx.h | 2 +- drivers/net/igbvf/netdev.c | 11 +- drivers/net/igbvf/regs.h | 2 +- drivers/net/igbvf/vf.c | 2 +- drivers/net/igbvf/vf.h | 2 +- drivers/net/iseries_veth.c | 2 +- drivers/net/ixgbe/Makefile | 2 +- drivers/net/ixgbe/ixgbe.h | 122 +- drivers/net/ixgbe/ixgbe_82598.c | 58 +- drivers/net/ixgbe/ixgbe_82599.c | 94 +- drivers/net/ixgbe/ixgbe_common.c | 98 +- drivers/net/ixgbe/ixgbe_common.h | 5 +- drivers/net/ixgbe/ixgbe_dcb.c | 17 +- drivers/net/ixgbe/ixgbe_dcb.h | 3 +- drivers/net/ixgbe/ixgbe_dcb_82598.c | 12 +- drivers/net/ixgbe/ixgbe_dcb_82599.c | 12 +- drivers/net/ixgbe/ixgbe_dcb_nl.c | 55 +- drivers/net/ixgbe/ixgbe_ethtool.c | 255 ++-- drivers/net/ixgbe/ixgbe_fcoe.c | 15 +- drivers/net/ixgbe/ixgbe_main.c | 1997 ++++++++++++++---------- drivers/net/ixgbe/ixgbe_mbx.c | 40 +- drivers/net/ixgbe/ixgbe_mbx.h | 2 +- drivers/net/ixgbe/ixgbe_phy.c | 52 + drivers/net/ixgbe/ixgbe_phy.h | 5 + drivers/net/ixgbe/ixgbe_sriov.c | 5 +- drivers/net/ixgbe/ixgbe_type.h | 20 + drivers/net/ixgbe/ixgbe_x540.c | 722 +++++++++ drivers/net/ixgbevf/Makefile | 2 +- drivers/net/ixgbevf/defines.h | 2 +- drivers/net/ixgbevf/ixgbevf.h | 2 +- drivers/net/ixgbevf/ixgbevf_main.c | 13 +- drivers/net/ixgbevf/mbx.c | 2 +- drivers/net/ixgbevf/mbx.h | 2 +- drivers/net/ixgbevf/regs.h | 2 +- drivers/net/ixgbevf/vf.c | 2 +- drivers/net/ixgbevf/vf.h | 2 +- drivers/net/ks8851.c | 33 + drivers/net/lance.c | 2 +- drivers/net/lib82596.c | 2 +- drivers/net/lib8390.c | 24 +- drivers/net/macvlan.c | 113 +- drivers/net/ne-h8300.c | 12 +- drivers/net/pcmcia/axnet_cs.c | 18 +- drivers/net/ppp_generic.c | 12 +- drivers/net/qla3xxx.c | 8 +- drivers/net/qlcnic/qlcnic.h | 11 +- drivers/net/qlcnic/qlcnic_ctx.c | 3 + drivers/net/qlcnic/qlcnic_ethtool.c | 3 +- drivers/net/qlge/qlge.h | 4 +- drivers/net/qlge/qlge_dbg.c | 21 +- drivers/net/qlge/qlge_ethtool.c | 19 +- drivers/net/qlge/qlge_main.c | 8 +- drivers/net/qlge/qlge_mpi.c | 2 +- drivers/net/s2io.c | 3 +- drivers/net/sh_eth.c | 244 ++-- drivers/net/tg3.c | 195 ++- drivers/net/tg3.h | 19 +- drivers/net/usb/hso.c | 1 - drivers/net/usb/ipheth.c | 2 +- drivers/net/usb/pegasus.c | 4 +- drivers/net/vmxnet3/vmxnet3_drv.c | 951 +++++++++--- drivers/net/vmxnet3/vmxnet3_ethtool.c | 171 ++- drivers/net/vmxnet3/vmxnet3_int.h | 73 +- drivers/net/vxge/vxge-config.c | 1451 +++++++++--------- drivers/net/vxge/vxge-config.h | 135 ++- drivers/net/vxge/vxge-ethtool.c | 110 +- drivers/net/vxge/vxge-main.c | 563 ++++++-- drivers/net/vxge/vxge-main.h | 81 +- drivers/net/vxge/vxge-reg.h | 33 +- drivers/net/vxge/vxge-traffic.h | 28 - drivers/net/vxge/vxge-version.h | 31 +- drivers/net/wireless/ath/ath5k/base.c | 24 +- drivers/net/wireless/ath/ath5k/debug.c | 30 +- drivers/net/wireless/ath/ath5k/desc.h | 18 +- drivers/net/wireless/ath/ath5k/phy.c | 8 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 14 +- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 123 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 8 +- 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 | 14 +- drivers/net/wireless/ath/ath9k/ath9k.h | 14 +- drivers/net/wireless/ath/ath9k/beacon.c | 12 +- drivers/net/wireless/ath/ath9k/common.c | 15 +- drivers/net/wireless/ath/ath9k/common.h | 14 +- drivers/net/wireless/ath/ath9k/debug.c | 48 +- drivers/net/wireless/ath/ath9k/debug.h | 5 +- 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/htc_drv_txrx.c | 9 +- drivers/net/wireless/ath/ath9k/hw.c | 9 +- drivers/net/wireless/ath/ath9k/hw.h | 16 +- drivers/net/wireless/ath/ath9k/init.c | 88 +- drivers/net/wireless/ath/ath9k/mac.c | 86 +- drivers/net/wireless/ath/ath9k/mac.h | 13 +- drivers/net/wireless/ath/ath9k/main.c | 167 +-- 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 | 3 +- drivers/net/wireless/ath/ath9k/xmit.c | 102 +- drivers/net/wireless/ath/carl9170/carl9170.h | 5 +- drivers/net/wireless/ath/carl9170/fwcmd.h | 13 +- drivers/net/wireless/ath/carl9170/hw.h | 7 +- drivers/net/wireless/ath/carl9170/mac.c | 56 +- drivers/net/wireless/ath/carl9170/main.c | 19 +- drivers/net/wireless/ath/carl9170/phy.c | 17 +- drivers/net/wireless/ath/carl9170/phy.h | 24 +- drivers/net/wireless/ath/carl9170/tx.c | 80 +- drivers/net/wireless/ath/carl9170/usb.c | 2 +- drivers/net/wireless/ath/carl9170/version.h | 6 +- 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/b43legacy/rfkill.c | 2 +- drivers/net/wireless/iwlwifi/Kconfig | 3 + drivers/net/wireless/iwlwifi/Makefile | 7 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 13 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 22 +- drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 352 ++++- drivers/net/wireless/iwlwifi/iwl-5000.c | 26 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 46 +- drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 230 ++-- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 53 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 619 ++++++++ drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 32 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 493 +----- drivers/net/wireless/iwlwifi/iwl-agn.h | 41 +- drivers/net/wireless/iwlwifi/iwl-core.c | 841 ++-------- drivers/net/wireless/iwlwifi/iwl-core.h | 70 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + drivers/net/wireless/iwlwifi/iwl-dev.h | 3 + drivers/net/wireless/iwlwifi/iwl-led.c | 2 + drivers/net/wireless/iwlwifi/iwl-legacy.c | 662 ++++++++ drivers/net/wireless/iwlwifi/iwl-legacy.h | 79 + drivers/net/wireless/iwlwifi/iwl-power.c | 95 +- drivers/net/wireless/iwlwifi/iwl-power.h | 3 + drivers/net/wireless/iwlwifi/iwl-rx.c | 47 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 11 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 49 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 49 +- drivers/net/wireless/mac80211_hwsim.c | 5 +- drivers/net/wireless/mwl8k.c | 7 +- drivers/net/wireless/rt2x00/rt2400pci.c | 14 +- drivers/net/wireless/rt2x00/rt2400pci.h | 6 +- drivers/net/wireless/rt2x00/rt2500pci.c | 20 +- drivers/net/wireless/rt2x00/rt2500pci.h | 4 +- drivers/net/wireless/rt2x00/rt2500usb.c | 22 +- drivers/net/wireless/rt2x00/rt2800.h | 61 +- drivers/net/wireless/rt2x00/rt2800lib.c | 43 +- drivers/net/wireless/rt2x00/rt2800pci.c | 16 +- drivers/net/wireless/rt2x00/rt2800pci.h | 12 +- drivers/net/wireless/rt2x00/rt2800usb.c | 66 +- drivers/net/wireless/rt2x00/rt2800usb.h | 4 +- drivers/net/wireless/rt2x00/rt2x00.h | 1 + drivers/net/wireless/rt2x00/rt2x00config.c | 8 +- drivers/net/wireless/rt2x00/rt2x00debug.c | 10 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 37 +- drivers/net/wireless/rt2x00/rt2x00lib.h | 3 +- drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- drivers/net/wireless/rt2x00/rt2x00mac.c | 52 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 39 +- drivers/net/wireless/rt2x00/rt2x00queue.h | 33 +- drivers/net/wireless/rt2x00/rt2x00reg.h | 2 - drivers/net/wireless/rt2x00/rt2x00usb.c | 25 +- drivers/net/wireless/rt2x00/rt61pci.c | 28 +- drivers/net/wireless/rt2x00/rt61pci.h | 2 +- drivers/net/wireless/rt2x00/rt73usb.c | 22 +- drivers/net/wireless/rt2x00/rt73usb.h | 2 +- drivers/net/wireless/rtl818x/rtl8187_dev.c | 140 +- drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 22 - drivers/net/wireless/wl1251/main.c | 15 +- drivers/net/wireless/wl1251/sdio.c | 101 +- drivers/net/wireless/wl1251/spi.c | 9 + drivers/net/wireless/wl1251/wl1251.h | 1 + drivers/net/wireless/wl12xx/Kconfig | 12 +- drivers/net/wireless/wl12xx/wl1271.h | 13 +- drivers/net/wireless/wl12xx/wl1271_acx.c | 83 + drivers/net/wireless/wl12xx/wl1271_acx.h | 89 ++- drivers/net/wireless/wl12xx/wl1271_boot.c | 10 +- drivers/net/wireless/wl12xx/wl1271_debugfs.c | 215 ++-- drivers/net/wireless/wl12xx/wl1271_event.c | 2 - drivers/net/wireless/wl12xx/wl1271_main.c | 220 +++- drivers/net/wireless/wl12xx/wl1271_rx.c | 28 +- drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +- drivers/net/wireless/wl12xx/wl1271_scan.c | 5 +- drivers/net/wireless/wl12xx/wl1271_testmode.c | 12 + drivers/net/wireless/wl12xx/wl1271_tx.c | 132 ++- drivers/net/wireless/wl12xx/wl1271_tx.h | 3 +- drivers/net/wireless/zd1201.c | 1 + drivers/net/wireless/zd1211rw/zd_usb.c | 2 + drivers/net/xilinx_emaclite.c | 20 +- drivers/net/znet.c | 2 +- drivers/ssb/pcihost_wrapper.c | 7 + include/linux/bitops.h | 11 + include/linux/dccp.h | 2 + include/linux/filter.h | 50 +- include/linux/if_bridge.h | 4 +- include/linux/if_link.h | 28 + include/linux/if_macvlan.h | 34 +- include/linux/igmp.h | 14 +- include/linux/inetdevice.h | 13 +- include/linux/netdevice.h | 16 +- include/linux/netfilter.h | 2 + include/linux/nl80211.h | 6 +- include/linux/rfkill.h | 31 - include/linux/wl12xx.h | 8 + include/net/caif/cfctrl.h | 2 +- include/net/cfg80211.h | 15 +- include/net/dn_dev.h | 27 +- include/net/dn_route.h | 10 + include/net/dst.h | 8 +- include/net/flow.h | 2 + include/net/inet_sock.h | 2 +- include/net/neighbour.h | 10 +- include/net/netlink.h | 21 +- include/net/netns/generic.h | 2 +- include/net/route.h | 24 +- include/net/rtnetlink.h | 31 + include/net/sock.h | 57 +- include/net/xfrm.h | 6 + lib/nlattr.c | 22 +- net/8021q/vlan.c | 10 +- net/8021q/vlan.h | 22 +- net/8021q/vlan_core.c | 4 +- net/8021q/vlan_dev.c | 197 +-- net/8021q/vlan_netlink.c | 20 - net/8021q/vlanproc.c | 5 - net/atm/br2684.c | 2 +- net/atm/clip.c | 3 +- net/atm/lec.c | 3 +- net/bluetooth/Makefile | 2 +- net/bridge/br.c | 4 - net/bridge/br_fdb.c | 15 +- net/bridge/br_forward.c | 4 +- net/bridge/br_if.c | 7 +- net/bridge/br_input.c | 10 +- net/bridge/br_multicast.c | 78 +- net/bridge/br_netfilter.c | 22 +- net/bridge/br_netlink.c | 10 +- net/bridge/br_notify.c | 6 +- net/bridge/br_private.h | 21 +- net/bridge/br_stp_bpdu.c | 8 +- net/bridge/netfilter/ebtable_broute.c | 3 +- net/bridge/netfilter/ebtables.c | 11 +- net/caif/Makefile | 8 +- net/can/Makefile | 6 +- net/ceph/Makefile | 2 +- net/core/dev.c | 77 +- net/core/filter.c | 373 ++--- net/core/net-sysfs.c | 10 +- net/core/pktgen.c | 37 +- net/core/rtnetlink.c | 147 ++- net/core/timestamping.c | 2 +- net/dccp/ackvec.c | 616 ++++---- net/dccp/ackvec.h | 151 ++- net/dccp/ccids/ccid2.c | 143 +-- net/dccp/ccids/ccid2.h | 2 + net/dccp/dccp.h | 11 +- net/dccp/input.c | 33 +- net/dccp/ipv4.c | 13 +- net/dccp/options.c | 100 ++- net/dccp/output.c | 15 + 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 | 94 +- net/decnet/dn_rules.c | 2 +- net/dns_resolver/Makefile | 2 +- net/econet/Makefile | 2 +- net/ipv4/af_inet.c | 18 +- net/ipv4/arp.c | 12 +- net/ipv4/devinet.c | 75 + net/ipv4/fib_frontend.c | 28 +- net/ipv4/fib_semantics.c | 8 +- net/ipv4/icmp.c | 32 +- net/ipv4/igmp.c | 282 ++-- net/ipv4/inet_connection_sock.c | 15 +- net/ipv4/ip_gre.c | 43 +- net/ipv4/ip_output.c | 25 +- net/ipv4/ipip.c | 20 +- net/ipv4/ipmr.c | 20 +- net/ipv4/netfilter.c | 8 +- net/ipv4/netfilter/Makefile | 6 +- net/ipv4/raw.c | 7 +- net/ipv4/route.c | 100 +- net/ipv4/syncookies.c | 15 +- net/ipv4/tcp.c | 16 +- net/ipv4/tcp_output.c | 5 +- net/ipv4/tcp_probe.c | 4 +- net/ipv4/udp.c | 16 +- net/ipv4/xfrm4_policy.c | 47 +- net/ipv6/addrconf.c | 120 ++- net/ipv6/ip6mr.c | 4 +- net/ipv6/mcast.c | 2 +- net/ipv6/netfilter.c | 6 +- net/ipv6/netfilter/Makefile | 4 +- net/ipv6/route.c | 24 +- net/ipv6/sit.c | 14 +- net/ipv6/udp.c | 4 +- net/irda/ircomm/Makefile | 4 +- net/irda/irlan/Makefile | 2 +- net/irda/irnet/Makefile | 2 +- net/l2tp/l2tp_ip.c | 12 +- net/lapb/Makefile | 2 +- net/mac80211/aes_ccm.c | 3 +- net/mac80211/aes_cmac.c | 3 +- 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/netfilter/core.c | 6 +- net/netfilter/ipvs/ip_vs_ctl.c | 6 +- net/netfilter/ipvs/ip_vs_xmit.c | 42 +- net/netfilter/xt_TEE.c | 12 +- net/packet/af_packet.c | 87 +- net/phonet/Makefile | 4 +- net/rds/Makefile | 8 +- net/rfkill/core.c | 14 - net/rxrpc/Makefile | 4 +- net/rxrpc/ar-peer.c | 10 +- net/socket.c | 11 +- net/sunrpc/auth_gss/Makefile | 4 +- net/unix/af_unix.c | 34 +- net/wanrouter/Makefile | 2 +- net/wireless/reg.c | 134 ++- net/x25/af_x25.c | 39 +- security/selinux/hooks.c | 12 +- 403 files changed, 13710 insertions(+), 8236 deletions(-) create mode 100644 drivers/net/ixgbe/ixgbe_x540.c 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 wireless/master $ git merge wireless/master Auto-merging drivers/net/wireless/rt2x00/Kconfig Merge made by recursive. drivers/net/wireless/ath/ar9170/cmd.c | 2 +- drivers/net/wireless/ath/ath.h | 6 + drivers/net/wireless/ath/ath5k/Kconfig | 1 + drivers/net/wireless/ath/ath5k/ani.c | 38 +- drivers/net/wireless/ath/ath5k/ath5k.h | 26 +- drivers/net/wireless/ath/ath5k/base.c | 50 +- drivers/net/wireless/ath/ath5k/debug.c | 2 +- drivers/net/wireless/ath/ath9k/ani.c | 8 +- drivers/net/wireless/ath/ath9k/ar5008_phy.c | 79 +- drivers/net/wireless/ath/ath9k/ar9002_phy.c | 12 +- drivers/net/wireless/ath/ath9k/ar9003_calib.c | 27 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2758 +++++++++- drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 27 +- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 28 +- drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 4 +- drivers/net/wireless/ath/ath9k/ar9003_phy.c | 51 +- drivers/net/wireless/ath/ath9k/ath9k.h | 42 +- drivers/net/wireless/ath/ath9k/beacon.c | 19 + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 12 +- drivers/net/wireless/ath/ath9k/eeprom_9287.c | 20 +- drivers/net/wireless/ath/ath9k/eeprom_def.c | 17 +- drivers/net/wireless/ath/ath9k/hif_usb.c | 61 +- drivers/net/wireless/ath/ath9k/htc.h | 4 +- drivers/net/wireless/ath/ath9k/htc_drv_init.c | 38 +- drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +- drivers/net/wireless/ath/ath9k/htc_hst.h | 3 +- drivers/net/wireless/ath/ath9k/hw.c | 20 +- drivers/net/wireless/ath/ath9k/hw.h | 41 + drivers/net/wireless/ath/ath9k/init.c | 3 + drivers/net/wireless/ath/ath9k/mac.c | 8 - drivers/net/wireless/ath/ath9k/mac.h | 1 - drivers/net/wireless/ath/ath9k/main.c | 30 +- drivers/net/wireless/ath/ath9k/pci.c | 42 +- drivers/net/wireless/ath/ath9k/rc.c | 29 +- drivers/net/wireless/ath/ath9k/rc.h | 6 - drivers/net/wireless/ath/ath9k/reg.h | 14 +- drivers/net/wireless/ath/ath9k/virtual.c | 5 +- drivers/net/wireless/ath/ath9k/xmit.c | 631 +-- drivers/net/wireless/ath/carl9170/cmd.c | 2 +- drivers/net/wireless/ath/carl9170/tx.c | 2 +- drivers/net/wireless/ath/debug.c | 9 +- drivers/net/wireless/atmel.c | 6 +- drivers/net/wireless/b43/main.c | 48 +- drivers/net/wireless/b43/phy_common.c | 8 +- drivers/net/wireless/b43/phy_n.c | 86 +- drivers/net/wireless/b43/radio_2055.c | 248 +- drivers/net/wireless/b43/radio_2056.c | 5968 ++++++++++++++++++++ drivers/net/wireless/b43/rfkill.c | 19 +- drivers/net/wireless/b43legacy/main.c | 47 +- drivers/net/wireless/iwlwifi/Makefile | 4 + drivers/net/wireless/iwlwifi/iwl-1000.c | 8 +- drivers/net/wireless/iwlwifi/iwl-3945.c | 6 +- drivers/net/wireless/iwlwifi/iwl-4965.c | 13 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 14 +- drivers/net/wireless/iwlwifi/iwl-6000.c | 46 +- drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 21 + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 5 +- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 27 +- drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 32 +- drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 103 +- drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 110 +- drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 65 +- drivers/net/wireless/iwlwifi/iwl-agn.c | 11 +- drivers/net/wireless/iwlwifi/iwl-commands.h | 25 +- drivers/net/wireless/iwlwifi/iwl-core.c | 2 +- drivers/net/wireless/iwlwifi/iwl-core.h | 11 +- drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +- drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- drivers/net/wireless/iwlwifi/iwl-eeprom.h | 12 +- drivers/net/wireless/iwlwifi/iwl-helpers.h | 45 +- drivers/net/wireless/iwlwifi/iwl-led.c | 10 +- drivers/net/wireless/iwlwifi/iwl-led.h | 6 +- drivers/net/wireless/iwlwifi/iwl-power.c | 95 +- drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- drivers/net/wireless/iwlwifi/iwl-sta.c | 51 +- drivers/net/wireless/iwlwifi/iwl-sta.h | 1 + drivers/net/wireless/iwlwifi/iwl-tx.c | 11 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 11 +- drivers/net/wireless/iwmc3200wifi/commands.c | 2 +- drivers/net/wireless/libertas/cfg.c | 4 +- drivers/net/wireless/libertas/cmd.c | 8 + drivers/net/wireless/libertas/dev.h | 1 + drivers/net/wireless/libertas/if_usb.c | 13 +- drivers/net/wireless/libertas/main.c | 3 +- drivers/net/wireless/libertas/rx.c | 4 +- drivers/net/wireless/mwl8k.c | 677 ++- drivers/net/wireless/ray_cs.c | 4 +- drivers/net/wireless/rndis_wlan.c | 206 +- drivers/net/wireless/rt2x00/Kconfig | 72 +- drivers/net/wireless/rt2x00/rt2800.h | 1 + drivers/net/wireless/rt2x00/rt2800lib.c | 11 +- drivers/net/wireless/rt2x00/rt2800pci.c | 49 +- drivers/net/wireless/rt2x00/rt2800usb.c | 212 +- drivers/net/wireless/rt2x00/rt2x00.h | 2 +- drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- drivers/net/wireless/rt2x00/rt2x00soc.c | 6 +- drivers/net/wireless/wl12xx/Kconfig | 52 +- drivers/net/wireless/wl12xx/Makefile | 17 +- .../net/wireless/wl12xx/{wl1271_acx.c => acx.c} | 12 +- .../net/wireless/wl12xx/{wl1271_acx.h => acx.h} | 10 +- .../net/wireless/wl12xx/{wl1271_boot.c => boot.c} | 10 +- .../net/wireless/wl12xx/{wl1271_boot.h => boot.h} | 2 +- .../net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} | 12 +- .../net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} | 54 +- .../net/wireless/wl12xx/{wl1271_conf.h => conf.h} | 4 +- .../wl12xx/{wl1271_debugfs.c => debugfs.c} | 10 +- .../wl12xx/{wl1271_debugfs.h => debugfs.h} | 6 +- .../wireless/wl12xx/{wl1271_event.c => event.c} | 12 +- .../wireless/wl12xx/{wl1271_event.h => event.h} | 4 +- .../net/wireless/wl12xx/{wl1271_ini.h => ini.h} | 4 +- .../net/wireless/wl12xx/{wl1271_init.c => init.c} | 10 +- .../net/wireless/wl12xx/{wl1271_init.h => init.h} | 6 +- drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} | 4 +- drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} | 6 +- .../net/wireless/wl12xx/{wl1271_main.c => main.c} | 183 +- drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} | 6 +- drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} | 8 +- .../net/wireless/wl12xx/{wl1271_reg.h => reg.h} | 0 drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} | 12 +- drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} | 4 +- .../net/wireless/wl12xx/{wl1271_scan.c => scan.c} | 8 +- .../net/wireless/wl12xx/{wl1271_scan.h => scan.h} | 6 +- .../net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} | 4 +- .../net/wireless/wl12xx/{wl1271_spi.c => spi.c} | 6 +- .../wl12xx/{wl1271_testmode.c => testmode.c} | 6 +- .../wl12xx/{wl1271_testmode.h => testmode.h} | 4 +- drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} | 12 +- drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} | 4 +- drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} | 8 +- drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- drivers/ssb/pci.c | 52 +- include/linux/average.h | 32 + include/linux/nl80211.h | 32 + include/net/cfg80211.h | 17 + include/net/mac80211.h | 50 +- include/net/regulatory.h | 7 + lib/Kconfig | 3 + lib/Makefile | 2 + lib/average.c | 57 + net/mac80211/cfg.c | 26 + net/mac80211/driver-ops.h | 37 + net/mac80211/driver-trace.h | 71 + net/mac80211/ibss.c | 2 + net/mac80211/ieee80211_i.h | 10 + net/mac80211/key.c | 9 +- net/mac80211/mlme.c | 143 +- net/mac80211/rate.c | 18 +- net/mac80211/rc80211_minstrel_ht.c | 3 + net/mac80211/rx.c | 2 - net/mac80211/sta_info.c | 17 +- net/mac80211/sta_info.h | 3 + net/mac80211/status.c | 26 + net/mac80211/tx.c | 16 +- net/mac80211/util.c | 40 +- net/mac80211/wme.c | 11 +- net/wireless/core.c | 8 +- net/wireless/lib80211.c | 8 +- net/wireless/lib80211_crypt_tkip.c | 16 +- net/wireless/mlme.c | 12 + net/wireless/nl80211.c | 111 +- net/wireless/nl80211.h | 4 + net/wireless/reg.c | 127 +- net/wireless/util.c | 11 +- net/wireless/wext-core.c | 10 +- 165 files changed, 12131 insertions(+), 2034 deletions(-) rename drivers/net/wireless/wl12xx/{wl1271_acx.c => acx.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_acx.h => acx.h} (99%) rename drivers/net/wireless/wl12xx/{wl1271_boot.c => boot.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_boot.h => boot.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} (91%) rename drivers/net/wireless/wl12xx/{wl1271_conf.h => conf.h} (99%) rename drivers/net/wireless/wl12xx/{wl1271_debugfs.c => debugfs.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_debugfs.h => debugfs.h} (93%) rename drivers/net/wireless/wl12xx/{wl1271_event.c => event.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_event.h => event.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_ini.h => ini.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_init.c => init.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_init.h => init.h} (93%) rename drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_main.c => main.c} (97%) rename drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} (92%) rename drivers/net/wireless/wl12xx/{wl1271_reg.h => reg.h} (100%) rename drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} (97%) rename drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} (98%) rename drivers/net/wireless/wl12xx/{wl1271_scan.c => scan.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_scan.h => scan.h} (97%) rename drivers/net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_spi.c => spi.c} (99%) rename drivers/net/wireless/wl12xx/{wl1271_testmode.c => testmode.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_testmode.h => testmode.h} (93%) rename drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} (98%) rename drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} (99%) rename drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} (99%) create mode 100644 include/linux/average.h create mode 100644 lib/average.c 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/hci_event.c | 169 ++++++++++++++++++++++++++++++------------- net/bluetooth/hidp/core.c | 2 +- net/bluetooth/l2cap.c | 80 ++++++++++++++------- net/bluetooth/rfcomm/sock.c | 19 ++--- net/bluetooth/sco.c | 6 +- 7 files changed, 188 insertions(+), 90 deletions(-) Merging mtd/master $ git merge mtd/master Already up-to-date. Merging crypto/master $ git merge crypto/master Merge made by recursive. arch/x86/crypto/aesni-intel_asm.S | 1192 ++++++++++++++++++++++++++++++++++++ arch/x86/crypto/aesni-intel_glue.c | 518 ++++++++++++++++- crypto/cast5.c | 74 +-- crypto/shash.c | 8 +- crypto/tcrypt.c | 11 + crypto/testmgr.c | 24 + crypto/testmgr.h | 361 +++++++++++ 7 files changed, 2135 insertions(+), 53 deletions(-) Merging sound/for-next $ git merge sound/for-next Removing sound/pci/oxygen/hifier.c Removing sound/soc/s3c24xx/Kconfig Removing sound/soc/s3c24xx/Makefile Removing sound/soc/s3c24xx/aquila_wm8994.c Removing sound/soc/s3c24xx/s3c64xx-i2s-v4.c Removing sound/soc/s3c24xx/s3c64xx-i2s.c Removing sound/soc/s3c24xx/s3c64xx-i2s.h Merge made by recursive. Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- arch/arm/mach-kirkwood/openrd-setup.c | 2 +- arch/arm/mach-s3c2410/mach-h1940.c | 2 +- arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- arch/arm/mach-s3c64xx/dev-audio.c | 15 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s5pc100/dev-audio.c | 2 +- arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + arch/arm/mach-s5pv210/dev-audio.c | 2 +- arch/arm/plat-s3c24xx/devs.c | 19 +- arch/arm/plat-samsung/Makefile | 1 + arch/arm/plat-samsung/dev-asocdma.c | 24 + arch/arm/plat-samsung/include/plat/devs.h | 2 +- include/sound/alc5623.h | 15 + include/sound/asound.h | 3 + include/sound/minors.h | 4 +- include/sound/pcm.h | 1 + include/sound/soc-dai.h | 2 - include/sound/soc-dapm.h | 50 +- include/sound/soc.h | 72 +- include/trace/events/asoc.h | 176 +++ sound/core/pcm_lib.c | 22 + sound/core/pcm_native.c | 3 + sound/core/seq/seq.c | 4 + sound/core/sound.c | 18 +- sound/core/timer.c | 7 +- sound/pci/Kconfig | 17 +- sound/pci/hda/hda_intel.c | 9 +- sound/pci/hda/patch_realtek.c | 62 +- 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/pci/oxygen/oxygen_pcm.c | 14 +- sound/soc/Kconfig | 4 +- sound/soc/Makefile | 2 +- sound/soc/atmel/playpaq_wm8510.c | 12 +- sound/soc/atmel/sam9g20_wm8731.c | 22 +- sound/soc/atmel/snd-soc-afeb9260.c | 14 +- sound/soc/au1x/db1200.c | 1 - sound/soc/blackfin/bf5xx-ad1836.c | 1 - sound/soc/blackfin/bf5xx-ad193x.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/codecs/88pm860x-codec.c | 10 +- sound/soc/codecs/Kconfig | 13 + sound/soc/codecs/Makefile | 8 +- sound/soc/codecs/ad1836.c | 7 +- sound/soc/codecs/ad193x.c | 7 +- sound/soc/codecs/ad1980.c | 1 - sound/soc/codecs/ak4535.c | 10 +- sound/soc/codecs/ak4642.c | 2 +- sound/soc/codecs/ak4671.c | 10 +- sound/soc/codecs/alc5623.c | 1113 +++++++++++++ sound/soc/codecs/alc5623.h | 161 ++ sound/soc/codecs/cq93vc.c | 4 +- sound/soc/codecs/cs42l51.c | 6 +- sound/soc/codecs/cx20442.c | 15 +- sound/soc/codecs/da7210.c | 2 +- sound/soc/codecs/jz4740.c | 11 +- sound/soc/codecs/max98088.c | 16 +- sound/soc/codecs/ssm2602.c | 10 +- sound/soc/codecs/stac9766.c | 3 +- sound/soc/codecs/tlv320aic23.c | 10 +- sound/soc/codecs/tlv320aic26.c | 1 - sound/soc/codecs/tlv320aic3x.c | 56 +- sound/soc/codecs/tlv320dac33.c | 16 +- sound/soc/codecs/tpa6130a2.c | 16 +- sound/soc/codecs/twl4030.c | 51 +- sound/soc/codecs/twl6040.c | 13 +- sound/soc/codecs/uda134x.c | 3 +- sound/soc/codecs/uda1380.c | 14 +- sound/soc/codecs/wl1273.c | 3 +- sound/soc/codecs/wm2000.c | 6 +- sound/soc/codecs/wm8350.c | 29 +- sound/soc/codecs/wm8400.c | 12 +- sound/soc/codecs/wm8510.c | 12 +- sound/soc/codecs/wm8523.c | 13 +- sound/soc/codecs/wm8580.c | 14 +- sound/soc/codecs/wm8711.c | 10 +- sound/soc/codecs/wm8728.c | 12 +- sound/soc/codecs/wm8731.c | 15 +- sound/soc/codecs/wm8737.c | 713 +++++++++ sound/soc/codecs/wm8737.h | 322 ++++ sound/soc/codecs/wm8741.c | 10 +- sound/soc/codecs/wm8750.c | 12 +- sound/soc/codecs/wm8753.c | 30 +- sound/soc/codecs/wm8770.c | 749 +++++++++ sound/soc/codecs/wm8770.h | 51 + sound/soc/codecs/wm8776.c | 10 +- sound/soc/codecs/wm8804.c | 7 +- sound/soc/codecs/wm8900.c | 12 +- sound/soc/codecs/wm8903.c | 12 +- sound/soc/codecs/wm8904.c | 38 +- sound/soc/codecs/wm8940.c | 7 +- sound/soc/codecs/wm8955.c | 12 +- sound/soc/codecs/wm8960.c | 26 +- sound/soc/codecs/wm8961.c | 16 +- sound/soc/codecs/wm8962.c | 36 +- sound/soc/codecs/wm8971.c | 30 +- sound/soc/codecs/wm8974.c | 12 +- sound/soc/codecs/wm8978.c | 12 +- sound/soc/codecs/wm8985.c | 12 +- sound/soc/codecs/wm8988.c | 10 +- sound/soc/codecs/wm8990.c | 12 +- sound/soc/codecs/wm8993.c | 14 +- sound/soc/codecs/wm8994-tables.c | 1575 +++++++++++++++++++ sound/soc/codecs/wm8994.c | 1632 +------------------- sound/soc/codecs/wm8994.h | 9 + sound/soc/codecs/wm9081.c | 10 +- sound/soc/codecs/wm9090.c | 18 +- sound/soc/codecs/wm9705.c | 7 +- sound/soc/codecs/wm9712.c | 10 +- sound/soc/codecs/wm9713.c | 9 +- sound/soc/codecs/wm_hubs.c | 88 +- sound/soc/codecs/wm_hubs.h | 3 + sound/soc/davinci/davinci-evm.c | 22 +- sound/soc/davinci/davinci-sffsdr.c | 1 - sound/soc/ep93xx/snappercl15.c | 6 +- sound/soc/fsl/mpc5200_dma.c | 1 - sound/soc/imx/eukrea-tlv320.c | 1 - sound/soc/imx/imx-ssi.c | 4 +- sound/soc/imx/phycore-ac97.c | 1 - sound/soc/imx/wm1133-ev1.c | 8 +- sound/soc/jz4740/jz4740-i2s.c | 1 - sound/soc/jz4740/qi_lb60.c | 14 +- sound/soc/kirkwood/Kconfig | 11 +- sound/soc/kirkwood/Makefile | 2 + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- sound/soc/kirkwood/kirkwood-t5325.c | 141 ++ sound/soc/nuc900/nuc900-ac97.c | 2 +- sound/soc/nuc900/nuc900-audio.c | 1 - sound/soc/omap/am3517evm.c | 14 +- sound/soc/omap/ams-delta.c | 82 +- sound/soc/omap/igep0020.c | 1 - sound/soc/omap/n810.c | 43 +- sound/soc/omap/omap2evm.c | 1 - sound/soc/omap/omap3beagle.c | 1 - sound/soc/omap/omap3evm.c | 1 - sound/soc/omap/omap3pandora.c | 46 +- sound/soc/omap/osk5912.c | 14 +- sound/soc/omap/overo.c | 1 - sound/soc/omap/rx51.c | 26 +- sound/soc/omap/sdp3430.c | 44 +- sound/soc/omap/sdp4430.c | 20 +- sound/soc/omap/zoom2.c | 36 +- sound/soc/pxa/corgi.c | 52 +- sound/soc/pxa/e740_wm9705.c | 30 +- sound/soc/pxa/e750_wm9705.c | 30 +- sound/soc/pxa/e800_wm9712.c | 8 +- sound/soc/pxa/em-x270.c | 1 - sound/soc/pxa/magician.c | 36 +- sound/soc/pxa/mioa701_wm9713.c | 18 +- sound/soc/pxa/palm27x.c | 34 +- sound/soc/pxa/poodle.c | 26 +- sound/soc/pxa/raumfeld.c | 1 - sound/soc/pxa/saarb.c | 18 +- sound/soc/pxa/spitz.c | 70 +- sound/soc/pxa/tavorevb3.c | 18 +- sound/soc/pxa/tosa.c | 38 +- sound/soc/pxa/z2.c | 16 +- sound/soc/pxa/zylonite.c | 12 +- sound/soc/s3c24xx/Kconfig | 171 -- sound/soc/s3c24xx/Makefile | 55 - sound/soc/s3c24xx/aquila_wm8994.c | 295 ---- sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 --- sound/soc/s3c24xx/s3c64xx-i2s.c | 242 --- sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - sound/soc/s6000/s6105-ipcam.c | 41 +- sound/soc/samsung/Kconfig | 155 ++ sound/soc/samsung/Makefile | 51 + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 134 +- sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 55 +- sound/soc/samsung/i2s.c | 1256 +++++++++++++++ sound/soc/samsung/i2s.h | 29 + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 26 +- sound/soc/{s3c24xx => samsung}/lm4857.h | 0 sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 9 +- .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 46 +- sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 130 +- sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 16 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 22 +- .../s3c24xx_simtec_tlv320aic23.c | 22 +- sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 5 +- sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 54 +- sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 9 +- sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 8 +- .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 167 ++- sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 8 +- sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- sound/soc/sh/migor.c | 6 +- sound/soc/sh/sh7760-ac97.c | 3 +- sound/soc/sh/siu.h | 2 +- sound/soc/sh/siu_dai.c | 2 +- sound/soc/sh/siu_pcm.c | 2 +- sound/soc/soc-cache.c | 1002 ++++++++++++- sound/soc/soc-core.c | 173 ++- sound/soc/soc-dapm.c | 580 ++++--- sound/soc/soc-jack.c | 24 +- 214 files changed, 9682 insertions(+), 4592 deletions(-) create mode 100644 arch/arm/plat-samsung/dev-asocdma.c create mode 100644 include/sound/alc5623.h create mode 100644 include/trace/events/asoc.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/codecs/wm8737.c create mode 100644 sound/soc/codecs/wm8737.h create mode 100644 sound/soc/codecs/wm8770.c create mode 100644 sound/soc/codecs/wm8770.h create mode 100644 sound/soc/codecs/wm8994-tables.c create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c delete mode 100644 sound/soc/s3c24xx/Kconfig delete mode 100644 sound/soc/s3c24xx/Makefile delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h create mode 100644 sound/soc/samsung/Kconfig create mode 100644 sound/soc/samsung/Makefile rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (74%) rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (86%) create mode 100644 sound/soc/samsung/i2s.c create mode 100644 sound/soc/samsung/i2s.h rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (88%) rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (92%) rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (92%) rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (83%) rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (95%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (87%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (86%) rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (85%) rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (92%) rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (97%) rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (57%) rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (95%) rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) rename sound/soc/{s3c24xx => samsung}/spdif.h (94%) Merging sound-asoc/for-next $ git merge sound-asoc/for-next Already up-to-date. Merging cpufreq/next $ git merge cpufreq/next Merge made by recursive. drivers/cpufreq/cpufreq_conservative.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Merging quilt/rr $ git merge quilt/rr Merge made by recursive. Documentation/lguest/lguest.c | 66 ++++++++++++++++++++++++++++++++++---- Documentation/lguest/lguest.txt | 5 +++ 2 files changed, 64 insertions(+), 7 deletions(-) Merging input/next $ git merge input/next Merge made by recursive. arch/arm/plat-spear/include/plat/keyboard.h | 141 ++++++ drivers/input/Makefile | 2 +- drivers/input/gameport/gameport.c | 152 +++---- drivers/input/joystick/iforce/Makefile | 15 +- drivers/input/joystick/xpad.c | 123 +++-- drivers/input/keyboard/Kconfig | 9 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/spear-keyboard.c | 344 +++++++++++++ drivers/input/misc/pcf8574_keypad.c | 19 +- drivers/input/mouse/hgpk.c | 695 +++++++++++++++++++++++--- drivers/input/mouse/hgpk.h | 31 ++- drivers/input/mouse/psmouse-base.c | 1 + drivers/input/serio/ams_delta_serio.c | 1 - drivers/input/serio/ct82c710.c | 8 +- drivers/input/serio/hil_mlc.c | 5 + drivers/input/serio/hp_sdc_mlc.c | 18 +- drivers/input/serio/ps2mult.c | 2 +- drivers/input/serio/serio.c | 155 +++---- drivers/input/touchscreen/qt602240_ts.c | 21 +- drivers/macintosh/mac_hid.c | 8 + 20 files changed, 1406 insertions(+), 345 deletions(-) create mode 100644 arch/arm/plat-spear/include/plat/keyboard.h create mode 100644 drivers/input/keyboard/spear-keyboard.c Merging lsm/for-next $ git merge lsm/for-next Already up-to-date. Merging block/for-next $ git merge block/for-next Merge made by recursive. drivers/block/xen-blkfront.c | 55 +++++++++++++++++++++++++---------------- fs/ioprio.c | 31 ++++------------------- 2 files changed, 39 insertions(+), 47 deletions(-) Merging quilt/device-mapper $ git merge quilt/device-mapper Already up-to-date. Merging embedded/master $ git merge embedded/master Already up-to-date. Merging firmware/master $ git merge firmware/master Already up-to-date. Merging pcmcia/master $ git merge pcmcia/master Already up-to-date. Merging battery/master $ git merge battery/master Merge made by recursive. drivers/power/Kconfig | 10 ++ drivers/power/Makefile | 1 + drivers/power/ds2760_battery.c | 2 +- drivers/power/gpio-charger.c | 185 +++++++++++++++++++++++++++++++++ drivers/power/isp1704_charger.c | 201 +++++++++++++++++++++++++++++------- drivers/power/jz4740-battery.c | 12 ++ include/linux/power/gpio-charger.h | 41 ++++++++ 7 files changed, 411 insertions(+), 41 deletions(-) create mode 100644 drivers/power/gpio-charger.c create mode 100644 include/linux/power/gpio-charger.h 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 Auto-merging include/linux/pci_ids.h Merge made by recursive. arch/arm/mach-dove/common.c | 4 +- arch/arm/plat-pxa/include/plat/sdhci.h | 3 + drivers/mmc/core/Kconfig | 11 ++ drivers/mmc/core/core.c | 64 ++++++++++- drivers/mmc/core/core.h | 3 + drivers/mmc/core/debugfs.c | 5 + drivers/mmc/core/host.c | 205 +++++++++++++++++++++++++++++++- drivers/mmc/core/host.h | 21 ++++ drivers/mmc/core/mmc.c | 8 +- drivers/mmc/core/sdio.c | 51 ++++++--- drivers/mmc/core/sdio_bus.c | 33 ++++-- drivers/mmc/host/Kconfig | 11 ++ drivers/mmc/host/Makefile | 1 + drivers/mmc/host/mxcmmc.c | 52 +++++++- drivers/mmc/host/omap_hsmmc.c | 2 +- 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-pxa.c | 4 + drivers/mmc/host/sdhci.c | 54 +++++++-- drivers/mmc/host/sdhci.h | 9 ++- drivers/mmc/host/ushc.c | 30 ++++-- include/linux/mmc/host.h | 11 ++ include/linux/pci_ids.h | 1 + 26 files changed, 628 insertions(+), 72 deletions(-) create mode 100644 drivers/mmc/host/sdhci-dove.c Merging kgdb/kgdb-next $ git merge kgdb/kgdb-next Merge made by recursive. arch/x86/kernel/kgdb.c | 4 ++-- kernel/debug/kdb/kdb_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) Merging slab/for-next $ git merge slab/for-next Auto-merging mm/slub.c Merge made by recursive. Documentation/vm/Makefile | 2 +- include/linux/slub_def.h | 55 +++++++++++++-------------- mm/slub.c | 30 +++++++++++--- {Documentation/vm => tools/slub}/slabinfo.c | 6 +- 4 files changed, 53 insertions(+), 40 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/gpu/drm/drm_crtc_helper.c | 13 +- drivers/gpu/drm/drm_irq.c | 563 +++++++++++++- drivers/gpu/drm/drm_stub.c | 10 + drivers/gpu/drm/nouveau/nouveau_gem.c | 12 +- drivers/gpu/drm/radeon/ObjectID.h | 48 ++ drivers/gpu/drm/radeon/atombios.h | 997 +++++++++++++++++++++++-- drivers/gpu/drm/radeon/evergreen.c | 598 ++++++++++----- drivers/gpu/drm/radeon/evergreen_blit_kms.c | 27 +- drivers/gpu/drm/radeon/evergreen_reg.h | 6 + drivers/gpu/drm/radeon/evergreend.h | 8 +- drivers/gpu/drm/radeon/r100.c | 74 ++- drivers/gpu/drm/radeon/r500_reg.h | 4 + drivers/gpu/drm/radeon/r600.c | 135 ++-- drivers/gpu/drm/radeon/r600d.h | 9 + drivers/gpu/drm/radeon/radeon.h | 66 ++- drivers/gpu/drm/radeon/radeon_asic.c | 92 +++- drivers/gpu/drm/radeon/radeon_asic.h | 10 + drivers/gpu/drm/radeon/radeon_atombios.c | 1078 +++++++++++++++------------ drivers/gpu/drm/radeon/radeon_cs.c | 17 +- drivers/gpu/drm/radeon/radeon_device.c | 7 +- drivers/gpu/drm/radeon/radeon_display.c | 304 +++++++- drivers/gpu/drm/radeon/radeon_drv.c | 11 +- drivers/gpu/drm/radeon/radeon_encoders.c | 79 ++- drivers/gpu/drm/radeon/radeon_family.h | 1 + drivers/gpu/drm/radeon/radeon_irq_kms.c | 41 +- drivers/gpu/drm/radeon/radeon_kms.c | 21 + drivers/gpu/drm/radeon/radeon_mode.h | 13 +- drivers/gpu/drm/radeon/radeon_object.c | 55 +-- drivers/gpu/drm/radeon/radeon_object.h | 7 +- drivers/gpu/drm/radeon/radeon_pm.c | 10 +- drivers/gpu/drm/radeon/radeon_reg.h | 1 + drivers/gpu/drm/radeon/rs600.c | 116 +++- drivers/gpu/drm/radeon/rv770.c | 131 ++++- drivers/gpu/drm/radeon/rv770d.h | 10 + drivers/gpu/drm/ttm/ttm_bo.c | 156 +++-- drivers/gpu/drm/ttm/ttm_bo_util.c | 136 +++- drivers/gpu/drm/ttm/ttm_bo_vm.c | 29 +- drivers/gpu/drm/ttm/ttm_execbuf_util.c | 169 ++++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 +- include/drm/drmP.h | 93 +++ include/drm/drm_crtc.h | 9 + include/drm/drm_pciids.h | 4 + include/drm/ttm/ttm_bo_api.h | 50 ++- include/drm/ttm/ttm_bo_driver.h | 152 +++-- include/drm/ttm/ttm_execbuf_util.h | 11 +- include/linux/kref.h | 2 + lib/kref.c | 30 + 48 files changed, 4290 insertions(+), 1129 deletions(-) Merging fbdev/master $ git merge fbdev/master Auto-merging arch/arm/mach-shmobile/board-ap4evb.c Auto-merging drivers/video/sh_mobile_lcdcfb.c Auto-merging include/linux/fb.h Merge made by recursive. arch/arm/mach-shmobile/board-ap4evb.c | 31 +++- drivers/video/Kconfig | 26 ++ drivers/video/Makefile | 3 + drivers/video/fbmon.c | 88 +++++++ drivers/video/modedb.c | 47 ++++ drivers/video/sh_mipi_dsi.c | 103 ++++++-- drivers/video/sh_mobile_hdmi.c | 219 +++++++++++----- drivers/video/sh_mobile_lcdcfb.c | 26 +-- drivers/video/via/via-core.c | 96 +++++++- drivers/video/via/via-gpio.c | 29 +++ drivers/video/via/viafbdev.c | 34 ++-- drivers/video/via/viafbdev.h | 2 - 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 + include/linux/fb.h | 3 + include/linux/via-core.h | 15 ++ include/video/sh_mobile_hdmi.h | 3 + 21 files changed, 1765 insertions(+), 136 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 Already up-to-date. Merging voltage/for-next $ git merge voltage/for-next Merge made by recursive. drivers/regulator/88pm8607.c | 3 +- drivers/regulator/ab3100.c | 5 +- drivers/regulator/ab8500.c | 5 +- drivers/regulator/core.c | 216 +++++++++++++++++--------------- drivers/regulator/da903x.c | 17 ++- drivers/regulator/isl6271a-regulator.c | 6 +- drivers/regulator/lp3971.c | 10 ++- drivers/regulator/lp3972.c | 10 ++- drivers/regulator/max1586.c | 30 +++--- drivers/regulator/max8649.c | 3 +- drivers/regulator/max8660.c | 14 ++- drivers/regulator/max8925-regulator.c | 3 +- drivers/regulator/max8952.c | 3 +- drivers/regulator/max8998.c | 8 +- drivers/regulator/mc13783-regulator.c | 14 ++- drivers/regulator/pcap-regulator.c | 7 +- drivers/regulator/pcf50633-regulator.c | 5 +- drivers/regulator/tps65023-regulator.c | 9 +- drivers/regulator/tps6507x-regulator.c | 10 ++- drivers/regulator/tps6586x-regulator.c | 15 ++- drivers/regulator/twl-regulator.c | 17 ++- drivers/regulator/wm831x-dcdc.c | 17 ++- drivers/regulator/wm831x-ldo.c | 41 +++++-- drivers/regulator/wm8350-regulator.c | 8 +- drivers/regulator/wm8400-regulator.c | 8 +- drivers/regulator/wm8994-regulator.c | 6 +- include/linux/regulator/driver.h | 3 +- include/trace/events/regulator.h | 141 +++++++++++++++++++++ 28 files changed, 448 insertions(+), 186 deletions(-) create mode 100644 include/trace/events/regulator.h Merging security-testing/next $ git merge security-testing/next Auto-merging include/linux/kernel.h Merge made by recursive. include/linux/kernel.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Merging selinux/master $ git merge selinux/master Merge made by recursive. security/selinux/selinuxfs.c | 648 +++++++++++++++++++--------------------- security/selinux/ss/policydb.c | 555 +++++++++++++++++------------------ security/selinux/ss/services.c | 370 +++++++++++------------ 3 files changed, 757 insertions(+), 816 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 'MAINTAINERS' using previous resolution. Resolved 'drivers/scsi/bfa/bfa_fcpim.c' using previous resolution. Renaming sound/soc/s3c24xx/smdk_spdif.c => sound/soc/samsung/smdk_spdif.c Auto-merging sound/soc/samsung/smdk_spdif.c Auto-merging Documentation/kvm/api.txt Auto-merging Documentation/lguest/lguest.txt Auto-merging MAINTAINERS CONFLICT (content): Merge conflict in MAINTAINERS Auto-merging arch/arm/mach-imx/pm-imx27.c Auto-merging arch/arm/mach-msm/io.c Auto-merging arch/arm/mach-omap2/serial.c Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h Auto-merging drivers/base/power/main.c Auto-merging drivers/gpu/drm/nouveau/nouveau_backlight.c Auto-merging drivers/gpu/drm/radeon/atombios.h Auto-merging drivers/input/serio/Kconfig Auto-merging drivers/isdn/hisax/isar.c Auto-merging drivers/media/video/cx25840/cx25840-ir.c Auto-merging drivers/media/video/saa7164/saa7164-core.c Auto-merging drivers/media/video/via-camera.c Auto-merging drivers/media/video/zoran/zoran.h Auto-merging drivers/message/fusion/mptsas.c Auto-merging drivers/mmc/host/Kconfig Auto-merging drivers/net/bnx2x/bnx2x_main.c Auto-merging drivers/net/bonding/bond_3ad.c Auto-merging drivers/net/e1000/e1000_main.c Auto-merging drivers/net/e1000e/82571.c Auto-merging drivers/net/eepro.c Auto-merging drivers/net/ixgbe/ixgbe_82599.c Auto-merging drivers/net/vxge/vxge-traffic.h Auto-merging drivers/net/wireless/iwlwifi/iwl-sta.c Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c Auto-merging drivers/scsi/a100u2w.c 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/dc395x.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/scsi/megaraid.h Auto-merging drivers/scsi/sym53c8xx_2/sym_glue.c Auto-merging drivers/staging/olpc_dcon/olpc_dcon.c Auto-merging drivers/staging/samsung-laptop/samsung-laptop.c Auto-merging drivers/staging/stradis/stradis.c Auto-merging drivers/usb/misc/iowarrior.c Auto-merging drivers/usb/musb/musb_gadget.c Auto-merging fs/ext4/ext4.h Auto-merging fs/ext4/inode.c Auto-merging fs/xfs/linux-2.6/xfs_super.c Auto-merging kernel/debug/kdb/kdb_main.c Auto-merging kernel/sched.c Auto-merging lib/nlattr.c Auto-merging net/core/dev.c Auto-merging net/decnet/dn_dev.c Auto-merging net/ipv4/tcp_output.c Auto-merging sound/core/pcm_native.c Auto-merging sound/soc/codecs/max98088.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 82fd170] 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/ko_KR/HOWTO | 4 ++-- Documentation/kprobes.txt | 2 +- Documentation/kvm/api.txt | 2 +- Documentation/lguest/lguest.txt | 7 +++++-- Documentation/networking/bridge.txt | 4 ++-- Documentation/networking/caif/spi_porting.txt | 2 +- Documentation/networking/dccp.txt | 4 ++-- Documentation/networking/generic_netlink.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 +- Documentation/zh_CN/HOWTO | 4 ++-- Documentation/zh_CN/SubmittingDrivers | 2 +- MAINTAINERS | 10 +++++----- arch/arm/common/it8152.c | 2 +- arch/arm/common/vic.c | 2 +- arch/arm/mach-at91/board-ecbat91.c | 6 +++--- arch/arm/mach-at91/pm.c | 2 +- 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-davinci/pm.c | 2 +- arch/arm/mach-gemini/include/mach/hardware.h | 2 +- arch/arm/mach-imx/pm-imx27.c | 2 +- arch/arm/mach-lpc32xx/pm.c | 2 +- arch/arm/mach-msm/io.c | 2 +- arch/arm/mach-omap1/pm.c | 2 +- arch/arm/mach-omap2/cpuidle34xx.c | 2 +- arch/arm/mach-omap2/pm24xx.c | 2 +- arch/arm/mach-omap2/pm34xx.c | 2 +- arch/arm/mach-omap2/pm44xx.c | 2 +- arch/arm/mach-omap2/serial.c | 2 +- arch/arm/mach-pnx4008/pm.c | 2 +- arch/arm/mach-pxa/mxm8x10.c | 2 +- arch/arm/mach-pxa/pm.c | 2 +- arch/arm/mach-pxa/sharpsl_pm.c | 2 +- arch/arm/mach-s3c64xx/dma.c | 2 +- arch/arm/mach-sa1100/pm.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/mm/flush.c | 1 - arch/arm/plat-mxc/include/mach/irqs.h | 2 +- arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- arch/arm/plat-samsung/pm.c | 2 +- arch/avr32/mach-at32ap/pm.c | 2 +- arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- arch/blackfin/mach-common/pm.c | 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/alchemy/devboards/pm.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/jz4740/pm.c | 2 +- arch/mips/loongson/common/pm.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/52xx/lite5200_pm.c | 2 +- arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +- arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++--- arch/powerpc/platforms/83xx/suspend.c | 2 +- arch/powerpc/platforms/ps3/device-init.c | 4 ++-- arch/powerpc/platforms/ps3/interrupt.c | 2 +- arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- arch/powerpc/platforms/pseries/suspend.c | 2 +- arch/powerpc/sysdev/fsl_pmc.c | 2 +- arch/sh/boards/mach-hp6xx/pm.c | 2 +- arch/sh/kernel/cpu/shmobile/pm.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/acpi/sleep.c | 8 ++++---- drivers/acpi/video.c | 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/bus.c | 2 +- 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/nouveau/nouveau_backlight.c | 4 ++-- 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/cxgb4/iw_cxgb4.h | 1 - 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/macintosh/via-pmu-backlight.c | 4 ++-- drivers/macintosh/via-pmu.c | 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/Kconfig | 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/acer-wmi.c | 2 +- drivers/platform/x86/asus-laptop.c | 2 +- drivers/platform/x86/asus_acpi.c | 2 +- drivers/platform/x86/dell-laptop.c | 2 +- drivers/platform/x86/eeepc-laptop.c | 2 +- drivers/platform/x86/fujitsu-laptop.c | 2 +- drivers/platform/x86/sony-laptop.c | 2 +- drivers/platform/x86/thinkpad_acpi.c | 4 ++-- drivers/platform/x86/toshiba_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/msm/msm_fb_bl.c | 2 +- drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- drivers/staging/samsung-laptop/samsung-laptop.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/atmel_lcdfb.c | 2 +- drivers/video/aty/aty128fb.c | 2 +- drivers/video/aty/atyfb_base.c | 2 +- drivers/video/aty/radeon_backlight.c | 2 +- drivers/video/backlight/88pm860x_bl.c | 2 +- drivers/video/backlight/max8925_bl.c | 2 +- drivers/video/nvidia/nv_backlight.c | 2 +- drivers/video/omap2/displays/panel-taal.c | 2 +- drivers/video/riva/fbdev.c | 2 +- drivers/video/sstfb.c | 2 +- fs/ext4/ext4.h | 2 +- fs/ext4/extents.c | 4 ++-- fs/ext4/inode.c | 6 +++--- 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/linux/suspend.h | 8 ++++---- 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/hibernate.c | 4 ++-- kernel/power/suspend.c | 4 ++-- 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/Kconfig | 4 +++- net/core/dev.c | 2 +- net/dccp/Kconfig | 4 +++- net/decnet/dn_dev.c | 2 +- net/ipv4/Kconfig | 4 +++- net/ipv4/tcp_output.c | 2 +- net/sched/Kconfig | 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/samsung/smdk_spdif.c | 6 +++--- 280 files changed, 361 insertions(+), 355 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/cachefiles/namei.c | 1 - fs/cachefiles/xattr.c | 1 - fs/namei.c | 3 + fs/nfsd/vfs.c | 3 - fs/notify/fanotify/fanotify.c | 30 +++++++---- fs/notify/fanotify/fanotify_user.c | 97 ++++++++++++++++++++++-------------- fs/notify/inotify/inotify_user.c | 1 + fs/notify/mark.c | 36 +++++--------- include/linux/fanotify.h | 7 ++- include/linux/fsnotify.h | 3 - include/linux/fsnotify_backend.h | 15 +++++- 11 files changed, 112 insertions(+), 85 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. Resolved 'lib/Kconfig' using previous resolution. Auto-merging MAINTAINERS Auto-merging arch/x86/Kconfig Auto-merging drivers/Makefile Auto-merging drivers/net/Kconfig Auto-merging drivers/net/Makefile Auto-merging include/linux/Kbuild CONFLICT (content): Merge conflict in include/linux/Kbuild Auto-merging lib/Kconfig CONFLICT (content): Merge conflict in lib/Kconfig Auto-merging lib/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a1114d0] 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 Merge made by recursive. drivers/edac/i7core_edac.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) 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 arch/x86/kernel/entry_32.S Auto-merging arch/x86/kernel/entry_64.S Merge made by recursive. arch/x86/include/asm/msr-index.h | 2 +- arch/x86/include/asm/paravirt.h | 10 +++--- arch/x86/include/asm/uv/uv_hub.h | 4 ++ arch/x86/include/asm/uv/uv_mmrs.h | 19 +++++++++- arch/x86/kernel/apic/hw_nmi.c | 7 ++-- arch/x86/kernel/apic/x2apic_uv_x.c | 25 ++++++++++++- arch/x86/kernel/entry_32.S | 2 +- arch/x86/kernel/entry_64.S | 2 + arch/x86/kernel/hw_breakpoint.c | 4 ++ arch/x86/kernel/mmconf-fam10h_64.c | 64 +++++++++++++++----------------- arch/x86/mm/tlb.c | 5 ++- arch/x86/platform/uv/tlb_uv.c | 2 +- arch/x86/platform/uv/uv_time.c | 4 ++- include/linux/hw_breakpoint.h | 4 ++ kernel/hw_breakpoint.c | 3 +- kernel/irq_work.c | 4 ++- kernel/module.c | 12 ++++++ kernel/perf_event.c | 69 +++++++++++++++++++++++++++++------ kernel/posix-cpu-timers.c | 12 +++--- kernel/sched_fair.c | 8 ++--- kernel/trace/trace.c | 19 ++++++++++ 21 files changed, 204 insertions(+), 77 deletions(-) Merging rcu/rcu/next $ git merge rcu/rcu/next Auto-merging include/linux/init_task.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 | 431 +++++++++++++++++++++++++++++++++++++++++-- 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, 1071 insertions(+), 239 deletions(-) Merging oprofile/for-next $ git merge oprofile/for-next Already up-to-date. Merging xen/upstream/xen $ git merge xen/upstream/xen Auto-merging arch/x86/xen/enlighten.c Auto-merging arch/x86/xen/setup.c Merge made by recursive. drivers/xen/Kconfig | 7 + drivers/xen/Makefile | 2 + drivers/xen/gntdev.c | 647 +++++++++++++++++++++++++++++++++++++++++++++ include/xen/gntdev.h | 119 +++++++++ include/xen/grant_table.h | 39 +++- 5 files changed, 813 insertions(+), 1 deletions(-) create mode 100644 drivers/xen/gntdev.c create mode 100644 include/xen/gntdev.h Merging swiotlb-xen/master $ git merge swiotlb-xen/master Already up-to-date. 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. Merging edac-amd/for-next $ git merge edac-amd/for-next Merge made by recursive. drivers/edac/Makefile | 8 +- drivers/edac/amd64_edac.c | 4 +- drivers/edac/mce_amd.c | 433 ++++++++++++++++++++++++++++++++++---------- drivers/edac/mce_amd.h | 14 +- drivers/edac/mce_amd_inj.c | 11 +- 5 files changed, 354 insertions(+), 116 deletions(-) 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 Auto-merging drivers/platform/x86/asus-laptop.c Auto-merging drivers/platform/x86/thinkpad_acpi.c Auto-merging drivers/platform/x86/toshiba_acpi.c Merge made by recursive. .../ABI/testing/sysfs-platform-asus-laptop | 16 ++- Documentation/ABI/testing/sysfs-platform-eeepc-wmi | 10 ++ drivers/platform/x86/Kconfig | 9 ++ drivers/platform/x86/Makefile | 1 + drivers/platform/x86/asus-laptop.c | 97 ++++++++++++++- drivers/platform/x86/classmate-laptop.c | 2 +- drivers/platform/x86/eeepc-wmi.c | 4 +- drivers/platform/x86/hp-wmi.c | 2 + drivers/platform/x86/ibm_rtl.c | 34 +---- drivers/platform/x86/intel_scu_ipc.c | 4 +- drivers/platform/x86/intel_scu_ipcutil.c | 133 +++++++++++++++++++ drivers/platform/x86/msi-wmi.c | 16 ++- drivers/platform/x86/thinkpad_acpi.c | 3 +- drivers/platform/x86/toshiba_acpi.c | 1 + drivers/platform/x86/wmi.c | 135 +++++++++++--------- 15 files changed, 363 insertions(+), 104 deletions(-) create mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-wmi create mode 100644 drivers/platform/x86/intel_scu_ipcutil.c Merging hwpoison/hwpoison $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master $ git merge sysctl/master Already up-to-date. Merging driver-core/driver-core-next $ git merge driver-core/driver-core-next Auto-merging drivers/base/bus.c Merge made by recursive. drivers/base/base.h | 62 +++++++++++++++++++---------------------------- drivers/base/bus.c | 13 ++++----- drivers/base/class.c | 42 ++++++++++++++++---------------- drivers/base/core.c | 22 ++++++++-------- include/linux/device.h | 7 ++--- 5 files changed, 66 insertions(+), 80 deletions(-) Merging tty/tty-next $ git merge tty/tty-next Auto-merging drivers/tty/n_gsm.c Auto-merging kernel/printk.c Merge made by recursive. Documentation/filesystems/proc.txt | 24 + Documentation/serial/00-INDEX | 2 + Documentation/serial/serial-rs485.txt | 119 +++ arch/parisc/kernel/pdc_cons.c | 8 +- drivers/serial/Kconfig | 16 + drivers/serial/Makefile | 2 + drivers/serial/cpm_uart/cpm_uart.h | 6 - drivers/serial/cpm_uart/cpm_uart_core.c | 19 + drivers/serial/ifx6x60.c | 1403 +++++++++++++++++++++++++++++++ drivers/serial/ifx6x60.h | 129 +++ drivers/serial/mpc52xx_uart.c | 6 +- drivers/serial/vt8500_serial.c | 648 ++++++++++++++ drivers/tty/n_gsm.c | 213 +++-- drivers/video/xen-fbfront.c | 2 +- fs/proc/Makefile | 1 + fs/proc/proc_console.c | 114 +++ include/linux/console.h | 6 + include/linux/serial_core.h | 5 +- include/linux/spi/ifx_modem.h | 14 + include/linux/tty_driver.h | 1 + kernel/printk.c | 6 - 21 files changed, 2639 insertions(+), 105 deletions(-) create mode 100644 Documentation/serial/serial-rs485.txt create mode 100644 drivers/serial/ifx6x60.c create mode 100644 drivers/serial/ifx6x60.h create mode 100644 drivers/serial/vt8500_serial.c create mode 100644 fs/proc/proc_console.c create mode 100644 include/linux/spi/ifx_modem.h Merging usb/usb-next $ git merge usb/usb-next Auto-merging drivers/media/video/tlg2300/pd-main.c Auto-merging drivers/usb/gadget/Kconfig Auto-merging drivers/usb/gadget/f_fs.c Auto-merging drivers/usb/gadget/imx_udc.c Auto-merging drivers/usb/host/ehci-hcd.c Auto-merging drivers/usb/host/ehci-pci.c Auto-merging include/linux/usb.h Merge made by recursive. Documentation/usb/power-management.txt | 113 +- drivers/media/video/tlg2300/pd-main.c | 3 +- drivers/net/wimax/i2400m/usb.c | 2 +- drivers/staging/bcm/InterfaceInit.c | 2 +- drivers/usb/Kconfig | 3 + drivers/usb/core/driver.c | 150 +-- drivers/usb/core/hcd-pci.c | 1 - drivers/usb/core/hcd.c | 1 - drivers/usb/core/hub.c | 11 +- drivers/usb/core/message.c | 1 + drivers/usb/core/quirks.c | 15 - drivers/usb/core/sysfs.c | 84 +- drivers/usb/core/usb.c | 3 +- drivers/usb/core/usb.h | 2 - drivers/usb/gadget/Kconfig | 22 + drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/amd5536udc.c | 1 - drivers/usb/gadget/composite.c | 2 +- drivers/usb/gadget/dummy_hcd.c | 251 ++-- drivers/usb/gadget/f_fs.c | 433 +++--- drivers/usb/gadget/f_mass_storage.c | 524 +++--- drivers/usb/gadget/file_storage.c | 29 +- drivers/usb/gadget/g_ffs.c | 41 +- drivers/usb/gadget/gadget_chips.h | 7 + drivers/usb/gadget/imx_udc.c | 4 +- drivers/usb/gadget/imx_udc.h | 3 - drivers/usb/gadget/mass_storage.c | 2 +- drivers/usb/gadget/pch_udc.c | 2941 ++++++++++++++++++++++++++++++++ drivers/usb/host/ehci-hcd.c | 10 + drivers/usb/host/ehci-pci.c | 7 + drivers/usb/host/ehci-spear.c | 212 +++ drivers/usb/host/ehci-vt8500.c | 172 ++ drivers/usb/host/ohci-hcd.c | 5 + drivers/usb/host/ohci-spear.c | 240 +++ drivers/usb/host/uhci-hcd.c | 2 +- drivers/usb/serial/ssu100.c | 56 +- drivers/uwb/umc-dev.c | 7 +- include/linux/usb.h | 7 +- include/linux/usb/ch11.h | 47 + include/linux/usb/hcd.h | 4 + 40 files changed, 4475 insertions(+), 946 deletions(-) create mode 100644 drivers/usb/gadget/pch_udc.c create mode 100644 drivers/usb/host/ehci-spear.c create mode 100644 drivers/usb/host/ehci-vt8500.c create mode 100644 drivers/usb/host/ohci-spear.c Merging staging/staging-next $ git merge staging/staging-next Auto-merging drivers/staging/asus_oled/asus_oled.c Removing drivers/staging/bcm/Arp.c Removing drivers/staging/bcm/Debug.c Removing drivers/staging/bcm/HostMibs.h Auto-merging drivers/staging/bcm/InterfaceInit.c Removing drivers/staging/bcm/Interfacemain.h Removing drivers/staging/bcm/Osal_Misc.c Removing drivers/staging/bcm/osal_misc.h Removing drivers/staging/brcm80211/include/bcm_rpc.h Removing drivers/staging/brcm80211/include/bcm_rpc_tp.h Removing drivers/staging/brcm80211/include/bcm_xdr.h Removing drivers/staging/brcm80211/include/dbus.h Removing drivers/staging/brcm80211/include/epivers.h Removing drivers/staging/brcm80211/include/linuxver.h Removing drivers/staging/brcm80211/sys/wlc_rpc.h Removing drivers/staging/brcm80211/sys/wlc_rpctx.h Auto-merging drivers/staging/comedi/drivers/usbdux.c Auto-merging drivers/staging/easycap/easycap.h Auto-merging drivers/staging/go7007/go7007-driver.c Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c Auto-merging drivers/staging/intel_sst/intel_sst_stream_encoded.c Auto-merging drivers/staging/rtl8712/osdep_service.h Auto-merging drivers/staging/spectra/ffsport.c Auto-merging drivers/staging/udlfb/udlfb.c Removing drivers/staging/winbond/wbhal_f.h Merge made by recursive. drivers/staging/Kconfig | 6 + drivers/staging/Makefile | 3 + drivers/staging/asus_oled/asus_oled.c | 2 +- .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 4 +- drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- drivers/staging/autofs/dirhash.c | 87 +- drivers/staging/batman-adv/vis.c | 3 +- drivers/staging/bcm/Adapter.h | 134 +- drivers/staging/bcm/Arp.c | 94 - drivers/staging/bcm/Bcmchar.c | 967 ++--- drivers/staging/bcm/Bcmnet.c | 404 +- drivers/staging/bcm/CmHost.c | 139 +- drivers/staging/bcm/CmHost.h | 3 - drivers/staging/bcm/DDRInit.c | 17 +- 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 | 136 +- drivers/staging/bcm/InterfaceIdleMode.c | 20 +- drivers/staging/bcm/InterfaceIdleMode.h | 2 - drivers/staging/bcm/InterfaceInit.c | 316 +- drivers/staging/bcm/InterfaceInit.h | 27 +- drivers/staging/bcm/InterfaceIsr.c | 44 +- drivers/staging/bcm/InterfaceMisc.c | 29 +- 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 | 534 +-- 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 | 10 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 270 +-- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 7 +- .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 + drivers/staging/brcm80211/brcmfmac/dhd.h | 9 +- drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 4 +- drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 5 +- drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1 + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 2 +- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 64 +- .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 1 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 89 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 24 +- drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +- drivers/staging/brcm80211/include/bcm_rpc.h | 79 - drivers/staging/brcm80211/include/bcm_rpc_tp.h | 137 - drivers/staging/brcm80211/include/bcm_xdr.h | 60 - drivers/staging/brcm80211/include/bcmdefs.h | 56 +- drivers/staging/brcm80211/include/bcmsdbus.h | 4 +- drivers/staging/brcm80211/include/bcmsdh.h | 10 +- drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 6 +- drivers/staging/brcm80211/include/bcmsrom.h | 8 +- drivers/staging/brcm80211/include/bcmutils.h | 19 +- drivers/staging/brcm80211/include/d11.h | 7 - drivers/staging/brcm80211/include/dbus.h | 353 -- drivers/staging/brcm80211/include/epivers.h | 44 - drivers/staging/brcm80211/include/hnddma.h | 4 +- drivers/staging/brcm80211/include/hndpmu.h | 44 +- drivers/staging/brcm80211/include/linux_osl.h | 150 +- drivers/staging/brcm80211/include/linuxver.h | 38 - drivers/staging/brcm80211/include/nicpci.h | 10 +- drivers/staging/brcm80211/include/osl.h | 23 +- drivers/staging/brcm80211/include/rpc_osl.h | 2 +- drivers/staging/brcm80211/include/siutils.h | 20 +- drivers/staging/brcm80211/include/wlioctl.h | 341 +-- drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 22 +- drivers/staging/brcm80211/phy/wlc_phy_hal.h | 6 - drivers/staging/brcm80211/phy/wlc_phy_int.h | 2 +- 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_export.h | 8 +- drivers/staging/brcm80211/sys/wl_mac80211.c | 615 +--- drivers/staging/brcm80211/sys/wl_mac80211.h | 38 +- drivers/staging/brcm80211/sys/wlc_alloc.c | 36 +- drivers/staging/brcm80211/sys/wlc_alloc.h | 10 +- drivers/staging/brcm80211/sys/wlc_ampdu.c | 81 +- drivers/staging/brcm80211/sys/wlc_ampdu.h | 4 - drivers/staging/brcm80211/sys/wlc_antsel.c | 9 +- drivers/staging/brcm80211/sys/wlc_antsel.h | 2 +- drivers/staging/brcm80211/sys/wlc_bmac.c | 61 +- drivers/staging/brcm80211/sys/wlc_bmac.h | 16 +- drivers/staging/brcm80211/sys/wlc_cfg.h | 24 - drivers/staging/brcm80211/sys/wlc_channel.c | 7 +- drivers/staging/brcm80211/sys/wlc_event.c | 7 +- drivers/staging/brcm80211/sys/wlc_mac80211.c | 306 +-- drivers/staging/brcm80211/sys/wlc_mac80211.h | 65 +- drivers/staging/brcm80211/sys/wlc_phy_shim.c | 7 +- drivers/staging/brcm80211/sys/wlc_pub.h | 21 +- drivers/staging/brcm80211/sys/wlc_rate.c | 4 +- drivers/staging/brcm80211/sys/wlc_rpc.h | 527 --- drivers/staging/brcm80211/sys/wlc_rpctx.h | 71 - drivers/staging/brcm80211/sys/wlc_stf.c | 6 +- drivers/staging/brcm80211/sys/wlc_types.h | 5 - drivers/staging/brcm80211/util/aiutils.c | 6 +- drivers/staging/brcm80211/util/bcmotp.c | 13 +- drivers/staging/brcm80211/util/bcmsrom.c | 64 +- drivers/staging/brcm80211/util/bcmutils.c | 23 +- drivers/staging/brcm80211/util/bcmwifi.c | 4 + drivers/staging/brcm80211/util/hnddma.c | 33 +- drivers/staging/brcm80211/util/hndpmu.c | 79 +- drivers/staging/brcm80211/util/linux_osl.c | 230 +- drivers/staging/brcm80211/util/nicpci.c | 121 +- drivers/staging/brcm80211/util/nvram/nvram_ro.c | 2 +- drivers/staging/brcm80211/util/sbutils.c | 3 + drivers/staging/brcm80211/util/siutils.c | 16 +- drivers/staging/comedi/drivers.c | 4 +- .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- .../staging/comedi/drivers/addi-data/addi_common.c | 4 +- .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- drivers/staging/comedi/drivers/comedi_bond.c | 2 +- drivers/staging/comedi/drivers/rtd520.c | 2 +- drivers/staging/comedi/drivers/usbdux.c | 2 +- drivers/staging/cptm1217/Kconfig | 12 + 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/crystalhd/crystalhd_hw.c | 2 +- drivers/staging/crystalhd/crystalhd_lnx.c | 6 +- drivers/staging/easycap/Kconfig | 1 - drivers/staging/easycap/Makefile | 1 + drivers/staging/easycap/README | 93 +- drivers/staging/easycap/easycap.h | 186 +- drivers/staging/easycap/easycap_debug.h | 2 + drivers/staging/easycap/easycap_ioctl.c | 2286 ++++++----- drivers/staging/easycap/easycap_low.c | 895 +++-- drivers/staging/easycap/easycap_main.c | 2782 ++++++++----- drivers/staging/easycap/easycap_settings.c | 272 ++- drivers/staging/easycap/easycap_sound.c | 603 ++- drivers/staging/easycap/easycap_testcard.c | 372 +- drivers/staging/et131x/et131x_initpci.c | 2 +- drivers/staging/frontier/alphatrack.c | 4 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 54 +- drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 8 +- drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 32 +- .../staging/ft1000/ft1000-usb/ft1000_download.c | 234 +- drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 415 +-- drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 4 +- drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 +- drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 21 +- drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 45 +- drivers/staging/go7007/go7007-driver.c | 2 +- drivers/staging/hv/channel.c | 338 +- drivers/staging/hv/channel_mgmt.c | 194 +- drivers/staging/hv/channel_mgmt.h | 244 +- drivers/staging/hv/connection.c | 56 +- drivers/staging/hv/hv.c | 346 +- drivers/staging/hv/hv.h | 36 +- drivers/staging/hv/hv_api.h | 278 +- drivers/staging/hv/hv_utils.c | 12 +- drivers/staging/hv/netvsc.c | 24 +- drivers/staging/hv/netvsc_drv.c | 3 + drivers/staging/hv/osd.c | 74 +- drivers/staging/hv/osd.h | 18 +- drivers/staging/hv/ring_buffer.c | 404 +- drivers/staging/hv/ring_buffer.h | 56 +- drivers/staging/hv/rndis_filter.c | 10 +- drivers/staging/hv/storvsc.c | 16 +- drivers/staging/hv/vmbus.c | 32 +- drivers/staging/hv/vmbus_drv.c | 53 +- 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/accel/lis3l02dq_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 | 300 ++ 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 | 264 ++ drivers/staging/iio/dds/ad9850.c | 156 + drivers/staging/iio/dds/ad9852.c | 305 ++ drivers/staging/iio/dds/ad9910.c | 440 +++ drivers/staging/iio/dds/ad9951.c | 249 ++ 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 +- drivers/staging/intel_sst/intel_sst.h | 8 +- .../staging/intel_sst/intel_sst_app_interface.c | 158 +- drivers/staging/intel_sst/intel_sst_common.h | 4 +- .../staging/intel_sst/intel_sst_drv_interface.c | 184 +- drivers/staging/intel_sst/intel_sst_dsp.c | 67 +- drivers/staging/intel_sst/intel_sst_fw_ipc.h | 111 +- 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 | 20 +- .../staging/intel_sst/intel_sst_stream_encoded.c | 214 +- drivers/staging/intel_sst/intelmid.c | 192 +- drivers/staging/intel_sst/intelmid.h | 5 - drivers/staging/intel_sst/intelmid_ctrl.c | 28 +- drivers/staging/intel_sst/intelmid_msic_control.c | 24 +- drivers/staging/intel_sst/intelmid_pvt.c | 54 +- drivers/staging/intel_sst/intelmid_v0_control.c | 32 +- drivers/staging/intel_sst/intelmid_v1_control.c | 70 +- drivers/staging/intel_sst/intelmid_v2_control.c | 96 +- drivers/staging/keucr/ms.c | 10 +- drivers/staging/keucr/smilmain.c | 4 +- drivers/staging/keucr/smilsub.c | 4 +- drivers/staging/msm/Makefile | 4 +- drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- drivers/staging/pohmelfs/crypto.c | 6 +- drivers/staging/rt2860/chip/mac_pci.h | 7 +- drivers/staging/rt2860/chip/mac_usb.h | 5 +- drivers/staging/rt2860/chip/rtmp_mac.h | 19 +- drivers/staging/rt2860/chips/rt3090.c | 5 +- drivers/staging/rt2860/chips/rt30xx.c | 9 +- drivers/staging/rt2860/common/ba_action.c | 12 +- drivers/staging/rt2860/common/cmm_data_pci.c | 4 +- drivers/staging/rt2860/mlme.h | 41 +- drivers/staging/rt2860/oid.h | 13 +- drivers/staging/rt2860/pci_main_dev.c | 17 +- drivers/staging/rt2860/rt_linux.c | 14 +- drivers/staging/rt2860/rt_linux.h | 5 +- drivers/staging/rt2860/rt_main_dev.c | 16 +- drivers/staging/rt2860/rt_pci_rbus.c | 7 +- drivers/staging/rt2860/rt_usb.c | 13 +- drivers/staging/rt2860/rtmp.h | 71 +- drivers/staging/rt2860/rtmp_def.h | 37 +- drivers/staging/rt2860/rtmp_timer.h | 13 +- drivers/staging/rt2860/spectrum.h | 12 +- drivers/staging/rt2860/sta/assoc.c | 13 +- drivers/staging/rt2860/sta/auth.c | 7 +- drivers/staging/rt2860/sta/connect.c | 35 +- drivers/staging/rt2860/sta/rtmp_data.c | 33 +- drivers/staging/rt2860/sta/sanity.c | 5 +- drivers/staging/rt2860/sta/sync.c | 19 +- drivers/staging/rt2860/sta/wpa.c | 5 +- drivers/staging/rt2860/sta_ioctl.c | 25 +- drivers/staging/rt2860/usb_main_dev.c | 8 +- drivers/staging/rt2860/wpa.h | 5 +- drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192e/r8192E_core.c | 4 +- drivers/staging/rtl8192e/r819xE_phy.c | 2 +- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- drivers/staging/rtl8192u/r8192U_core.c | 4 +- drivers/staging/rtl8192u/r819xU_phy.c | 2 +- drivers/staging/rtl8712/TODO | 1 - drivers/staging/rtl8712/osdep_service.h | 25 +- drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- drivers/staging/rtl8712/usb_intf.c | 2 +- drivers/staging/sep/Kconfig | 11 + drivers/staging/sep/Makefile | 2 + drivers/staging/sep/TODO | 12 + drivers/staging/sep/sep_dev.h | 156 + drivers/staging/sep/sep_driver.c | 4152 ++++++++++++++++++++ drivers/staging/sep/sep_driver_api.h | 309 ++ drivers/staging/sep/sep_driver_config.h | 428 ++ drivers/staging/sep/sep_driver_hw_defs.h | 234 ++ drivers/staging/solo6x10/Kconfig | 2 +- drivers/staging/solo6x10/TODO | 4 - drivers/staging/solo6x10/solo6010-core.c | 42 +- drivers/staging/solo6x10/solo6010-disp.c | 6 +- drivers/staging/solo6x10/solo6010-enc.c | 6 +- drivers/staging/solo6x10/solo6010-g723.c | 22 +- drivers/staging/solo6x10/solo6010-gpio.c | 4 +- drivers/staging/solo6x10/solo6010-i2c.c | 13 +- drivers/staging/solo6x10/solo6010-osd-font.h | 60 +- drivers/staging/solo6x10/solo6010-p2m.c | 156 +- drivers/staging/solo6x10/solo6010-tw28.c | 118 +- drivers/staging/solo6x10/solo6010-v4l2-enc.c | 370 ++- drivers/staging/solo6x10/solo6010-v4l2.c | 197 +- drivers/staging/solo6x10/solo6010.h | 39 +- drivers/staging/speakup/spk_types.h | 2 +- drivers/staging/spectra/ffsport.c | 61 +- drivers/staging/spectra/ffsport.h | 1 + drivers/staging/spectra/flash.c | 4 +- drivers/staging/spectra/lld_emu.c | 6 +- drivers/staging/spectra/lld_nand.c | 177 +- 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/tidspbridge/core/tiomap3430.c | 4 +- drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- drivers/staging/udlfb/udlfb.c | 5 +- drivers/staging/vme/bridges/vme_ca91cx42.c | 233 +- drivers/staging/vme/bridges/vme_ca91cx42.h | 2 +- drivers/staging/vme/bridges/vme_tsi148.c | 262 +- drivers/staging/vme/bridges/vme_tsi148.h | 2 +- drivers/staging/vme/devices/vme_user.c | 59 +- drivers/staging/vme/vme.c | 116 +- drivers/staging/vme/vme_bridge.h | 2 +- drivers/staging/vt6655/card.c | 2 +- drivers/staging/vt6655/iwctl.c | 2 +- drivers/staging/vt6655/wpa2.c | 4 +- drivers/staging/vt6656/baseband.c | 2 +- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/dpc.c | 4 +- drivers/staging/vt6656/iwctl.c | 2 +- drivers/staging/vt6656/power.c | 2 +- drivers/staging/vt6656/rxtx.c | 3 +- drivers/staging/vt6656/tkip.c | 37 +- drivers/staging/vt6656/wpa2.c | 4 +- .../arch/arm/mach-omap2/cyashalomap_kernel.c | 10 +- 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_pci.c | 2 +- drivers/staging/wlags49_h2/wl_profile.c | 2 +- drivers/staging/wlags49_h2/wl_sysfs.c | 4 +- drivers/staging/wlan-ng/p80211conv.c | 45 +- drivers/staging/wlan-ng/p80211conv.h | 6 +- drivers/staging/wlan-ng/p80211netdev.c | 6 +- drivers/staging/wlan-ng/p80211netdev.h | 10 +- drivers/staging/wlan-ng/p80211types.h | 4 +- drivers/staging/wlan-ng/prism2mgmt.c | 26 +- drivers/staging/xgifb/XGI_main_26.c | 9 +- drivers/staging/zram/zram_drv.c | 3 +- drivers/usb/serial/option.c | 1 - 424 files changed, 42668 insertions(+), 14744 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/bcm_rpc.h delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc_tp.h delete mode 100644 drivers/staging/brcm80211/include/bcm_xdr.h delete mode 100644 drivers/staging/brcm80211/include/dbus.h delete mode 100644 drivers/staging/brcm80211/include/epivers.h delete mode 100644 drivers/staging/brcm80211/include/linuxver.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpc.h delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpctx.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/sep/Kconfig create mode 100644 drivers/staging/sep/Makefile create mode 100644 drivers/staging/sep/TODO create mode 100644 drivers/staging/sep/sep_dev.h create mode 100644 drivers/staging/sep/sep_driver.c create mode 100644 drivers/staging/sep/sep_driver_api.h create mode 100644 drivers/staging/sep/sep_driver_config.h create mode 100644 drivers/staging/sep/sep_driver_hw_defs.h 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 create mode 100644 drivers/staging/vme/bridges/Module.symvers 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 Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. Resolved 'include/linux/hardirq.h' using previous resolution. Resolved 'include/linux/smp_lock.h' using previous resolution. Auto-merging arch/powerpc/kernel/setup_64.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c Auto-merging arch/tile/kernel/compat.c Auto-merging arch/tile/kernel/signal.c Auto-merging block/compat_ioctl.c Auto-merging block/ioctl.c Auto-merging drivers/block/drbd/drbd_receiver.c Auto-merging drivers/block/drbd/drbd_worker.c Auto-merging drivers/char/amiserial.c Auto-merging drivers/input/input.c Auto-merging drivers/media/dvb/ngene/ngene-core.c Auto-merging drivers/media/video/cx88/cx88-video.c Auto-merging drivers/media/video/pwc/pwc-if.c Auto-merging drivers/media/video/saa7164/saa7164.h Auto-merging drivers/pci/proc.c Auto-merging drivers/s390/char/vmlogrdr.c Auto-merging drivers/scsi/hpsa.c Auto-merging drivers/staging/Kconfig Auto-merging drivers/staging/cx25821/cx25821.h Auto-merging drivers/staging/easycap/easycap.h Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c Auto-merging drivers/staging/rtl8712/osdep_service.h Auto-merging drivers/usb/core/devio.c Auto-merging drivers/usb/gadget/f_fs.c Auto-merging drivers/usb/host/isp1362-hcd.c Auto-merging drivers/xen/xenfs/privcmd.c Auto-merging fs/ceph/inode.c Auto-merging fs/ceph/mds_client.c Auto-merging fs/ioctl.c Auto-merging fs/locks.c Auto-merging fs/nfs/super.c Auto-merging fs/nfsd/nfs4state.c Auto-merging fs/reiserfs/ioctl.c Auto-merging include/linux/hardirq.h CONFLICT (content): Merge conflict in include/linux/hardirq.h Auto-merging include/linux/smp_lock.h CONFLICT (content): Merge conflict in include/linux/smp_lock.h Auto-merging include/linux/tty.h Auto-merging kernel/trace/trace.c Auto-merging net/sunrpc/svc_xprt.c Auto-merging sound/core/pcm_native.c Auto-merging sound/core/sound.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master ad9053c] Merge remote branch 'bkl-config/config' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/Kconfig | 4 ++-- drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- drivers/gpu/drm/i810/i810_drv.c | 6 +++++- drivers/staging/Kconfig | 11 +++++++++++ drivers/staging/cx25821/cx25821.h | 1 - include/linux/smp_lock.h | 15 ++------------- lib/Kconfig.debug | 9 --------- 7 files changed, 21 insertions(+), 43 deletions(-) Merging irqflags/master $ git merge irqflags/master Already up-to-date. Merging cleancache/linux-next $ git merge cleancache/linux-next Resolved 'fs/ocfs2/super.c' using previous resolution. 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 CONFLICT (content): Merge conflict in 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 83d8d59] 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