--- /dev/null
+$ date
+Friday 7 September 10:41:19 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 5b716ac Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
+Merging origin/master (eeea3ac Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
+$ git merge origin/master
+Updating 5b716ac..eeea3ac
+Fast-forward
+ Documentation/feature-removal-schedule.txt | 2 +-
+ arch/arm/boot/dts/at91sam9g25ek.dts | 2 +-
+ arch/arm/configs/armadillo800eva_defconfig | 2 +-
+ arch/arm/mach-at91/at91rm9200_time.c | 2 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 10 ++-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 6 +-
+ arch/arm/mach-at91/clock.c | 12 ++++
+ arch/arm/mach-gemini/irq.c | 1 +
+ arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 1 +
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 13 ++--
+ arch/arm/mach-shmobile/board-mackerel.c | 3 +-
+ arch/arm/mach-shmobile/board-marzen.c | 2 +-
+ arch/arm/mach-shmobile/intc-sh73a0.c | 4 +-
+ arch/powerpc/include/asm/processor.h | 1 +
+ arch/powerpc/kernel/asm-offsets.c | 1 +
+ arch/powerpc/kernel/dbell.c | 2 +
+ arch/powerpc/kernel/entry_64.S | 23 +++++--
+ arch/powerpc/kernel/exceptions-64s.S | 3 +-
+ arch/powerpc/kernel/idle_power7.S | 2 +
+ arch/powerpc/kernel/process.c | 12 +---
+ arch/powerpc/kernel/smp.c | 11 ++-
+ arch/powerpc/kernel/sysfs.c | 10 +++
+ arch/powerpc/kernel/time.c | 9 +++
+ arch/powerpc/kernel/traps.c | 3 +-
+ arch/powerpc/lib/code-patching.c | 2 +-
+ arch/powerpc/mm/numa.c | 7 +-
+ arch/powerpc/platforms/powernv/smp.c | 10 +--
+ arch/powerpc/sysdev/xics/icp-hv.c | 6 +-
+ arch/um/os-Linux/time.c | 2 +-
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-em.c | 4 +-
+ drivers/gpio/gpio-rdc321x.c | 1 +
+ drivers/gpio/gpiolib-of.c | 2 +-
+ drivers/hid/hid-logitech-dj.c | 4 +-
+ drivers/mmc/card/block.c | 26 +++++++-
+ drivers/mmc/host/atmel-mci.c | 6 +-
+ drivers/mmc/host/bfin_sdh.c | 7 --
+ drivers/mmc/host/dw_mmc.c | 85 +++++++++++++-----------
+ drivers/mmc/host/mxs-mmc.c | 14 ++--
+ drivers/mmc/host/omap.c | 14 +++-
+ drivers/mmc/host/sdhci-esdhc.h | 6 +-
+ drivers/mtd/ubi/vtbl.c | 4 +-
+ drivers/rtc/rtc-at91sam9.c | 22 ++++--
+ drivers/video/auo_k190x.c | 2 -
+ drivers/video/console/bitblit.c | 2 +-
+ drivers/video/console/fbcon.c | 2 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 2 +
+ drivers/video/omap2/dss/sdi.c | 14 ++++
+ drivers/video/omap2/omapfb/omapfb-main.c | 2 +-
+ include/linux/kernel.h | 12 +++-
+ include/linux/mmc/card.h | 1 +
+ mm/mempolicy.c | 2 +-
+ net/socket.c | 4 +-
+ scripts/Makefile.fwinst | 2 +-
+ scripts/link-vmlinux.sh | 2 +-
+ sound/pci/hda/hda_codec.c | 10 ++-
+ sound/pci/hda/hda_codec.h | 1 +
+ sound/pci/hda/patch_sigmatel.c | 4 ++
+ sound/usb/card.c | 4 +-
+ sound/usb/endpoint.c | 24 +++----
+ sound/usb/endpoint.h | 3 +-
+ sound/usb/pcm.c | 64 ++++++++++++++----
+ 65 files changed, 362 insertions(+), 174 deletions(-)
+Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (6c7080a firmware: fix directory creation rule matching with make 3.82)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (36418c5 ARM: 7499/1: mm: Fix vmalloc overlap check for !HIGHMEM)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/compressed/head.S | 4 +++
+ arch/arm/include/asm/tlb.h | 4 +++
+ arch/arm/kernel/hw_breakpoint.c | 62 +++++++++++++++++++++++++++------------
+ arch/arm/mm/context.c | 7 +++--
+ arch/arm/mm/mm.h | 3 ++
+ arch/arm/mm/mmu.c | 8 ++---
+ 6 files changed, 63 insertions(+), 25 deletions(-)
+Merging m68k-current/for-linus (3be7184 m68k: Add missing RCU idle APIs on idle loop)
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/kernel/process.c | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging powerpc-merge/merge (636802e powerpc: Don't use __put_user() in patch_instruction)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (6dab7ed Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (d90c92f ibmveth: Fix alignment of rx queue bug)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/isdn/hardware/mISDN/hfcmulti.c | 2 ++
+ drivers/net/can/mcp251x.c | 11 ++++++++++-
+ drivers/net/ethernet/i825xx/znet.c | 13 +++++++++----
+ drivers/net/ethernet/ibm/ibmveth.c | 26 +++++++++-----------------
+ drivers/net/usb/usbnet.c | 16 ++++++++++++----
+ include/net/xfrm.h | 3 +++
+ net/core/sock.c | 7 ++++++-
+ net/ipv6/tcp_ipv6.c | 5 +++--
+ net/l2tp/l2tp_core.c | 4 ++++
+ net/l2tp/l2tp_eth.c | 2 +-
+ net/netrom/af_netrom.c | 7 ++++++-
+ net/openvswitch/actions.c | 2 +-
+ net/openvswitch/datapath.c | 6 +++---
+ net/openvswitch/flow.h | 8 +++++---
+ net/sched/sch_fq_codel.c | 2 +-
+ net/sctp/output.c | 21 ++++++++++++++++++++-
+ net/xfrm/xfrm_input.c | 2 +-
+ net/xfrm/xfrm_replay.c | 15 +++++++++++++++
+ 18 files changed, 111 insertions(+), 41 deletions(-)
+Merging sound-current/for-linus (1213a20 ALSA: usb-audio: Fix bogus error messages for delay accounting)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_sigmatel.c | 2 +-
+ sound/usb/pcm.c | 6 ++++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-pci | 12 +++++++++
+ drivers/pci/pci-driver.c | 6 +++++
+ drivers/pci/pci-sysfs.c | 42 +++++++++++++++++++++++++++++++
+ drivers/pci/pci.c | 1 +
+ drivers/pci/pcie/portdrv_pci.c | 14 +++++++++++
+ drivers/pci/probe.c | 31 ++++++++++++-----------
+ 6 files changed, 92 insertions(+), 14 deletions(-)
+Merging wireless/master (f107238 libertas sdio: fix suspend when interface is down)
+$ git merge wireless/master
+Auto-merging net/bluetooth/l2cap_sock.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/ath3k.c | 2 +
+ drivers/bluetooth/btusb.c | 12 ++-
+ drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 105 +++++++++++++++++++-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 4 +
+ drivers/net/wireless/ath/ath9k/gpio.c | 3 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 11 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 1 +
+ drivers/net/wireless/ath/ath9k/link.c | 18 ++--
+ drivers/net/wireless/ath/ath9k/xmit.c | 3 +
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 30 +++---
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 15 +--
+ drivers/net/wireless/libertas/if_sdio.c | 5 +
+ drivers/net/wireless/mwifiex/cmdevt.c | 15 ++-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 9 ++
+ drivers/net/wireless/rt2x00/rt2400pci.h | 1 +
+ drivers/net/wireless/rt2x00/rt2500pci.c | 9 ++
+ drivers/net/wireless/rt2x00/rt2500usb.c | 11 +-
+ drivers/net/wireless/rt2x00/rt2500usb.h | 17 ++--
+ drivers/net/wireless/rt2x00/rt2800lib.c | 1 +
+ drivers/net/wireless/rt2x00/rt2800pci.c | 9 ++
+ drivers/net/wireless/rt2x00/rt2800usb.c | 22 +++-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 9 ++
+ drivers/net/wireless/rt2x00/rt61pci.h | 1 +
+ drivers/net/wireless/rt2x00/rt73usb.c | 9 ++
+ drivers/net/wireless/rt2x00/rt73usb.h | 3 +
+ include/net/bluetooth/smp.h | 2 +-
+ net/bluetooth/hci_conn.c | 4 +
+ net/bluetooth/l2cap_core.c | 11 +-
+ net/bluetooth/l2cap_sock.c | 2 +-
+ net/bluetooth/smp.c | 10 +-
+ net/mac80211/cfg.c | 9 +-
+ net/mac80211/mlme.c | 4 +
+ net/wireless/nl80211.c | 4 +-
+ 34 files changed, 297 insertions(+), 76 deletions(-)
+Merging driver-core.current/driver-core-linus (60e233a kobject: fix oops with "input0: bad kobj_uevent_env content in show_uevent()")
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ include/linux/kobject.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging tty.current/tty-linus (7be0670 tty: serial: imx: don't reinit clock in imx_setup_ufcr())
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/tty/serial/imx.c | 30 +++++++++++++++---------------
+ 1 file changed, 15 insertions(+), 15 deletions(-)
+Merging usb.current/usb-linus (7f7cd3c Merge tag 'for-usb-linus-2012-09-05' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/core/quirks.c | 4 ++
+ drivers/usb/host/ohci-at91.c | 10 +++
+ drivers/usb/host/pci-quirks.c | 42 ++++++++++---
+ drivers/usb/host/pci-quirks.h | 1 +
+ drivers/usb/host/xhci-hub.c | 42 +++++++++++++
+ drivers/usb/host/xhci-plat.c | 2 +-
+ drivers/usb/host/xhci.c | 123 ++++++++++++++++++++++++++++++++++++-
+ drivers/usb/host/xhci.h | 6 ++
+ drivers/usb/serial/ftdi_sio.c | 18 ++++++
+ drivers/usb/serial/ftdi_sio_ids.h | 24 +++++++-
+ 10 files changed, 262 insertions(+), 10 deletions(-)
+Merging staging.current/staging-linus (6d7d979 staging: zcache: fix cleancache race condition with shrinker)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/iio/adc/at91_adc.c | 2 +-
+ drivers/staging/android/android_alarm.h | 4 ++-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 7 +++++
+ drivers/staging/comedi/drivers/amplc_pc236.c | 7 +++++
+ drivers/staging/comedi/drivers/amplc_pc263.c | 7 +++++
+ drivers/staging/comedi/drivers/amplc_pci224.c | 7 +++++
+ drivers/staging/comedi/drivers/amplc_pci230.c | 7 +++++
+ drivers/staging/comedi/drivers/das08.c | 11 +++++--
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 4 ++-
+ drivers/staging/iio/adc/ad7192.c | 2 ++
+ drivers/staging/iio/gyro/adis16260_core.c | 2 ++
+ drivers/staging/iio/imu/adis16400_core.c | 2 ++
+ drivers/staging/iio/meter/ade7753.c | 2 ++
+ drivers/staging/iio/meter/ade7754.c | 2 ++
+ drivers/staging/iio/meter/ade7759.c | 2 ++
+ drivers/staging/ozwpan/ozcdev.c | 3 +-
+ drivers/staging/vt6656/dpc.c | 2 +-
+ drivers/staging/vt6656/rxtx.c | 38 ++++++++++++-------------
+ drivers/staging/wlan-ng/cfg80211.c | 4 +--
+ drivers/staging/zcache/zcache-main.c | 7 ++---
+ 20 files changed, 90 insertions(+), 32 deletions(-)
+Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (6f4d038 Input: wacom - add support for EMR on Cintiq 24HD touch)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/imx_keypad.c | 3 +++
+ drivers/input/serio/i8042-x86ia64io.h | 14 ++++++++++++++
+ drivers/input/tablet/wacom_wac.c | 6 +++++-
+ drivers/input/touchscreen/edt-ft5x06.c | 2 +-
+ 4 files changed, 23 insertions(+), 2 deletions(-)
+Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (3b75a2c crypto/caam: Export gen_split_key symbol for other modules)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ drivers/crypto/caam/key_gen.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
+$ git merge devicetree-current/devicetree/merge
+Auto-merging drivers/of/base.c
+Merge made by the 'recursive' strategy.
+ drivers/of/base.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
+$ git merge spi-current/spi/merge
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-bcm63xx.c
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm63xx.c | 16 ++++++----------
+ drivers/spi/spi-s3c64xx.c | 10 ++++------
+ drivers/spi/spi.c | 5 ++++-
+ 3 files changed, 14 insertions(+), 17 deletions(-)
+Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging arm/for-next (17a962a Merge branches 'fixes' and 'misc' into for-next)
+$ git merge arm/for-next
+Removing arch/arm/mach-sa1100/include/mach/lart.h
+Removing arch/arm/mach-sa1100/include/mach/SA-1111.h
+Removing arch/arm/kernel/compat.h
+Auto-merging arch/arm/kernel/atags_compat.c
+Removing arch/arm/include/asm/unaligned.h
+Removing arch/arm/include/asm/types.h
+Removing arch/arm/include/asm/termios.h
+Removing arch/arm/include/asm/termbits.h
+Removing arch/arm/include/asm/sockios.h
+Removing arch/arm/include/asm/socket.h
+Removing arch/arm/include/asm/shmbuf.h
+Removing arch/arm/include/asm/serial.h
+Removing arch/arm/include/asm/sembuf.h
+Removing arch/arm/include/asm/segment.h
+Removing arch/arm/include/asm/parport.h
+Removing arch/arm/include/asm/param.h
+Removing arch/arm/include/asm/msgbuf.h
+Removing arch/arm/include/asm/ipcbuf.h
+Removing arch/arm/include/asm/hardware/linkup-l1110.h
+Removing arch/arm/include/asm/exec.h
+Removing arch/arm/include/asm/current.h
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/compressed/decompress.c | 3 +
+ arch/arm/include/asm/Kbuild | 17 ++
+ arch/arm/include/asm/current.h | 15 --
+ arch/arm/include/asm/exec.h | 6 -
+ arch/arm/include/asm/glue-cache.h | 16 +-
+ arch/arm/include/asm/hardware/linkup-l1110.h | 48 ------
+ arch/arm/include/asm/io.h | 67 +++++++-
+ arch/arm/include/asm/ipcbuf.h | 1 -
+ arch/arm/include/asm/msgbuf.h | 31 ----
+ arch/arm/include/asm/mutex.h | 9 +-
+ arch/arm/include/asm/param.h | 31 ----
+ arch/arm/include/asm/parport.h | 18 --
+ arch/arm/include/asm/segment.h | 11 --
+ arch/arm/include/asm/sembuf.h | 25 ---
+ arch/arm/include/asm/serial.h | 19 --
+ arch/arm/include/asm/shmbuf.h | 42 -----
+ arch/arm/include/asm/socket.h | 72 --------
+ arch/arm/include/asm/sockios.h | 13 --
+ arch/arm/include/asm/termbits.h | 198 ---------------------
+ arch/arm/include/asm/termios.h | 92 ----------
+ arch/arm/include/asm/thread_info.h | 2 +
+ arch/arm/include/asm/timex.h | 6 +-
+ arch/arm/include/asm/types.h | 16 --
+ arch/arm/include/asm/unaligned.h | 19 --
+ arch/arm/kernel/Makefile | 6 +-
+ arch/arm/kernel/asm-offsets.c | 2 +
+ arch/arm/kernel/atags.h | 3 +
+ arch/arm/kernel/{compat.c => atags_compat.c} | 4 +-
+ arch/arm/kernel/atags_parse.c | 238 ++++++++++++++++++++++++++
+ arch/arm/kernel/{atags.c => atags_proc.c} | 0
+ arch/arm/kernel/compat.h | 11 --
+ arch/arm/kernel/setup.c | 236 +------------------------
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 6 +-
+ arch/arm/mach-sa1100/include/mach/SA-1111.h | 5 -
+ arch/arm/mach-sa1100/include/mach/lart.h | 13 --
+ arch/arm/mach-shmobile/smp-emev2.c | 2 +-
+ arch/arm/mm/init.c | 2 +-
+ 38 files changed, 354 insertions(+), 953 deletions(-)
+ delete mode 100644 arch/arm/include/asm/current.h
+ delete mode 100644 arch/arm/include/asm/exec.h
+ delete mode 100644 arch/arm/include/asm/hardware/linkup-l1110.h
+ delete mode 100644 arch/arm/include/asm/ipcbuf.h
+ delete mode 100644 arch/arm/include/asm/msgbuf.h
+ delete mode 100644 arch/arm/include/asm/param.h
+ delete mode 100644 arch/arm/include/asm/parport.h
+ delete mode 100644 arch/arm/include/asm/segment.h
+ delete mode 100644 arch/arm/include/asm/sembuf.h
+ delete mode 100644 arch/arm/include/asm/serial.h
+ delete mode 100644 arch/arm/include/asm/shmbuf.h
+ delete mode 100644 arch/arm/include/asm/socket.h
+ delete mode 100644 arch/arm/include/asm/sockios.h
+ delete mode 100644 arch/arm/include/asm/termbits.h
+ delete mode 100644 arch/arm/include/asm/termios.h
+ delete mode 100644 arch/arm/include/asm/types.h
+ delete mode 100644 arch/arm/include/asm/unaligned.h
+ rename arch/arm/kernel/{compat.c => atags_compat.c} (99%)
+ create mode 100644 arch/arm/kernel/atags_parse.c
+ rename arch/arm/kernel/{atags.c => atags_proc.c} (100%)
+ delete mode 100644 arch/arm/kernel/compat.h
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/SA-1111.h
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/lart.h
+Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
+$ git merge arm-perf/for-next/perf
+Resolved 'arch/arm/kernel/hw_breakpoint.c' using previous resolution.
+Auto-merging arch/arm/plat-samsung/devs.c
+Removing arch/arm/kernel/pmu.c
+Auto-merging arch/arm/kernel/hw_breakpoint.c
+CONFLICT (content): Merge conflict in arch/arm/kernel/hw_breakpoint.c
+Auto-merging arch/arm/kernel/Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5f885e7] Merge remote-tracking branch 'arm-perf/for-next/perf'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/pmu.txt | 4 +
+ MAINTAINERS | 1 -
+ arch/arm/Kconfig | 8 +-
+ arch/arm/include/asm/perf_event.h | 9 +-
+ arch/arm/include/asm/pmu.h | 77 ++----
+ arch/arm/kernel/Makefile | 3 +-
+ arch/arm/kernel/perf_event.c | 347 ++++---------------------
+ arch/arm/kernel/perf_event_cpu.c | 295 +++++++++++++++++++++
+ arch/arm/kernel/perf_event_v6.c | 12 +-
+ arch/arm/kernel/perf_event_v7.c | 32 +--
+ arch/arm/kernel/perf_event_xscale.c | 10 +-
+ arch/arm/kernel/pmu.c | 36 ---
+ arch/arm/mach-bcmring/arch.c | 3 +-
+ arch/arm/mach-omap2/devices.c | 3 +-
+ arch/arm/mach-pxa/devices.c | 3 +-
+ arch/arm/mach-realview/realview_eb.c | 3 +-
+ arch/arm/mach-realview/realview_pb1176.c | 3 +-
+ arch/arm/mach-realview/realview_pb11mp.c | 3 +-
+ arch/arm/mach-realview/realview_pba8.c | 3 +-
+ arch/arm/mach-realview/realview_pbx.c | 3 +-
+ arch/arm/mach-tegra/devices.c | 3 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 3 +-
+ arch/arm/mach-vexpress/ct-ca9x4.c | 3 +-
+ arch/arm/plat-iop/pmu.c | 3 +-
+ arch/arm/plat-samsung/devs.c | 3 +-
+ 25 files changed, 424 insertions(+), 449 deletions(-)
+ create mode 100644 arch/arm/kernel/perf_event_cpu.c
+ delete mode 100644 arch/arm/kernel/pmu.c
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging arm64/upstream (5cc3bb3 fs: Build sys_stat64() and friends if __ARCH_WANT_COMPAT_STAT64)
+$ git merge arm64/upstream
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/booting.txt | 141 +++
+ Documentation/arm64/memory.txt | 69 ++
+ MAINTAINERS | 6 +
+ arch/arm64/Kconfig | 222 ++++
+ arch/arm64/Kconfig.debug | 27 +
+ arch/arm64/Makefile | 71 ++
+ arch/arm64/boot/.gitignore | 2 +
+ arch/arm64/boot/Makefile | 36 +
+ arch/arm64/boot/install.sh | 46 +
+ arch/arm64/configs/defconfig | 85 ++
+ arch/arm64/include/asm/Kbuild | 51 +
+ arch/arm64/include/asm/arm_generic.h | 100 ++
+ arch/arm64/include/asm/asm-offsets.h | 1 +
+ arch/arm64/include/asm/assembler.h | 109 ++
+ arch/arm64/include/asm/atomic.h | 305 ++++++
+ arch/arm64/include/asm/auxvec.h | 22 +
+ arch/arm64/include/asm/barrier.h | 52 +
+ arch/arm64/include/asm/bitops.h | 74 ++
+ arch/arm64/include/asm/bitsperlong.h | 23 +
+ arch/arm64/include/asm/byteorder.h | 21 +
+ arch/arm64/include/asm/cache.h | 32 +
+ arch/arm64/include/asm/cacheflush.h | 168 +++
+ arch/arm64/include/asm/cachetype.h | 48 +
+ arch/arm64/include/asm/cmpxchg.h | 173 ++++
+ arch/arm64/include/asm/compat.h | 242 +++++
+ arch/arm64/include/asm/compiler.h | 30 +
+ arch/arm64/include/asm/cputable.h | 30 +
+ arch/arm64/include/asm/cputype.h | 49 +
+ arch/arm64/include/asm/debug-monitors.h | 88 ++
+ arch/arm64/include/asm/device.h | 26 +
+ arch/arm64/include/asm/dma-mapping.h | 124 +++
+ arch/arm64/include/asm/elf.h | 179 ++++
+ arch/arm64/include/asm/exception.h | 23 +
+ arch/arm64/include/asm/exec.h | 23 +
+ arch/arm64/include/asm/fb.h | 34 +
+ arch/arm64/include/asm/fcntl.h | 29 +
+ arch/arm64/include/asm/fpsimd.h | 64 ++
+ arch/arm64/include/asm/futex.h | 136 +++
+ arch/arm64/include/asm/hardirq.h | 52 +
+ arch/arm64/include/asm/hw_breakpoint.h | 137 +++
+ arch/arm64/include/asm/hwcap.h | 53 +
+ arch/arm64/include/asm/io.h | 263 +++++
+ arch/arm64/include/asm/irq.h | 8 +
+ arch/arm64/include/asm/irqflags.h | 91 ++
+ arch/arm64/include/asm/memblock.h | 21 +
+ arch/arm64/include/asm/memory.h | 144 +++
+ arch/arm64/include/asm/mmu.h | 27 +
+ arch/arm64/include/asm/mmu_context.h | 152 +++
+ arch/arm64/include/asm/module.h | 23 +
+ arch/arm64/include/asm/page.h | 67 ++
+ arch/arm64/include/asm/param.h | 23 +
+ arch/arm64/include/asm/perf_event.h | 22 +
+ arch/arm64/include/asm/pgalloc.h | 113 ++
+ arch/arm64/include/asm/pgtable-2level-hwdef.h | 43 +
+ arch/arm64/include/asm/pgtable-2level-types.h | 60 ++
+ arch/arm64/include/asm/pgtable-3level-hwdef.h | 50 +
+ arch/arm64/include/asm/pgtable-3level-types.h | 66 ++
+ arch/arm64/include/asm/pgtable-hwdef.h | 94 ++
+ arch/arm64/include/asm/pgtable.h | 328 ++++++
+ arch/arm64/include/asm/pmu.h | 82 ++
+ arch/arm64/include/asm/proc-fns.h | 51 +
+ arch/arm64/include/asm/processor.h | 174 ++++
+ arch/arm64/include/asm/prom.h | 1 +
+ arch/arm64/include/asm/ptrace.h | 204 ++++
+ arch/arm64/include/asm/setup.h | 26 +
+ arch/arm64/include/asm/shmparam.h | 28 +
+ arch/arm64/include/asm/sigcontext.h | 69 ++
+ arch/arm64/include/asm/siginfo.h | 23 +
+ arch/arm64/include/asm/signal.h | 24 +
+ arch/arm64/include/asm/signal32.h | 53 +
+ arch/arm64/include/asm/smp.h | 69 ++
+ arch/arm64/include/asm/sparsemem.h | 24 +
+ arch/arm64/include/asm/spinlock.h | 202 ++++
+ arch/arm64/include/asm/spinlock_types.h | 38 +
+ arch/arm64/include/asm/stacktrace.h | 29 +
+ arch/arm64/include/asm/stat.h | 62 ++
+ arch/arm64/include/asm/statfs.h | 23 +
+ arch/arm64/include/asm/syscall.h | 101 ++
+ arch/arm64/include/asm/syscalls.h | 40 +
+ arch/arm64/include/asm/system_misc.h | 54 +
+ arch/arm64/include/asm/thread_info.h | 127 +++
+ arch/arm64/include/asm/timex.h | 29 +
+ arch/arm64/include/asm/tlb.h | 190 ++++
+ arch/arm64/include/asm/tlbflush.h | 122 +++
+ arch/arm64/include/asm/traps.h | 30 +
+ arch/arm64/include/asm/uaccess.h | 294 ++++++
+ arch/arm64/include/asm/ucontext.h | 30 +
+ arch/arm64/include/asm/unistd.h | 27 +
+ arch/arm64/include/asm/unistd32.h | 758 ++++++++++++++
+ arch/arm64/include/asm/vdso.h | 41 +
+ arch/arm64/include/asm/vdso_datapage.h | 43 +
+ arch/arm64/kernel/.gitignore | 1 +
+ arch/arm64/kernel/Makefile | 27 +
+ arch/arm64/kernel/arm64ksyms.c | 46 +
+ arch/arm64/kernel/asm-offsets.c | 108 ++
+ arch/arm64/kernel/cputable.c | 33 +
+ arch/arm64/kernel/debug-monitors.c | 288 ++++++
+ arch/arm64/kernel/entry-fpsimd.S | 80 ++
+ arch/arm64/kernel/entry.S | 695 +++++++++++++
+ arch/arm64/kernel/fpsimd.c | 106 ++
+ arch/arm64/kernel/head.S | 510 +++++++++
+ arch/arm64/kernel/hw_breakpoint.c | 880 ++++++++++++++++
+ arch/arm64/kernel/io.c | 64 ++
+ arch/arm64/kernel/irq.c | 84 ++
+ arch/arm64/kernel/kuser32.S | 77 ++
+ arch/arm64/kernel/module.c | 456 +++++++++
+ arch/arm64/kernel/perf_event.c | 1368 +++++++++++++++++++++++++
+ arch/arm64/kernel/process.c | 412 ++++++++
+ arch/arm64/kernel/ptrace.c | 834 +++++++++++++++
+ arch/arm64/kernel/setup.c | 351 +++++++
+ arch/arm64/kernel/signal.c | 437 ++++++++
+ arch/arm64/kernel/signal32.c | 876 ++++++++++++++++
+ arch/arm64/kernel/smp.c | 469 +++++++++
+ arch/arm64/kernel/stacktrace.c | 127 +++
+ arch/arm64/kernel/sys.c | 138 +++
+ arch/arm64/kernel/sys32.S | 282 +++++
+ arch/arm64/kernel/sys_compat.c | 164 +++
+ arch/arm64/kernel/time.c | 65 ++
+ arch/arm64/kernel/traps.c | 348 +++++++
+ arch/arm64/kernel/vdso.c | 261 +++++
+ arch/arm64/kernel/vdso/.gitignore | 2 +
+ arch/arm64/kernel/vdso/Makefile | 63 ++
+ arch/arm64/kernel/vdso/gen_vdso_offsets.sh | 15 +
+ arch/arm64/kernel/vdso/gettimeofday.S | 242 +++++
+ arch/arm64/kernel/vdso/note.S | 28 +
+ arch/arm64/kernel/vdso/sigreturn.S | 37 +
+ arch/arm64/kernel/vdso/vdso.S | 33 +
+ arch/arm64/kernel/vdso/vdso.lds.S | 100 ++
+ arch/arm64/kernel/vmlinux.lds.S | 126 +++
+ arch/arm64/lib/Makefile | 4 +
+ arch/arm64/lib/bitops.c | 25 +
+ arch/arm64/lib/clear_page.S | 39 +
+ arch/arm64/lib/clear_user.S | 58 ++
+ arch/arm64/lib/copy_from_user.S | 66 ++
+ arch/arm64/lib/copy_in_user.S | 63 ++
+ arch/arm64/lib/copy_page.S | 46 +
+ arch/arm64/lib/copy_to_user.S | 61 ++
+ arch/arm64/lib/delay.c | 55 +
+ arch/arm64/lib/strncpy_from_user.S | 50 +
+ arch/arm64/lib/strnlen_user.S | 47 +
+ arch/arm64/mm/Makefile | 4 +
+ arch/arm64/mm/cache.S | 251 +++++
+ arch/arm64/mm/context.c | 159 +++
+ arch/arm64/mm/copypage.c | 34 +
+ arch/arm64/mm/dma-mapping.c | 79 ++
+ arch/arm64/mm/extable.c | 17 +
+ arch/arm64/mm/fault.c | 534 ++++++++++
+ arch/arm64/mm/flush.c | 138 +++
+ arch/arm64/mm/init.c | 416 ++++++++
+ arch/arm64/mm/ioremap.c | 84 ++
+ arch/arm64/mm/mm.h | 2 +
+ arch/arm64/mm/mmap.c | 144 +++
+ arch/arm64/mm/mmu.c | 395 +++++++
+ arch/arm64/mm/pgd.c | 54 +
+ arch/arm64/mm/proc-macros.S | 55 +
+ arch/arm64/mm/proc.S | 181 ++++
+ arch/arm64/mm/tlb.S | 71 ++
+ drivers/clocksource/Kconfig | 5 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/arm_generic.c | 232 +++++
+ fs/stat.c | 4 +-
+ include/clocksource/arm_generic.h | 21 +
+ init/Kconfig | 3 +-
+ kernel/sysctl.c | 2 +-
+ lib/Kconfig.debug | 6 +-
+ tools/perf/perf.h | 6 +
+ 166 files changed, 21505 insertions(+), 6 deletions(-)
+ create mode 100644 Documentation/arm64/booting.txt
+ create mode 100644 Documentation/arm64/memory.txt
+ create mode 100644 arch/arm64/Kconfig
+ create mode 100644 arch/arm64/Kconfig.debug
+ create mode 100644 arch/arm64/Makefile
+ create mode 100644 arch/arm64/boot/.gitignore
+ create mode 100644 arch/arm64/boot/Makefile
+ create mode 100644 arch/arm64/boot/install.sh
+ create mode 100644 arch/arm64/configs/defconfig
+ create mode 100644 arch/arm64/include/asm/Kbuild
+ create mode 100644 arch/arm64/include/asm/arm_generic.h
+ create mode 100644 arch/arm64/include/asm/asm-offsets.h
+ create mode 100644 arch/arm64/include/asm/assembler.h
+ create mode 100644 arch/arm64/include/asm/atomic.h
+ create mode 100644 arch/arm64/include/asm/auxvec.h
+ create mode 100644 arch/arm64/include/asm/barrier.h
+ create mode 100644 arch/arm64/include/asm/bitops.h
+ create mode 100644 arch/arm64/include/asm/bitsperlong.h
+ create mode 100644 arch/arm64/include/asm/byteorder.h
+ create mode 100644 arch/arm64/include/asm/cache.h
+ create mode 100644 arch/arm64/include/asm/cacheflush.h
+ create mode 100644 arch/arm64/include/asm/cachetype.h
+ create mode 100644 arch/arm64/include/asm/cmpxchg.h
+ create mode 100644 arch/arm64/include/asm/compat.h
+ create mode 100644 arch/arm64/include/asm/compiler.h
+ create mode 100644 arch/arm64/include/asm/cputable.h
+ create mode 100644 arch/arm64/include/asm/cputype.h
+ create mode 100644 arch/arm64/include/asm/debug-monitors.h
+ create mode 100644 arch/arm64/include/asm/device.h
+ create mode 100644 arch/arm64/include/asm/dma-mapping.h
+ create mode 100644 arch/arm64/include/asm/elf.h
+ create mode 100644 arch/arm64/include/asm/exception.h
+ create mode 100644 arch/arm64/include/asm/exec.h
+ create mode 100644 arch/arm64/include/asm/fb.h
+ create mode 100644 arch/arm64/include/asm/fcntl.h
+ create mode 100644 arch/arm64/include/asm/fpsimd.h
+ create mode 100644 arch/arm64/include/asm/futex.h
+ create mode 100644 arch/arm64/include/asm/hardirq.h
+ create mode 100644 arch/arm64/include/asm/hw_breakpoint.h
+ create mode 100644 arch/arm64/include/asm/hwcap.h
+ create mode 100644 arch/arm64/include/asm/io.h
+ create mode 100644 arch/arm64/include/asm/irq.h
+ create mode 100644 arch/arm64/include/asm/irqflags.h
+ create mode 100644 arch/arm64/include/asm/memblock.h
+ create mode 100644 arch/arm64/include/asm/memory.h
+ create mode 100644 arch/arm64/include/asm/mmu.h
+ create mode 100644 arch/arm64/include/asm/mmu_context.h
+ create mode 100644 arch/arm64/include/asm/module.h
+ create mode 100644 arch/arm64/include/asm/page.h
+ create mode 100644 arch/arm64/include/asm/param.h
+ create mode 100644 arch/arm64/include/asm/perf_event.h
+ create mode 100644 arch/arm64/include/asm/pgalloc.h
+ create mode 100644 arch/arm64/include/asm/pgtable-2level-hwdef.h
+ create mode 100644 arch/arm64/include/asm/pgtable-2level-types.h
+ create mode 100644 arch/arm64/include/asm/pgtable-3level-hwdef.h
+ create mode 100644 arch/arm64/include/asm/pgtable-3level-types.h
+ create mode 100644 arch/arm64/include/asm/pgtable-hwdef.h
+ create mode 100644 arch/arm64/include/asm/pgtable.h
+ create mode 100644 arch/arm64/include/asm/pmu.h
+ create mode 100644 arch/arm64/include/asm/proc-fns.h
+ create mode 100644 arch/arm64/include/asm/processor.h
+ create mode 100644 arch/arm64/include/asm/prom.h
+ create mode 100644 arch/arm64/include/asm/ptrace.h
+ create mode 100644 arch/arm64/include/asm/setup.h
+ create mode 100644 arch/arm64/include/asm/shmparam.h
+ create mode 100644 arch/arm64/include/asm/sigcontext.h
+ create mode 100644 arch/arm64/include/asm/siginfo.h
+ create mode 100644 arch/arm64/include/asm/signal.h
+ create mode 100644 arch/arm64/include/asm/signal32.h
+ create mode 100644 arch/arm64/include/asm/smp.h
+ create mode 100644 arch/arm64/include/asm/sparsemem.h
+ create mode 100644 arch/arm64/include/asm/spinlock.h
+ create mode 100644 arch/arm64/include/asm/spinlock_types.h
+ create mode 100644 arch/arm64/include/asm/stacktrace.h
+ create mode 100644 arch/arm64/include/asm/stat.h
+ create mode 100644 arch/arm64/include/asm/statfs.h
+ create mode 100644 arch/arm64/include/asm/syscall.h
+ create mode 100644 arch/arm64/include/asm/syscalls.h
+ create mode 100644 arch/arm64/include/asm/system_misc.h
+ create mode 100644 arch/arm64/include/asm/thread_info.h
+ create mode 100644 arch/arm64/include/asm/timex.h
+ create mode 100644 arch/arm64/include/asm/tlb.h
+ create mode 100644 arch/arm64/include/asm/tlbflush.h
+ create mode 100644 arch/arm64/include/asm/traps.h
+ create mode 100644 arch/arm64/include/asm/uaccess.h
+ create mode 100644 arch/arm64/include/asm/ucontext.h
+ create mode 100644 arch/arm64/include/asm/unistd.h
+ create mode 100644 arch/arm64/include/asm/unistd32.h
+ create mode 100644 arch/arm64/include/asm/vdso.h
+ create mode 100644 arch/arm64/include/asm/vdso_datapage.h
+ create mode 100644 arch/arm64/kernel/.gitignore
+ create mode 100644 arch/arm64/kernel/Makefile
+ create mode 100644 arch/arm64/kernel/arm64ksyms.c
+ create mode 100644 arch/arm64/kernel/asm-offsets.c
+ create mode 100644 arch/arm64/kernel/cputable.c
+ create mode 100644 arch/arm64/kernel/debug-monitors.c
+ create mode 100644 arch/arm64/kernel/entry-fpsimd.S
+ create mode 100644 arch/arm64/kernel/entry.S
+ create mode 100644 arch/arm64/kernel/fpsimd.c
+ create mode 100644 arch/arm64/kernel/head.S
+ create mode 100644 arch/arm64/kernel/hw_breakpoint.c
+ create mode 100644 arch/arm64/kernel/io.c
+ create mode 100644 arch/arm64/kernel/irq.c
+ create mode 100644 arch/arm64/kernel/kuser32.S
+ create mode 100644 arch/arm64/kernel/module.c
+ create mode 100644 arch/arm64/kernel/perf_event.c
+ create mode 100644 arch/arm64/kernel/process.c
+ create mode 100644 arch/arm64/kernel/ptrace.c
+ create mode 100644 arch/arm64/kernel/setup.c
+ create mode 100644 arch/arm64/kernel/signal.c
+ create mode 100644 arch/arm64/kernel/signal32.c
+ create mode 100644 arch/arm64/kernel/smp.c
+ create mode 100644 arch/arm64/kernel/stacktrace.c
+ create mode 100644 arch/arm64/kernel/sys.c
+ create mode 100644 arch/arm64/kernel/sys32.S
+ create mode 100644 arch/arm64/kernel/sys_compat.c
+ create mode 100644 arch/arm64/kernel/time.c
+ create mode 100644 arch/arm64/kernel/traps.c
+ create mode 100644 arch/arm64/kernel/vdso.c
+ create mode 100644 arch/arm64/kernel/vdso/.gitignore
+ create mode 100644 arch/arm64/kernel/vdso/Makefile
+ create mode 100755 arch/arm64/kernel/vdso/gen_vdso_offsets.sh
+ create mode 100644 arch/arm64/kernel/vdso/gettimeofday.S
+ create mode 100644 arch/arm64/kernel/vdso/note.S
+ create mode 100644 arch/arm64/kernel/vdso/sigreturn.S
+ create mode 100644 arch/arm64/kernel/vdso/vdso.S
+ create mode 100644 arch/arm64/kernel/vdso/vdso.lds.S
+ create mode 100644 arch/arm64/kernel/vmlinux.lds.S
+ create mode 100644 arch/arm64/lib/Makefile
+ create mode 100644 arch/arm64/lib/bitops.c
+ create mode 100644 arch/arm64/lib/clear_page.S
+ create mode 100644 arch/arm64/lib/clear_user.S
+ create mode 100644 arch/arm64/lib/copy_from_user.S
+ create mode 100644 arch/arm64/lib/copy_in_user.S
+ create mode 100644 arch/arm64/lib/copy_page.S
+ create mode 100644 arch/arm64/lib/copy_to_user.S
+ create mode 100644 arch/arm64/lib/delay.c
+ create mode 100644 arch/arm64/lib/strncpy_from_user.S
+ create mode 100644 arch/arm64/lib/strnlen_user.S
+ create mode 100644 arch/arm64/mm/Makefile
+ create mode 100644 arch/arm64/mm/cache.S
+ create mode 100644 arch/arm64/mm/context.c
+ create mode 100644 arch/arm64/mm/copypage.c
+ create mode 100644 arch/arm64/mm/dma-mapping.c
+ create mode 100644 arch/arm64/mm/extable.c
+ create mode 100644 arch/arm64/mm/fault.c
+ create mode 100644 arch/arm64/mm/flush.c
+ create mode 100644 arch/arm64/mm/init.c
+ create mode 100644 arch/arm64/mm/ioremap.c
+ create mode 100644 arch/arm64/mm/mm.h
+ create mode 100644 arch/arm64/mm/mmap.c
+ create mode 100644 arch/arm64/mm/mmu.c
+ create mode 100644 arch/arm64/mm/pgd.c
+ create mode 100644 arch/arm64/mm/proc-macros.S
+ create mode 100644 arch/arm64/mm/proc.S
+ create mode 100644 arch/arm64/mm/tlb.S
+ create mode 100644 drivers/clocksource/arm_generic.c
+ create mode 100644 include/clocksource/arm_generic.h
+Merging blackfin/for-linus (719154c bf60x: fix build warning)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (01ddd9a C6X: select GENERIC_ATOMIC64)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
+$ git merge cris/for-next
+Removing arch/cris/arch-v32/mach-fs/vcs_hook.h
+Removing arch/cris/arch-v32/mach-fs/vcs_hook.c
+Removing arch/cris/arch-v32/mach-a3/vcs_hook.h
+Removing arch/cris/arch-v32/mach-a3/vcs_hook.c
+Auto-merging arch/cris/arch-v32/drivers/pci/bios.c
+Auto-merging arch/cris/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/cris/Kconfig | 5 -
+ arch/cris/arch-v32/drivers/axisflashmap.c | 29 ------
+ arch/cris/arch-v32/drivers/pci/bios.c | 25 -----
+ arch/cris/arch-v32/kernel/head.S | 58 +----------
+ arch/cris/arch-v32/kernel/kgdb.c | 14 ---
+ arch/cris/arch-v32/mach-a3/Makefile | 2 -
+ arch/cris/arch-v32/mach-a3/vcs_hook.c | 103 --------------------
+ arch/cris/arch-v32/mach-a3/vcs_hook.h | 58 -----------
+ arch/cris/arch-v32/mach-fs/Makefile | 2 -
+ arch/cris/arch-v32/mach-fs/vcs_hook.c | 100 -------------------
+ arch/cris/arch-v32/mach-fs/vcs_hook.h | 42 --------
+ arch/cris/arch-v32/mm/init.c | 8 --
+ arch/cris/include/arch-v32/arch/page.h | 5 -
+ arch/cris/include/arch-v32/arch/processor.h | 6 +-
+ .../cris/include/arch-v32/mach-fs/mach/startup.inc | 6 --
+ arch/cris/include/asm/pci.h | 1 -
+ 16 files changed, 3 insertions(+), 461 deletions(-)
+ delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.c
+ delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.h
+ delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.c
+ delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.h
+Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/amiga/platform.c | 5 +----
+ arch/m68k/include/asm/apollohw.h | 12 ------------
+ arch/m68k/kernel/time.c | 5 +----
+ arch/m68k/q40/config.c | 5 +----
+ 4 files changed, 3 insertions(+), 24 deletions(-)
+Merging m68knommu/for-next (c4d1911 m68k: drop unused parts of 68VZ328 Makefile)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/platform/68VZ328/Makefile | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (84733d1 Merge branch 'next/p1/for-linus' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/netlogic/xlp/platform.c
+Removing arch/mips/netlogic/xlp/of.c
+Removing arch/mips/lantiq/xway/gpio.c
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/lantiq,falcon-pinumx.txt | 83 +++
+ .../bindings/pinctrl/lantiq,xway-pinumx.txt | 97 +++
+ .../devicetree/bindings/spi/spi-octeon.txt | 33 +
+ arch/mips/Kconfig | 19 +
+ arch/mips/ath79/dev-usb.c | 92 ++-
+ arch/mips/ath79/mach-db120.c | 2 +
+ arch/mips/bcm63xx/Makefile | 2 +-
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 10 +
+ arch/mips/bcm63xx/clk.c | 21 +-
+ arch/mips/bcm63xx/dev-usb-usbd.c | 65 ++
+ arch/mips/bcm63xx/irq.c | 22 +-
+ arch/mips/bcm63xx/setup.c | 6 +
+ arch/mips/configs/nlm_xlp_defconfig | 133 ++--
+ arch/mips/include/asm/atomic.h | 64 +-
+ arch/mips/include/asm/cpu-features.h | 8 +
+ arch/mips/include/asm/cpu.h | 2 +
+ arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 7 +
+ .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +
+ .../asm/mach-au1x00/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 93 ++-
+ .../asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h | 17 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 38 +
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 168 ++++-
+ .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 5 +
+ .../asm/mach-bcm63xx/cpu-feature-overrides.h | 1 +
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 +
+ .../asm/mach-cobalt/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip27/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip28/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip32/cpu-feature-overrides.h | 1 +
+ .../asm/mach-jz4740/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-lantiq/falcon/falcon_irq.h | 2 +
+ .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 4 +
+ arch/mips/include/asm/mach-lantiq/gpio.h | 5 +-
+ .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +
+ .../asm/mach-loongson/cpu-feature-overrides.h | 1 +
+ .../asm/mach-netlogic/cpu-feature-overrides.h | 1 +
+ .../asm/mach-powertv/cpu-feature-overrides.h | 1 +
+ .../asm/mach-rc32434/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-rm/cpu-feature-overrides.h | 1 +
+ .../asm/mach-sibyte/cpu-feature-overrides.h | 1 +
+ .../asm/mach-tx49xx/cpu-feature-overrides.h | 1 +
+ .../asm/mach-yosemite/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/mipsregs.h | 3 +
+ arch/mips/include/asm/octeon/cvmx-mpi-defs.h | 328 ++++++++
+ .../asm/pmc-sierra/msp71xx/cpu-feature-overrides.h | 1 +
+ arch/mips/kernel/Makefile | 19 +-
+ arch/mips/kernel/cpu-probe.c | 11 +-
+ arch/mips/kernel/perf_event_mipsxx.c | 262 +++----
+ arch/mips/kernel/proc.c | 19 +-
+ arch/mips/kernel/smp-cmp.c | 2 +-
+ arch/mips/kernel/smp-mt.c | 2 +
+ arch/mips/kernel/vmlinux.lds.S | 21 +-
+ arch/mips/lantiq/Kconfig | 2 +
+ arch/mips/lantiq/falcon/prom.c | 5 +
+ arch/mips/lantiq/falcon/sysctrl.c | 1 +
+ arch/mips/lantiq/irq.c | 82 +-
+ arch/mips/lantiq/xway/Makefile | 2 +-
+ arch/mips/lantiq/xway/Makefile.rej | 5 +
+ arch/mips/lantiq/xway/gpio.c | 183 -----
+ arch/mips/lantiq/xway/gptu.c | 214 ++++++
+ arch/mips/lantiq/xway/sysctrl.c | 5 +-
+ arch/mips/lib/Makefile | 21 +-
+ arch/mips/mm/Makefile | 17 +-
+ arch/mips/mm/gup.c | 2 +
+ arch/mips/mm/init.c | 17 +-
+ arch/mips/mm/pgtable-64.c | 20 +-
+ arch/mips/mm/tlbex.c | 23 +-
+ arch/mips/netlogic/Kconfig | 15 +
+ arch/mips/netlogic/Makefile | 1 +
+ arch/mips/netlogic/dts/Makefile | 4 +
+ arch/mips/netlogic/dts/xlp_evp.dts | 124 ++++
+ arch/mips/netlogic/xlp/Makefile | 3 +-
+ arch/mips/netlogic/xlp/of.c | 34 -
+ arch/mips/netlogic/xlp/platform.c | 108 ---
+ arch/mips/netlogic/xlp/setup.c | 32 +-
+ drivers/gpio/gpio-stp-xway.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.h | 30 +-
+ drivers/pinctrl/Kconfig | 16 +
+ drivers/pinctrl/Makefile | 3 +
+ drivers/pinctrl/pinctrl-falcon.c | 468 ++++++++++++
+ drivers/pinctrl/pinctrl-lantiq.c | 342 +++++++++
+ drivers/pinctrl/pinctrl-lantiq.h | 194 +++++
+ drivers/pinctrl/pinctrl-xway.c | 781 ++++++++++++++++++++
+ drivers/spi/Kconfig | 7 +
+ drivers/spi/Makefile | 1 +
+ drivers/spi/spi-octeon.c | 362 +++++++++
+ include/asm-generic/vmlinux.lds.h | 9 +
+ 89 files changed, 4036 insertions(+), 786 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt
+ create mode 100644 arch/mips/bcm63xx/dev-usb-usbd.c
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_usbd.h
+ create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h
+ create mode 100644 arch/mips/include/asm/octeon/cvmx-mpi-defs.h
+ create mode 100644 arch/mips/lantiq/xway/Makefile.rej
+ delete mode 100644 arch/mips/lantiq/xway/gpio.c
+ create mode 100644 arch/mips/lantiq/xway/gptu.c
+ create mode 100644 arch/mips/netlogic/dts/Makefile
+ create mode 100644 arch/mips/netlogic/dts/xlp_evp.dts
+ delete mode 100644 arch/mips/netlogic/xlp/of.c
+ delete mode 100644 arch/mips/netlogic/xlp/platform.c
+ create mode 100644 drivers/pinctrl/pinctrl-falcon.c
+ create mode 100644 drivers/pinctrl/pinctrl-lantiq.c
+ create mode 100644 drivers/pinctrl/pinctrl-lantiq.h
+ create mode 100644 drivers/pinctrl/pinctrl-xway.c
+ create mode 100644 drivers/spi/spi-octeon.c
+Merging openrisc/for-upstream (807607f openrisc: delay: fix handling of counter overflow)
+$ git merge openrisc/for-upstream
+Merge made by the 'recursive' strategy.
+ arch/openrisc/lib/delay.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next (8b64a9d powerpc/booke64: Use SPRG0/3 scratch for bolted TLB miss & crit int)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/perf/core-book3s.c
+Auto-merging arch/powerpc/kernel/traps.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/include/asm/processor.h
+Removing arch/powerpc/include/asm/abs_addr.h
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 3 +
+ arch/powerpc/include/asm/abs_addr.h | 56 --------
+ arch/powerpc/include/asm/exception-64e.h | 6 +-
+ arch/powerpc/include/asm/kprobes.h | 15 +--
+ arch/powerpc/include/asm/probes.h | 42 ++++++
+ arch/powerpc/include/asm/processor.h | 1 +
+ arch/powerpc/include/asm/reg.h | 45 ++++---
+ arch/powerpc/include/asm/thread_info.h | 4 +-
+ arch/powerpc/include/asm/uprobes.h | 54 ++++++++
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/dma-swiotlb.c | 2 +-
+ arch/powerpc/kernel/dma.c | 3 +-
+ arch/powerpc/kernel/exceptions-64e.S | 192 +++++++++++++++++----------
+ arch/powerpc/kernel/ibmebus.c | 1 -
+ arch/powerpc/kernel/process.c | 2 +
+ arch/powerpc/kernel/prom_init.c | 2 +-
+ arch/powerpc/kernel/rtas_flash.c | 7 +-
+ arch/powerpc/kernel/signal.c | 6 +
+ arch/powerpc/kernel/traps.c | 1 +
+ arch/powerpc/kernel/uprobes.c | 184 +++++++++++++++++++++++++
+ arch/powerpc/kernel/vio.c | 1 -
+ arch/powerpc/mm/fault.c | 1 +
+ arch/powerpc/mm/hash_native_64.c | 2 +-
+ arch/powerpc/mm/hash_utils_64.c | 3 +-
+ arch/powerpc/mm/init_64.c | 1 -
+ arch/powerpc/mm/pgtable_64.c | 1 -
+ arch/powerpc/mm/stab.c | 3 +-
+ arch/powerpc/mm/tlb_low_64e.S | 18 ++-
+ arch/powerpc/oprofile/op_model_power4.c | 16 +--
+ arch/powerpc/perf/core-book3s.c | 2 +-
+ arch/powerpc/platforms/pasemi/iommu.c | 6 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 1 -
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 1 -
+ arch/powerpc/platforms/powernv/pci.c | 1 -
+ arch/powerpc/platforms/pseries/iommu.c | 12 +-
+ arch/powerpc/platforms/pseries/lpar.c | 1 -
+ arch/powerpc/sysdev/dart_iommu.c | 7 +-
+ drivers/crypto/nx/nx.c | 17 ++-
+ drivers/infiniband/hw/ehca/ehca_cq.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_eq.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_mrmw.c | 45 +++----
+ drivers/infiniband/hw/ehca/ehca_qp.c | 6 +-
+ drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +-
+ drivers/infiniband/hw/ehca/ehca_tools.h | 1 -
+ drivers/infiniband/hw/ehca/hcp_if.c | 12 +-
+ drivers/infiniband/hw/ehca/ipz_pt_fn.c | 2 +-
+ drivers/macintosh/smu.c | 3 +-
+ drivers/net/ethernet/ibm/ehea/ehea.h | 1 -
+ drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 12 +-
+ drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 14 +-
+ drivers/scsi/ipr.c | 18 +--
+ drivers/tty/hvc/hvc_console.c | 33 ++++-
+ drivers/tty/hvc/hvc_vio.c | 123 +++++++++--------
+ drivers/video/ps3fb.c | 3 +-
+ 54 files changed, 653 insertions(+), 347 deletions(-)
+ delete mode 100644 arch/powerpc/include/asm/abs_addr.h
+ create mode 100644 arch/powerpc/include/asm/probes.h
+ create mode 100644 arch/powerpc/include/asm/uprobes.h
+ create mode 100644 arch/powerpc/kernel/uprobes.c
+$ git am -3 ../patches/Rename_opcode_t_in_probes.h_to_ppc_opcode_t.patch
+Applying: Rename opcode_t in probes.h to ppc_opcode_t
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/include/asm/kprobes.h
+M arch/powerpc/include/asm/probes.h
+M arch/powerpc/include/asm/uprobes.h
+$ git add .
+$ git commit -v -a --amend
+[master 1af6d0e] Merge remote-tracking branch 'powerpc/next'
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/platforms/512x/Kconfig | 1 +
+ arch/powerpc/platforms/512x/clock.c | 6 ++++--
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 6 ------
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+Merging galak/next (087979d powerpc/8544ds: add partition table for norflash)
+$ git merge galak/next
+Auto-merging arch/powerpc/sysdev/fsl_pci.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/kernel/exceptions-64e.S
+Auto-merging arch/powerpc/kernel/dma-swiotlb.c
+Auto-merging arch/powerpc/configs/mpc85xx_smp_defconfig
+Auto-merging arch/powerpc/configs/mpc85xx_defconfig
+Auto-merging arch/powerpc/configs/corenet64_smp_defconfig
+Auto-merging arch/powerpc/configs/corenet32_smp_defconfig
+Removing arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+Removing arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
+Removing arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
+Removing arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/powerpc/fsl/ifc.txt | 9 +-
+ arch/powerpc/Kconfig | 6 +-
+ arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi | 58 ++++
+ arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi | 52 ++++
+ arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi | 59 ++++
+ arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 320 ++++++++++++++++++++
+ arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 114 +++++++
+ arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 118 ++++++++
+ arch/powerpc/boot/dts/mpc8536ds.dtsi | 4 +
+ arch/powerpc/boot/dts/mpc8540ads.dts | 2 +
+ arch/powerpc/boot/dts/mpc8541cds.dts | 2 +
+ arch/powerpc/boot/dts/mpc8544ds.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8544ds.dtsi | 39 +++
+ arch/powerpc/boot/dts/mpc8555cds.dts | 2 +
+ arch/powerpc/boot/dts/mpc8560ads.dts | 2 +
+ arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 63 ----
+ arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 141 ---------
+ arch/powerpc/boot/dts/p1022ds.dtsi | 4 +
+ arch/powerpc/boot/dts/p1022rdk.dts | 188 ++++++++++++
+ arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 67 ----
+ arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 125 --------
+ arch/powerpc/boot/dts/p2041rdb.dts | 4 +
+ arch/powerpc/boot/dts/p3041ds.dts | 4 +
+ arch/powerpc/boot/dts/p4080ds.dts | 4 +
+ arch/powerpc/boot/dts/p5020ds.dts | 4 +
+ arch/powerpc/boot/dts/p5040ds.dts | 207 +++++++++++++
+ arch/powerpc/configs/corenet32_smp_defconfig | 1 +
+ arch/powerpc/configs/corenet64_smp_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
+ arch/powerpc/include/asm/cacheflush.h | 2 +
+ arch/powerpc/include/asm/fsl_guts.h | 2 +
+ arch/powerpc/include/asm/fsl_ifc.h | 14 +-
+ arch/powerpc/include/asm/mpic.h | 19 ++
+ arch/powerpc/include/asm/smp.h | 2 +
+ arch/powerpc/include/asm/swiotlb.h | 6 +
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 74 ++++-
+ arch/powerpc/kernel/cputable.c | 4 +
+ arch/powerpc/kernel/dma-swiotlb.c | 20 ++
+ arch/powerpc/kernel/exceptions-64e.S | 18 +-
+ arch/powerpc/kernel/head_fsl_booke.S | 46 ++-
+ arch/powerpc/kernel/smp.c | 12 +-
+ arch/powerpc/mm/mem.c | 3 +-
+ arch/powerpc/platforms/44x/currituck.c | 10 +-
+ arch/powerpc/platforms/85xx/Kconfig | 21 ++
+ arch/powerpc/platforms/85xx/Makefile | 2 +
+ arch/powerpc/platforms/85xx/corenet_ds.c | 10 +-
+ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 1 +
+ arch/powerpc/platforms/85xx/p1022_rdk.c | 195 ++++++++++++
+ arch/powerpc/platforms/85xx/p5040_ds.c | 89 ++++++
+ arch/powerpc/platforms/85xx/qemu_e500.c | 1 +
+ arch/powerpc/platforms/85xx/smp.c | 220 +++++++++++---
+ arch/powerpc/sysdev/Makefile | 2 +-
+ arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 10 +
+ arch/powerpc/sysdev/fsl_mpic_err.c | 149 +++++++++
+ arch/powerpc/sysdev/fsl_pci.c | 6 +-
+ arch/powerpc/sysdev/mpic.c | 102 +++++--
+ arch/powerpc/sysdev/mpic.h | 22 ++
+ 74 files changed, 2198 insertions(+), 518 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
+ delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
+ delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
+ create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
+ delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
+ delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+ create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
+ create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
+ create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
+ create mode 100644 arch/powerpc/sysdev/fsl_mpic_err.c
+Merging s390/features (d6be9e7 s390/3270: drop unused spinlock from struct con3270)
+$ git merge s390/features
+Removing arch/s390/kernel/crash.c
+Merge made by the 'recursive' strategy.
+ Documentation/kmsg/s390/scm_block | 25 +
+ arch/s390/Kbuild | 1 +
+ arch/s390/Kconfig | 411 +++++++--------
+ arch/s390/boot/compressed/misc.c | 45 +-
+ arch/s390/defconfig | 13 +-
+ arch/s390/include/asm/chsc.h | 28 --
+ arch/s390/include/asm/cio.h | 28 +-
+ arch/s390/include/asm/cpu_mf.h | 4 +
+ arch/s390/include/asm/css_chars.h | 39 ++
+ arch/s390/include/asm/eadm.h | 124 +++++
+ arch/s390/include/asm/elf.h | 1 +
+ arch/s390/include/asm/irq.h | 2 +
+ arch/s390/include/asm/isc.h | 1 +
+ arch/s390/include/asm/lowcore.h | 6 +-
+ arch/s390/include/asm/mmu_context.h | 2 +-
+ arch/s390/include/asm/processor.h | 59 ++-
+ arch/s390/include/asm/ptrace.h | 12 +-
+ arch/s390/include/asm/runtime_instr.h | 98 ++++
+ arch/s390/include/asm/scsw.h | 38 +-
+ arch/s390/include/asm/setup.h | 5 +-
+ arch/s390/include/asm/smp.h | 4 +-
+ arch/s390/include/asm/string.h | 8 -
+ arch/s390/include/asm/switch_to.h | 2 +
+ arch/s390/include/asm/sysinfo.h | 23 +-
+ arch/s390/include/asm/tlbflush.h | 2 -
+ arch/s390/include/asm/topology.h | 20 +-
+ arch/s390/include/asm/uaccess.h | 15 +-
+ arch/s390/include/asm/unistd.h | 3 +-
+ arch/s390/kernel/Makefile | 3 +-
+ arch/s390/kernel/asm-offsets.c | 2 +
+ arch/s390/kernel/cache.c | 385 ++++++++++++++
+ arch/s390/kernel/compat_wrapper.S | 5 +
+ arch/s390/kernel/crash.c | 14 -
+ arch/s390/kernel/dis.c | 56 +++
+ arch/s390/kernel/early.c | 36 +-
+ arch/s390/kernel/entry64.S | 17 +-
+ arch/s390/kernel/irq.c | 2 +
+ arch/s390/kernel/kprobes.c | 2 +-
+ arch/s390/kernel/machine_kexec.c | 4 +
+ arch/s390/kernel/process.c | 7 +
+ arch/s390/kernel/processor.c | 7 +-
+ arch/s390/kernel/ptrace.c | 69 +++
+ arch/s390/kernel/runtime_instr.c | 150 ++++++
+ arch/s390/kernel/s390_ksyms.c | 2 +
+ arch/s390/kernel/setup.c | 54 +-
+ arch/s390/kernel/smp.c | 46 +-
+ arch/s390/kernel/syscalls.S | 1 +
+ arch/s390/kernel/sysinfo.c | 314 +++++-------
+ arch/s390/kernel/topology.c | 22 +-
+ arch/s390/kernel/traps.c | 39 +-
+ arch/s390/kernel/vdso.c | 8 +-
+ arch/s390/kernel/vtime.c | 3 +-
+ arch/s390/kvm/Kconfig | 2 +-
+ arch/s390/lib/Makefile | 3 +-
+ arch/s390/lib/mem32.S | 92 ++++
+ arch/s390/lib/mem64.S | 88 ++++
+ arch/s390/lib/string.c | 56 +--
+ arch/s390/mm/Makefile | 2 +-
+ arch/s390/mm/extable.c | 81 +++
+ arch/s390/mm/fault.c | 7 +-
+ arch/s390/mm/gup.c | 37 ++
+ arch/s390/mm/pgtable.c | 2 +-
+ arch/s390/mm/vmem.c | 2 +-
+ arch/s390/net/Makefile | 4 +
+ arch/s390/net/bpf_jit.S | 130 +++++
+ arch/s390/net/bpf_jit_comp.c | 771 ++++++++++++++++++++++++++++
+ block/partitions/ibm.c | 455 ++++++++++-------
+ drivers/s390/block/Kconfig | 18 +
+ drivers/s390/block/Makefile | 6 +
+ drivers/s390/block/dasd_eckd.c | 3 +-
+ drivers/s390/block/scm_blk.c | 445 +++++++++++++++++
+ drivers/s390/block/scm_blk.h | 117 +++++
+ drivers/s390/block/scm_blk_cluster.c | 228 +++++++++
+ drivers/s390/block/scm_drv.c | 81 +++
+ drivers/s390/char/con3270.c | 1 -
+ drivers/s390/cio/Makefile | 2 +
+ drivers/s390/cio/chsc.c | 52 ++
+ drivers/s390/cio/chsc.h | 43 ++
+ drivers/s390/cio/css.c | 1 +
+ drivers/s390/cio/eadm_sch.c | 401 +++++++++++++++
+ drivers/s390/cio/eadm_sch.h | 20 +
+ drivers/s390/cio/orb.h | 24 +
+ drivers/s390/cio/scm.c | 317 ++++++++++++
+ drivers/s390/crypto/Makefile | 3 +-
+ drivers/s390/crypto/ap_bus.c | 193 +++++--
+ drivers/s390/crypto/ap_bus.h | 34 +-
+ drivers/s390/crypto/zcrypt_api.c | 73 ++-
+ drivers/s390/crypto/zcrypt_api.h | 10 +-
+ drivers/s390/crypto/zcrypt_cex2a.c | 371 +-------------
+ drivers/s390/crypto/zcrypt_cex4.c | 149 ++++++
+ drivers/s390/crypto/zcrypt_cex4.h | 12 +
+ drivers/s390/crypto/zcrypt_msgtype50.c | 531 ++++++++++++++++++++
+ drivers/s390/crypto/zcrypt_msgtype50.h | 39 ++
+ drivers/s390/crypto/zcrypt_msgtype6.c | 856 ++++++++++++++++++++++++++++++++
+ drivers/s390/crypto/zcrypt_msgtype6.h | 169 +++++++
+ drivers/s390/crypto/zcrypt_pcixcc.c | 781 +----------------------------
+ drivers/s390/crypto/zcrypt_pcixcc.h | 3 +-
+ include/linux/elf.h | 1 +
+ scripts/sortextable.c | 10 +-
+ 99 files changed, 6960 insertions(+), 2033 deletions(-)
+ create mode 100644 Documentation/kmsg/s390/scm_block
+ create mode 100644 arch/s390/include/asm/css_chars.h
+ create mode 100644 arch/s390/include/asm/eadm.h
+ create mode 100644 arch/s390/include/asm/runtime_instr.h
+ create mode 100644 arch/s390/kernel/cache.c
+ delete mode 100644 arch/s390/kernel/crash.c
+ create mode 100644 arch/s390/kernel/runtime_instr.c
+ create mode 100644 arch/s390/lib/mem32.S
+ create mode 100644 arch/s390/lib/mem64.S
+ create mode 100644 arch/s390/mm/extable.c
+ create mode 100644 arch/s390/net/Makefile
+ create mode 100644 arch/s390/net/bpf_jit.S
+ create mode 100644 arch/s390/net/bpf_jit_comp.c
+ create mode 100644 drivers/s390/block/scm_blk.c
+ create mode 100644 drivers/s390/block/scm_blk.h
+ create mode 100644 drivers/s390/block/scm_blk_cluster.c
+ create mode 100644 drivers/s390/block/scm_drv.c
+ create mode 100644 drivers/s390/cio/eadm_sch.c
+ create mode 100644 drivers/s390/cio/eadm_sch.h
+ create mode 100644 drivers/s390/cio/scm.c
+ create mode 100644 drivers/s390/crypto/zcrypt_cex4.c
+ create mode 100644 drivers/s390/crypto/zcrypt_cex4.h
+ create mode 100644 drivers/s390/crypto/zcrypt_msgtype50.c
+ create mode 100644 drivers/s390/crypto/zcrypt_msgtype50.h
+ create mode 100644 drivers/s390/crypto/zcrypt_msgtype6.c
+ create mode 100644 drivers/s390/crypto/zcrypt_msgtype6.h
+Merging sh/sh-latest (d4b7c5d sh: intc: Fix up multi-evt irq association.)
+$ git merge sh/sh-latest
+Merge made by the 'recursive' strategy.
+ drivers/sh/intc/core.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging sparc-next/master (699871b sparc64: Fix bugs in unrolled 256-bit loops.)
+$ git merge sparc-next/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/Kbuild | 1 +
+ arch/sparc/crypto/Makefile | 25 +
+ arch/sparc/crypto/aes_asm.S | 1535 +++++++++++++++++++++++++++++++++++
+ arch/sparc/crypto/aes_glue.c | 473 +++++++++++
+ arch/sparc/crypto/camellia_asm.S | 563 +++++++++++++
+ arch/sparc/crypto/camellia_glue.c | 318 ++++++++
+ arch/sparc/crypto/crc32c_asm.S | 20 +
+ arch/sparc/crypto/crc32c_glue.c | 177 ++++
+ arch/sparc/crypto/des_asm.S | 417 ++++++++++
+ arch/sparc/crypto/des_glue.c | 525 ++++++++++++
+ arch/sparc/crypto/md5_asm.S | 70 ++
+ arch/sparc/crypto/md5_glue.c | 186 +++++
+ arch/sparc/crypto/opcodes.h | 97 +++
+ arch/sparc/crypto/sha1_asm.S | 72 ++
+ arch/sparc/crypto/sha1_glue.c | 181 +++++
+ arch/sparc/crypto/sha256_asm.S | 78 ++
+ arch/sparc/crypto/sha256_glue.c | 237 ++++++
+ arch/sparc/crypto/sha512_asm.S | 102 +++
+ arch/sparc/crypto/sha512_glue.c | 222 +++++
+ arch/sparc/include/asm/asi.h | 4 +-
+ arch/sparc/include/asm/elf_64.h | 9 +
+ arch/sparc/include/asm/hypervisor.h | 11 +
+ arch/sparc/include/asm/pcr.h | 36 +-
+ arch/sparc/include/asm/perfctr.h | 30 -
+ arch/sparc/include/asm/pstate.h | 14 +
+ arch/sparc/kernel/hvapi.c | 1 +
+ arch/sparc/kernel/hvcalls.S | 16 +
+ arch/sparc/kernel/nmi.c | 21 +-
+ arch/sparc/kernel/pcr.c | 172 +++-
+ arch/sparc/kernel/perf_event.c | 516 +++++++++---
+ arch/sparc/kernel/setup_64.c | 67 +-
+ arch/sparc/lib/ksyms.c | 4 +
+ crypto/Kconfig | 97 +++
+ 33 files changed, 6099 insertions(+), 198 deletions(-)
+ create mode 100644 arch/sparc/crypto/Makefile
+ create mode 100644 arch/sparc/crypto/aes_asm.S
+ create mode 100644 arch/sparc/crypto/aes_glue.c
+ create mode 100644 arch/sparc/crypto/camellia_asm.S
+ create mode 100644 arch/sparc/crypto/camellia_glue.c
+ create mode 100644 arch/sparc/crypto/crc32c_asm.S
+ create mode 100644 arch/sparc/crypto/crc32c_glue.c
+ create mode 100644 arch/sparc/crypto/des_asm.S
+ create mode 100644 arch/sparc/crypto/des_glue.c
+ create mode 100644 arch/sparc/crypto/md5_asm.S
+ create mode 100644 arch/sparc/crypto/md5_glue.c
+ create mode 100644 arch/sparc/crypto/opcodes.h
+ create mode 100644 arch/sparc/crypto/sha1_asm.S
+ create mode 100644 arch/sparc/crypto/sha1_glue.c
+ create mode 100644 arch/sparc/crypto/sha256_asm.S
+ create mode 100644 arch/sparc/crypto/sha256_glue.c
+ create mode 100644 arch/sparc/crypto/sha512_asm.S
+ create mode 100644 arch/sparc/crypto/sha512_glue.c
+Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
+$ git merge unicore32/unicore32
+Auto-merging arch/unicore32/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 3 +++
+ arch/unicore32/include/asm/bug.h | 5 -----
+ arch/unicore32/include/asm/cmpxchg.h | 2 +-
+ arch/unicore32/kernel/setup.h | 6 ++++++
+ arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++---------
+ 5 files changed, 37 insertions(+), 16 deletions(-)
+Merging xtensa/for_next (499d9ec xtensa: ISS: exit simulator in case of halt or panic)
+$ git merge xtensa/for_next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 ++
+ arch/xtensa/Kconfig | 2 ++
+ arch/xtensa/include/asm/io.h | 10 ++++++++++
+ arch/xtensa/kernel/Makefile | 1 +
+ arch/xtensa/kernel/irq.c | 4 ++--
+ arch/xtensa/kernel/pci.c | 9 ++++++++-
+ arch/xtensa/kernel/platform.c | 4 ++--
+ arch/xtensa/platforms/iss/Makefile | 4 ++--
+ arch/xtensa/platforms/iss/console.c | 18 +++++++++++++-----
+ arch/xtensa/platforms/iss/setup.c | 14 ++++++++++----
+ 10 files changed, 52 insertions(+), 16 deletions(-)
+Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper())
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (b2ede58 CIFS: Fix endianness conversion)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/file.c | 2 +-
+ fs/cifs/smb2pdu.h | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (5eec54f UDF: Add support for O_DIRECT)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext3/inode.c | 17 ++++++++++++---
+ fs/ext3/super.c | 8 ++++---
+ fs/reiserfs/xattr.c | 2 +-
+ fs/udf/file.c | 44 ++++++++++++++++++++++++++++++++------
+ fs/udf/inode.c | 59 +++++++++++++++++++++++++++++++++++++--------------
+ 5 files changed, 101 insertions(+), 29 deletions(-)
+Merging ext4/dev (8a2f846 ext4: remove duplicated declarations in inode.c)
+$ git merge ext4/dev
+Auto-merging fs/jbd2/journal.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/inode.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-ext4 | 13 ++
+ Documentation/filesystems/ext4.txt | 10 ++
+ fs/ext4/ext4.h | 4 +
+ fs/ext4/extents.c | 103 +++++++++----
+ fs/ext4/fsync.c | 9 +-
+ fs/ext4/inode.c | 3 -
+ fs/ext4/mballoc.c | 34 ++---
+ fs/ext4/mballoc.h | 5 -
+ fs/ext4/namei.c | 7 +
+ fs/ext4/super.c | 27 ++--
+ fs/jbd2/journal.c | 5 +
+ fs/jbd2/recovery.c | 7 +-
+ include/trace/events/ext4.h | 242 +++++++++++++++----------------
+ 13 files changed, 275 insertions(+), 194 deletions(-)
+Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 10 ----
+ fs/fuse/Kconfig | 16 ++++-
+ fs/fuse/control.c | 4 +-
+ fs/fuse/dev.c | 19 ++++++
+ fs/fuse/dir.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/fuse_i.h | 6 ++
+ fs/fuse/inode.c | 5 +-
+ include/linux/fuse.h | 12 ++++
+ 8 files changed, 213 insertions(+), 19 deletions(-)
+Merging gfs2/master (8944fe0 GFS2: Get rid of I_MUTEX_QUOTA usage)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 11 +-
+ fs/gfs2/bmap.c | 2 +-
+ fs/gfs2/file.c | 35 +-
+ fs/gfs2/glock.c | 60 +---
+ fs/gfs2/incore.h | 29 +-
+ fs/gfs2/inode.c | 17 +-
+ fs/gfs2/ops_fstype.c | 8 +
+ fs/gfs2/quota.c | 11 +-
+ fs/gfs2/rgrp.c | 973 ++++++++++++++++++++++++--------------------------
+ fs/gfs2/rgrp.h | 22 +-
+ fs/gfs2/super.c | 4 +-
+ fs/gfs2/trace_gfs2.h | 20 +-
+ fs/gfs2/trans.h | 7 +-
+ fs/gfs2/xattr.c | 96 ++---
+ 14 files changed, 605 insertions(+), 690 deletions(-)
+Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (01913b4 NFS: return error from decode_getfh in decode open)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/inode.c | 2 +-
+ fs/nfs/nfs3proc.c | 2 +-
+ fs/nfs/nfs4proc.c | 55 +++++++++++++++++++++--------------------------
+ fs/nfs/nfs4xdr.c | 17 ++++++---------
+ fs/nfs/super.c | 2 ++
+ include/linux/nfs_fs.h | 5 -----
+ include/linux/nfs_xdr.h | 2 +-
+ 7 files changed, 37 insertions(+), 48 deletions(-)
+Merging nfsd/nfsd-next (21179d8 knfsd: don't allocate file_locks on the stack)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/locks.c | 6 +--
+ fs/nfsd/nfs2acl.c | 3 +-
+ fs/nfsd/nfs3proc.c | 2 +-
+ fs/nfsd/nfs4proc.c | 4 +-
+ fs/nfsd/nfs4state.c | 126 +++++++++++++++++++++++++++++++--------------------
+ fs/nfsd/nfsctl.c | 2 -
+ fs/nfsd/nfsd.h | 2 +
+ fs/nfsd/state.h | 6 +--
+ 8 files changed, 87 insertions(+), 64 deletions(-)
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (43def35 net/9p: Check errno validity)
+$ git merge v9fs/for-next
+Merge made by the 'recursive' strategy.
+ fs/9p/vfs_inode.c | 8 ++++----
+ net/9p/client.c | 18 ++++++++++++++++--
+ 2 files changed, 20 insertions(+), 6 deletions(-)
+Merging ubifs/linux-next (3668b70 UBIFS: print less)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ubifs/budget.c | 5 +-
+ fs/ubifs/commit.c | 8 +-
+ fs/ubifs/compress.c | 7 +-
+ fs/ubifs/debug.c | 633 +++++++++++++++++++++----------------------------
+ fs/ubifs/debug.h | 15 +-
+ fs/ubifs/dir.c | 4 +-
+ fs/ubifs/file.c | 4 +-
+ fs/ubifs/gc.c | 6 +-
+ fs/ubifs/log.c | 14 +-
+ fs/ubifs/lprops.c | 66 +++---
+ fs/ubifs/lpt.c | 5 +-
+ fs/ubifs/lpt_commit.c | 58 ++---
+ fs/ubifs/orphan.c | 7 +-
+ fs/ubifs/recovery.c | 11 +-
+ fs/ubifs/replay.c | 16 +-
+ fs/ubifs/sb.c | 19 +-
+ fs/ubifs/scan.c | 15 +-
+ fs/ubifs/super.c | 119 +++++-----
+ fs/ubifs/tnc_misc.c | 4 +-
+ fs/ubifs/ubifs.h | 13 +-
+ 20 files changed, 451 insertions(+), 578 deletions(-)
+Merging xfs/for-next (b686d1f xfs: xfs_seek_hole() refinement with hole searching from page cache for unwritten extents)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/xfs/xfs_buf.c | 5 +-
+ fs/xfs/xfs_buf.h | 41 +++---
+ fs/xfs/xfs_file.c | 379 +++++++++++++++++++++++++++++++++++++++++++++++-----
+ fs/xfs/xfs_mount.h | 5 -
+ fs/xfs/xfs_trace.h | 1 +
+ 5 files changed, 373 insertions(+), 58 deletions(-)
+Merging vfs/for-next (61a1384 fanotify: sanitize failure exits in copy_event_to_user())
+$ git merge vfs/for-next
+Auto-merging net/socket.c
+Merge made by the 'recursive' strategy.
+ drivers/staging/android/binder.c | 5 ++-
+ fs/autofs4/dev-ioctl.c | 18 ++--------
+ fs/file.c | 6 ++--
+ fs/notify/fanotify/fanotify_user.c | 59 +++++++++++---------------------
+ fs/pipe.c | 31 ++++++++++++-----
+ include/linux/file.h | 4 +--
+ include/linux/net.h | 3 +-
+ include/linux/perf_event.h | 2 +-
+ kernel/events/core.c | 64 ++++++++++++++++++----------------
+ net/9p/trans_fd.c | 16 ++++-----
+ net/sctp/socket.c | 25 +++++++++++---
+ net/socket.c | 66 +++++++++++++++++++++++-------------
+ 12 files changed, 159 insertions(+), 140 deletions(-)
+Merging pci/next (7bf79d8 Merge branch 'pci/bjorn-cleanup-remove' into next)
+$ git merge pci/next
+Resolved 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c' using previous resolution.
+Resolved 'drivers/rapidio/devices/tsi721.c' using previous resolution.
+Auto-merging drivers/rapidio/devices/tsi721.c
+CONFLICT (content): Merge conflict in drivers/rapidio/devices/tsi721.c
+Auto-merging drivers/pci/probe.c
+Auto-merging drivers/pci/pcie/portdrv_pci.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c
+Auto-merging drivers/net/wireless/ath/ath9k/pci.c
+Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
+Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/gpu/drm/radeon/evergreen.c
+Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 727820a] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-tegra/pcie.c | 12 +-
+ arch/frv/mb93090-mb00/pci-vdk.c | 4 +-
+ arch/mips/pci/pci-octeon.c | 15 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 2 +-
+ arch/tile/kernel/pci.c | 26 +-
+ drivers/char/agp/sgi-agp.c | 5 +-
+ drivers/gpu/drm/radeon/evergreen.c | 10 +-
+ drivers/infiniband/hw/mthca/mthca_reset.c | 8 +-
+ drivers/infiniband/hw/qib/qib_pcie.c | 38 +--
+ drivers/iommu/intel-iommu.c | 6 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 18 +-
+ drivers/net/ethernet/broadcom/tg3.c | 50 +--
+ drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 22 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 27 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 12 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/reset.c | 8 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 31 +-
+ drivers/net/ethernet/neterion/vxge/vxge-config.c | 4 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +-
+ drivers/net/ethernet/realtek/r8169.c | 44 +--
+ drivers/net/ethernet/sun/niu.c | 19 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 21 +-
+ drivers/net/wireless/iwlegacy/common.h | 4 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 7 +-
+ drivers/net/wireless/rtlwifi/pci.c | 8 +-
+ drivers/parisc/dino.c | 10 +-
+ drivers/parisc/lba_pci.c | 7 +-
+ drivers/pci/access.c | 202 +++++++++++
+ drivers/pci/hotplug/acpiphp_glue.c | 46 +--
+ drivers/pci/hotplug/pciehp_acpi.c | 6 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 12 +-
+ drivers/pci/hotplug/pcihp_slot.c | 20 +-
+ drivers/pci/iov.c | 6 +-
+ drivers/pci/pci.c | 356 +++++---------------
+ drivers/pci/pcie/aer/aer_inject.c | 2 +-
+ drivers/pci/pcie/aer/aerdrv.c | 24 +-
+ drivers/pci/pcie/aer/aerdrv_acpi.c | 2 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 53 +--
+ drivers/pci/pcie/aspm.c | 119 +++----
+ drivers/pci/pcie/pme.c | 29 +-
+ drivers/pci/pcie/portdrv_bus.c | 2 +-
+ drivers/pci/pcie/portdrv_core.c | 19 +-
+ drivers/pci/pcie/portdrv_pci.c | 17 +-
+ drivers/pci/probe.c | 28 +-
+ drivers/pci/proc.c | 19 --
+ drivers/pci/quirks.c | 31 +-
+ drivers/pci/remove.c | 131 ++-----
+ drivers/pci/rom.c | 59 ----
+ drivers/pci/search.c | 8 +-
+ drivers/pcmcia/cardbus.c | 15 +-
+ drivers/rapidio/devices/tsi721.c | 18 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 8 +-
+ drivers/scsi/qla4xxx/ql4_nx.c | 4 +-
+ drivers/staging/et131x/et131x.c | 19 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 8 +-
+ include/linux/pci.h | 49 ++-
+ include/linux/pci_regs.h | 7 +
+ 61 files changed, 671 insertions(+), 1088 deletions(-)
+Merging hid/for-next (a252af05 Merge branch 'upstream' into for-next)
+$ git merge hid/for-next
+Removing drivers/hid/hid-picolcd.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-wacom | 13 +
+ MAINTAINERS | 6 +
+ drivers/hid/Kconfig | 9 +-
+ drivers/hid/Makefile | 20 +
+ drivers/hid/hid-a4tech.c | 1 -
+ drivers/hid/hid-apple.c | 1 -
+ drivers/hid/hid-aureal.c | 1 -
+ drivers/hid/hid-belkin.c | 1 -
+ drivers/hid/hid-cherry.c | 1 -
+ drivers/hid/hid-core.c | 12 +-
+ drivers/hid/hid-cypress.c | 1 -
+ drivers/hid/hid-debug.c | 12 +-
+ drivers/hid/hid-ezkey.c | 1 -
+ drivers/hid/hid-gyration.c | 1 -
+ drivers/hid/hid-ids.h | 10 +-
+ drivers/hid/hid-lcpower.c | 2 +-
+ drivers/hid/hid-lg.c | 1 -
+ drivers/hid/hid-microsoft.c | 1 -
+ drivers/hid/hid-monterey.c | 1 -
+ drivers/hid/hid-multitouch.c | 49 +-
+ drivers/hid/hid-petalynx.c | 1 -
+ drivers/hid/hid-picolcd.c | 2748 --------------------------
+ drivers/hid/hid-picolcd.h | 310 +++
+ drivers/hid/hid-picolcd_backlight.c | 122 ++
+ drivers/hid/hid-picolcd_cir.c | 152 ++
+ drivers/hid/hid-picolcd_core.c | 711 +++++++
+ drivers/hid/hid-picolcd_debugfs.c | 899 +++++++++
+ drivers/hid/hid-picolcd_fb.c | 615 ++++++
+ drivers/hid/hid-picolcd_lcd.c | 107 +
+ drivers/hid/hid-picolcd_leds.c | 175 ++
+ drivers/hid/hid-samsung.c | 1 -
+ drivers/hid/hid-sony.c | 1 -
+ drivers/hid/hid-sunplus.c | 1 -
+ drivers/hid/hid-uclogic.c | 98 +
+ drivers/hid/hid-wacom.c | 147 +-
+ drivers/hid/hidraw.c | 15 +-
+ drivers/hid/usbhid/hid-quirks.c | 3 +-
+ 37 files changed, 3465 insertions(+), 2785 deletions(-)
+ delete mode 100644 drivers/hid/hid-picolcd.c
+ create mode 100644 drivers/hid/hid-picolcd.h
+ create mode 100644 drivers/hid/hid-picolcd_backlight.c
+ create mode 100644 drivers/hid/hid-picolcd_cir.c
+ create mode 100644 drivers/hid/hid-picolcd_core.c
+ create mode 100644 drivers/hid/hid-picolcd_debugfs.c
+ create mode 100644 drivers/hid/hid-picolcd_fb.c
+ create mode 100644 drivers/hid/hid-picolcd_lcd.c
+ create mode 100644 drivers/hid/hid-picolcd_leds.c
+Merging quilt/i2c (b054690 i2c: Convert struct i2c_msg initialization to C99 format)
+$ git merge quilt/i2c
+Merge made by the 'recursive' strategy.
+ Documentation/i2c/busses/i2c-i801 | 1 +
+ drivers/i2c/busses/Kconfig | 7 +
+ drivers/i2c/busses/Makefile | 5 +-
+ drivers/i2c/busses/i2c-designware-core.c | 11 ++
+ drivers/i2c/busses/i2c-i801.c | 217 +++++++++++++++++++++++++++++-
+ drivers/i2c/i2c-core.c | 16 ++-
+ drivers/i2c/i2c-mux.c | 22 +++
+ drivers/i2c/i2c-smbus.c | 11 +-
+ drivers/i2c/muxes/i2c-mux-gpio.c | 4 +-
+ drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 10 +-
+ drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
+ include/linux/i2c-mux-gpio.h | 2 +
+ include/linux/i2c-mux.h | 1 +
+ include/linux/i2c/pca954x.h | 1 +
+ 15 files changed, 292 insertions(+), 20 deletions(-)
+Merging i2c-embedded/i2c-embedded/for-next (c7751af ARM: davinci: i2c: add OF support)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/i2c/davinci.txt | 28 ++++++++++++
+ drivers/i2c/busses/i2c-davinci.c | 48 ++++++++++++++++-----
+ drivers/i2c/busses/i2c-imx.c | 6 +--
+ 3 files changed, 68 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
+Merging quilt/jdelvare-hwmon (0c82d9f hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug)
+$ git merge quilt/jdelvare-hwmon
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/coretemp.c | 5 +++++
+ drivers/hwmon/via-cputemp.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+Merging hwmon-staging/hwmon-next (e0f877a hwmon: (lm70) Add support for LM71 and LM74)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/via-cputemp.c
+Auto-merging Documentation/feature-removal-schedule.txt
+Merge made by the 'recursive' strategy.
+ Documentation/feature-removal-schedule.txt | 10 -
+ Documentation/hwmon/adt7410 | 51 +++
+ Documentation/hwmon/lm70 | 12 +-
+ Documentation/hwmon/max197 | 60 ++++
+ drivers/hwmon/Kconfig | 25 +-
+ drivers/hwmon/Makefile | 2 +
+ drivers/hwmon/abituguru.c | 7 +-
+ drivers/hwmon/abituguru3.c | 6 +-
+ drivers/hwmon/ad7314.c | 16 +-
+ drivers/hwmon/ad7414.c | 21 +-
+ drivers/hwmon/ad7418.c | 21 +-
+ drivers/hwmon/adcxx.c | 4 +-
+ drivers/hwmon/adm1029.c | 21 +-
+ drivers/hwmon/adm9240.c | 26 --
+ drivers/hwmon/ads1015.c | 12 +-
+ drivers/hwmon/ads7828.c | 15 +-
+ drivers/hwmon/ads7871.c | 21 +-
+ drivers/hwmon/adt7410.c | 464 ++++++++++++++++++++++++++++
+ drivers/hwmon/adt7411.c | 9 +-
+ drivers/hwmon/adt7462.c | 15 +-
+ drivers/hwmon/adt7470.c | 15 +-
+ drivers/hwmon/amc6821.c | 16 +-
+ drivers/hwmon/asb100.c | 17 +-
+ drivers/hwmon/dme1737.c | 45 +--
+ drivers/hwmon/ds620.c | 16 +-
+ drivers/hwmon/emc1403.c | 18 +-
+ drivers/hwmon/emc2103.c | 10 +-
+ drivers/hwmon/f71882fg.c | 48 ++-
+ drivers/hwmon/f75375s.c | 8 +-
+ drivers/hwmon/fam15h_power.c | 25 +-
+ drivers/hwmon/g760a.c | 10 +-
+ drivers/hwmon/jz4740-hwmon.c | 53 +---
+ drivers/hwmon/lm70.c | 33 +-
+ drivers/hwmon/lm95241.c | 15 +-
+ drivers/hwmon/lm95245.c | 15 +-
+ drivers/hwmon/ltc4151.c | 15 +-
+ drivers/hwmon/ltc4215.c | 15 +-
+ drivers/hwmon/ltc4245.c | 14 +-
+ drivers/hwmon/max1668.c | 8 +-
+ drivers/hwmon/max197.c | 349 +++++++++++++++++++++
+ drivers/hwmon/mcp3021.c | 15 +-
+ drivers/hwmon/sch5627.c | 5 +-
+ drivers/hwmon/sch5636.c | 6 +-
+ drivers/hwmon/sch56xx-common.c | 28 +-
+ drivers/hwmon/sht15.c | 152 +++------
+ drivers/hwmon/sht21.c | 13 +-
+ drivers/hwmon/via-cputemp.c | 23 +-
+ drivers/hwmon/vt8231.c | 24 +-
+ drivers/hwmon/w83792d.c | 58 +---
+ drivers/hwmon/w83793.c | 23 --
+ drivers/hwmon/w83l786ng.c | 13 +-
+ include/linux/platform_data/max197.h | 21 ++
+ 52 files changed, 1266 insertions(+), 678 deletions(-)
+ create mode 100644 Documentation/hwmon/adt7410
+ create mode 100644 Documentation/hwmon/max197
+ create mode 100644 drivers/hwmon/adt7410.c
+ create mode 100644 drivers/hwmon/max197.c
+ create mode 100644 include/linux/platform_data/max197.h
+Merging v4l-dvb/master (624bfcc Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Removing drivers/staging/media/lirc/lirc_ttusbir.c
+Removing drivers/staging/media/lirc/lirc_ene0100.h
+Removing drivers/staging/media/easycap/easycap_testcard.c
+Removing drivers/staging/media/easycap/easycap_sound.c
+Removing drivers/staging/media/easycap/easycap_settings.c
+Removing drivers/staging/media/easycap/easycap_main.c
+Removing drivers/staging/media/easycap/easycap_low.c
+Removing drivers/staging/media/easycap/easycap_ioctl.c
+Removing drivers/staging/media/easycap/easycap.h
+Removing drivers/staging/media/easycap/README
+Removing drivers/staging/media/easycap/Makefile
+Removing drivers/staging/media/easycap/Kconfig
+Removing drivers/media/video/tlg2300/Makefile
+Removing drivers/media/video/cx23885/Kconfig
+Removing drivers/media/video/bt8xx/Makefile
+Removing drivers/media/video/bt8xx/Kconfig
+Removing drivers/media/video/Makefile
+Removing drivers/media/video/Kconfig
+Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c
+Auto-merging drivers/media/v4l2-core/videobuf2-core.c
+Auto-merging drivers/media/v4l2-core/videobuf-dvb.c
+Auto-merging drivers/media/v4l2-core/v4l2-dev.c
+Auto-merging drivers/media/v4l2-core/v4l2-common.c
+Auto-merging drivers/media/usb/uvc/uvcvideo.h
+Auto-merging drivers/media/usb/uvc/uvc_video.c
+Auto-merging drivers/media/usb/uvc/uvc_driver.c
+Auto-merging drivers/media/usb/usbvision/usbvision-video.c
+Auto-merging drivers/media/usb/usbvision/Makefile
+Auto-merging drivers/media/usb/usbvision/Kconfig
+Auto-merging drivers/media/usb/ttusb-dec/Makefile
+Auto-merging drivers/media/usb/ttusb-budget/Kconfig
+Auto-merging drivers/media/usb/tm6000/tm6000-video.c
+Auto-merging drivers/media/usb/tm6000/tm6000-input.c
+Auto-merging drivers/media/usb/tm6000/tm6000-alsa.c
+Auto-merging drivers/media/usb/tm6000/Makefile
+Auto-merging drivers/media/usb/s2255/s2255drv.c
+Auto-merging drivers/media/usb/pwc/Makefile
+Auto-merging drivers/media/usb/pvrusb2/pvrusb2-devattr.c
+Auto-merging drivers/media/usb/pvrusb2/Makefile
+Auto-merging drivers/media/usb/pvrusb2/Kconfig
+Auto-merging drivers/media/usb/hdpvr/Makefile
+Auto-merging drivers/media/usb/gspca/vc032x.c
+Auto-merging drivers/media/usb/gspca/stv06xx/Makefile
+Auto-merging drivers/media/usb/gspca/sq930x.c
+Auto-merging drivers/media/usb/gspca/sq905c.c
+Auto-merging drivers/media/usb/gspca/m5602/Makefile
+Auto-merging drivers/media/usb/gspca/gl860/Makefile
+Auto-merging drivers/media/usb/gspca/Kconfig
+Auto-merging drivers/media/usb/em28xx/em28xx-video.c
+Auto-merging drivers/media/usb/em28xx/em28xx-core.c
+Auto-merging drivers/media/usb/em28xx/em28xx-audio.c
+Auto-merging drivers/media/usb/em28xx/Makefile
+Auto-merging drivers/media/usb/em28xx/Kconfig
+Auto-merging drivers/media/usb/dvb-usb/pctv452e.c
+Auto-merging drivers/media/usb/dvb-usb/dvb-usb.h
+Auto-merging drivers/media/usb/dvb-usb/dvb-usb-dvb.c
+Auto-merging drivers/media/usb/dvb-usb/dib0700_core.c
+Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf.h
+Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
+Auto-merging drivers/media/usb/dvb-usb-v2/lmedm04.c
+Auto-merging drivers/media/usb/dvb-usb-v2/gl861.h
+Auto-merging drivers/media/usb/dvb-usb-v2/gl861.c
+Auto-merging drivers/media/usb/dvb-usb-v2/ec168.h
+Auto-merging drivers/media/usb/dvb-usb-v2/ec168.c
+Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.h
+Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.c
+Auto-merging drivers/media/usb/dvb-usb-v2/az6007.c
+Auto-merging drivers/media/usb/dvb-usb-v2/au6610.h
+Auto-merging drivers/media/usb/dvb-usb-v2/au6610.c
+Auto-merging drivers/media/usb/dvb-usb-v2/anysee.h
+Auto-merging drivers/media/usb/dvb-usb-v2/anysee.c
+Auto-merging drivers/media/usb/dvb-usb-v2/af9035.h
+Auto-merging drivers/media/usb/dvb-usb-v2/af9035.c
+Auto-merging drivers/media/usb/dvb-usb-v2/af9015.h
+Auto-merging drivers/media/usb/cx231xx/cx231xx-video.c
+Auto-merging drivers/media/usb/cx231xx/cx231xx-417.c
+Auto-merging drivers/media/usb/cx231xx/Makefile
+Auto-merging drivers/media/usb/cx231xx/Kconfig
+Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c
+Auto-merging drivers/media/usb/cpia2/cpia2_core.c
+Auto-merging drivers/media/usb/b2c2/flexcop-usb.c
+Auto-merging drivers/media/usb/au0828/au0828.h
+Auto-merging drivers/media/usb/au0828/au0828-video.c
+Auto-merging drivers/media/usb/au0828/au0828-reg.h
+Auto-merging drivers/media/usb/au0828/au0828-i2c.c
+Auto-merging drivers/media/usb/au0828/au0828-dvb.c
+Auto-merging drivers/media/usb/au0828/au0828-core.c
+Auto-merging drivers/media/usb/au0828/au0828-cards.c
+Auto-merging drivers/media/usb/au0828/Makefile
+Auto-merging drivers/media/usb/au0828/Kconfig
+Auto-merging drivers/media/tuners/xc5000.c
+Auto-merging drivers/media/tuners/xc4000.c
+Auto-merging drivers/media/tuners/tuner-xc2028.c
+Auto-merging drivers/media/tuners/tda18218.c
+Auto-merging drivers/media/tuners/tda18212.c
+Auto-merging drivers/media/tuners/qt1010.c
+Auto-merging drivers/media/tuners/Makefile
+Auto-merging drivers/media/tuners/Kconfig
+Auto-merging drivers/media/platform/vivi.c
+Auto-merging drivers/media/platform/soc_camera/soc_camera_platform.c
+Auto-merging drivers/media/platform/soc_camera/soc_camera.c
+Auto-merging drivers/media/platform/soc_camera/omap1_camera.c
+Auto-merging drivers/media/platform/soc_camera/mx3_camera.c
+Auto-merging drivers/media/platform/soc_camera/mx2_camera.c
+Auto-merging drivers/media/platform/sh_vou.c
+Auto-merging drivers/media/platform/s5p-tv/sii9234_drv.c
+Auto-merging drivers/media/platform/s5p-tv/sdo_drv.c
+Auto-merging drivers/media/platform/s5p-tv/regs-sdo.h
+Auto-merging drivers/media/platform/s5p-tv/mixer_video.c
+Auto-merging drivers/media/platform/s5p-tv/mixer_drv.c
+Auto-merging drivers/media/platform/s5p-tv/hdmi_drv.c
+Auto-merging drivers/media/platform/s5p-tv/Makefile
+Auto-merging drivers/media/platform/s5p-tv/Kconfig
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c
+Auto-merging drivers/media/platform/s5p-jpeg/jpeg-regs.h
+Auto-merging drivers/media/platform/s5p-jpeg/jpeg-hw.h
+Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.h
+Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.c
+Auto-merging drivers/media/platform/s5p-g2d/g2d.c
+Auto-merging drivers/media/platform/omap3isp/ispvideo.h
+Auto-merging drivers/media/platform/omap3isp/ispvideo.c
+Auto-merging drivers/media/platform/omap3isp/ispresizer.c
+Auto-merging drivers/media/platform/omap3isp/ispqueue.c
+Auto-merging drivers/media/platform/omap3isp/isppreview.h
+Auto-merging drivers/media/platform/omap3isp/isppreview.c
+Auto-merging drivers/media/platform/omap3isp/isphist.c
+Auto-merging drivers/media/platform/omap3isp/isph3a_af.c
+Auto-merging drivers/media/platform/omap3isp/isph3a_aewb.c
+Auto-merging drivers/media/platform/omap3isp/ispcsi2.c
+Auto-merging drivers/media/platform/omap3isp/ispccdc.h
+Auto-merging drivers/media/platform/omap3isp/ispccdc.c
+Auto-merging drivers/media/platform/omap3isp/isp.h
+Auto-merging drivers/media/platform/omap3isp/isp.c
+Auto-merging drivers/media/platform/omap3isp/cfa_coef_table.h
+Auto-merging drivers/media/platform/omap24xxcam.h
+Auto-merging drivers/media/platform/omap24xxcam.c
+Auto-merging drivers/media/platform/omap24xxcam-dma.c
+Auto-merging drivers/media/platform/omap/Makefile
+Auto-merging drivers/media/platform/mx2_emmaprp.c
+Auto-merging drivers/media/platform/mem2mem_testdev.c
+Auto-merging drivers/media/platform/fsl-viu.c
+Auto-merging drivers/media/platform/davinci/vpss.c
+Auto-merging drivers/media/platform/davinci/vpif_display.c
+Auto-merging drivers/media/platform/davinci/vpif_capture.c
+Auto-merging drivers/media/platform/davinci/vpif.c
+Auto-merging drivers/media/platform/davinci/vpfe_capture.c
+Auto-merging drivers/media/platform/davinci/vpbe_display.c
+Auto-merging drivers/media/platform/davinci/isif.c
+Auto-merging drivers/media/platform/davinci/dm644x_ccdc.c
+Auto-merging drivers/media/platform/davinci/dm355_ccdc.c
+Auto-merging drivers/media/platform/davinci/Kconfig
+Auto-merging drivers/media/platform/blackfin/bfin_capture.c
+Auto-merging drivers/media/pci/zoran/Kconfig
+Auto-merging drivers/media/pci/ttpci/budget.c
+Auto-merging drivers/media/pci/ttpci/Makefile
+Auto-merging drivers/media/pci/ttpci/Kconfig
+Auto-merging drivers/media/pci/saa7164/saa7164.h
+Auto-merging drivers/media/pci/saa7164/saa7164-core.c
+Auto-merging drivers/media/pci/saa7164/saa7164-api.c
+Auto-merging drivers/media/pci/saa7164/Makefile
+Auto-merging drivers/media/pci/saa7164/Kconfig
+Auto-merging drivers/media/pci/saa7134/saa7134.h
+Auto-merging drivers/media/pci/saa7134/saa7134-input.c
+Auto-merging drivers/media/pci/saa7134/saa7134-dvb.c
+Auto-merging drivers/media/pci/saa7134/Makefile
+Auto-merging drivers/media/pci/saa7134/Kconfig
+Auto-merging drivers/media/pci/pt1/Makefile
+Auto-merging drivers/media/pci/ngene/ngene-core.c
+Auto-merging drivers/media/pci/ngene/ngene-cards.c
+Auto-merging drivers/media/pci/ngene/Makefile
+Auto-merging drivers/media/pci/mantis/mantis_dvb.c
+Auto-merging drivers/media/pci/mantis/mantis_core.c
+Auto-merging drivers/media/pci/mantis/mantis_cards.c
+Auto-merging drivers/media/pci/mantis/Makefile
+Auto-merging drivers/media/pci/mantis/Kconfig
+Auto-merging drivers/media/pci/ivtv/ivtv-streams.c
+Auto-merging drivers/media/pci/ivtv/ivtv-firmware.c
+Auto-merging drivers/media/pci/ivtv/ivtv-fileops.c
+Auto-merging drivers/media/pci/ivtv/Makefile
+Auto-merging drivers/media/pci/dm1105/Kconfig
+Auto-merging drivers/media/pci/ddbridge/Makefile
+Auto-merging drivers/media/pci/ddbridge/Kconfig
+Auto-merging drivers/media/pci/cx88/cx88.h
+Auto-merging drivers/media/pci/cx88/cx88-dvb.c
+Auto-merging drivers/media/pci/cx88/cx88-core.c
+Auto-merging drivers/media/pci/cx88/cx88-alsa.c
+Auto-merging drivers/media/pci/cx88/Makefile
+Auto-merging drivers/media/pci/cx88/Kconfig
+Auto-merging drivers/media/pci/cx25821/Makefile
+Auto-merging drivers/media/pci/cx23885/cx23885-input.c
+Auto-merging drivers/media/pci/cx23885/cx23885-dvb.c
+Auto-merging drivers/media/pci/cx23885/cx23885-cards.c
+Auto-merging drivers/media/pci/cx23885/cx23885-417.c
+Auto-merging drivers/media/pci/cx23885/Makefile
+Auto-merging drivers/media/pci/cx18/cx18-firmware.c
+Auto-merging drivers/media/pci/cx18/cx18-dvb.c
+Auto-merging drivers/media/pci/cx18/cx18-driver.c
+Auto-merging drivers/media/pci/cx18/cx18-av-firmware.c
+Auto-merging drivers/media/pci/cx18/Makefile
+Auto-merging drivers/media/pci/cx18/Kconfig
+Auto-merging drivers/media/pci/bt8xx/dst_ca.c
+Auto-merging drivers/media/i2c/tvp514x_regs.h
+Auto-merging drivers/media/i2c/tvp514x.c
+Auto-merging drivers/media/i2c/tcm825x.h
+Auto-merging drivers/media/i2c/tcm825x.c
+Auto-merging drivers/media/i2c/soc_camera/tw9910.c
+Auto-merging drivers/media/i2c/soc_camera/rj54n1cb0c.c
+Auto-merging drivers/media/i2c/soc_camera/ov9740.c
+Auto-merging drivers/media/i2c/soc_camera/ov9640.c
+Auto-merging drivers/media/i2c/soc_camera/ov772x.c
+Auto-merging drivers/media/i2c/soc_camera/ov6650.c
+Auto-merging drivers/media/i2c/soc_camera/ov5642.c
+Auto-merging drivers/media/i2c/soc_camera/ov2640.c
+Auto-merging drivers/media/i2c/soc_camera/mt9v022.c
+Auto-merging drivers/media/i2c/soc_camera/mt9t112.c
+Auto-merging drivers/media/i2c/soc_camera/mt9t031.c
+Auto-merging drivers/media/i2c/soc_camera/mt9m111.c
+Auto-merging drivers/media/i2c/soc_camera/mt9m001.c
+Auto-merging drivers/media/i2c/soc_camera/imx074.c
+Auto-merging drivers/media/i2c/smiapp/smiapp.h
+Auto-merging drivers/mResolved 'arch/arm/mach-imx/mach-imx27_visstrim_m10.c' using previous resolution.
+edia/i2c/smiapp/smiapp-regs.c
+Auto-merging drivers/media/i2c/smiapp/smiapp-reg.h
+Auto-merging drivers/media/i2c/smiapp/smiapp-reg-defs.h
+Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.h
+Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.c
+Auto-merging drivers/media/i2c/smiapp/smiapp-limits.h
+Auto-merging drivers/media/i2c/smiapp/smiapp-limits.c
+Auto-merging drivers/media/i2c/smiapp/smiapp-core.c
+Auto-merging drivers/media/i2c/smiapp/Makefile
+Auto-merging drivers/media/i2c/smiapp-pll.h
+Auto-merging drivers/media/i2c/smiapp-pll.c
+Auto-merging drivers/media/i2c/saa7127.c
+Auto-merging drivers/media/i2c/s5k6aa.c
+Auto-merging drivers/media/i2c/cx25840/cx25840-firmware.c
+Auto-merging drivers/media/i2c/cx25840/Makefile
+Auto-merging drivers/media/i2c/as3645a.c
+Auto-merging drivers/media/i2c/adp1653.c
+Auto-merging drivers/media/firewire/Makefile
+Removing drivers/media/dvb/ttusb-budget/Makefile
+Removing drivers/media/dvb/siano/Kconfig
+Removing drivers/media/dvb/pluto2/Makefile
+Removing drivers/media/dvb/ngene/Kconfig
+Removing drivers/media/dvb/dvb-usb/mxl111sf.c
+Removing drivers/media/dvb/dvb-usb/it913x.c
+Removing drivers/media/dvb/dvb-usb/af9015.c
+Removing drivers/media/dvb/dvb-usb/Makefile
+Removing drivers/media/dvb/dvb-usb/Kconfig
+Removing drivers/media/dvb/dm1105/Makefile
+Removing drivers/media/dvb/bt8xx/Makefile
+Removing drivers/media/dvb/bt8xx/Kconfig
+Removing drivers/media/dvb/b2c2/Makefile
+Removing drivers/media/dvb/b2c2/Kconfig
+Removing drivers/media/dvb/Makefile
+Removing drivers/media/dvb/Kconfig
+Auto-merging drivers/media/dvb-frontends/rtl2830.c
+Auto-merging drivers/media/dvb-frontends/nxt200x.c
+Auto-merging drivers/media/dvb-frontends/m88rs2000.c
+Auto-merging drivers/media/dvb-frontends/lgs8gxx.c
+Auto-merging drivers/media/dvb-frontends/lgs8gl5.c
+Auto-merging drivers/media/dvb-frontends/it913x-fe.c
+Auto-merging drivers/media/dvb-frontends/dvb-pll.h
+Auto-merging drivers/media/dvb-frontends/dvb-pll.c
+Auto-merging drivers/media/dvb-frontends/cxd2820r_t.c
+Auto-merging drivers/media/dvb-frontends/au8522_priv.h
+Auto-merging drivers/media/dvb-frontends/au8522_dig.c
+Auto-merging drivers/media/dvb-frontends/au8522_decoder.c
+Auto-merging drivers/media/dvb-frontends/au8522_common.c
+Auto-merging drivers/media/dvb-frontends/atbm8830.c
+Auto-merging drivers/media/dvb-frontends/Makefile
+Auto-merging drivers/media/dvb-frontends/Kconfig
+Auto-merging drivers/media/dvb-core/dvbdev.h
+Auto-merging drivers/media/dvb-core/dvb_frontend.h
+Auto-merging drivers/media/dvb-core/dvb_frontend.c
+Auto-merging drivers/media/dvb-core/dvb_demux.c
+Auto-merging drivers/media/dvb-core/dmxdev.c
+Auto-merging drivers/media/common/siano/Makefile
+Auto-merging drivers/media/common/saa7146/saa7146_fops.c
+Auto-merging drivers/media/common/saa7146/saa7146_core.c
+Auto-merging drivers/media/common/b2c2/flexcop.c
+Auto-merging arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/feature-removal-schedule.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 12ac35c] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/media/Makefile | 2 +-
+ Documentation/DocBook/media/dvb/audio.xml | 113 +-
+ Documentation/DocBook/media/dvb/ca.xml | 353 ++
+ Documentation/DocBook/media/dvb/demux.xml | 230 +-
+ Documentation/DocBook/media/dvb/dvbapi.xml | 2 +-
+ Documentation/DocBook/media/dvb/dvbproperty.xml | 65 +-
+ Documentation/DocBook/media/dvb/frontend.xml | 70 +-
+ Documentation/DocBook/media/dvb/kdapi.xml | 2 +-
+ Documentation/DocBook/media/dvb/net.xml | 127 +
+ Documentation/DocBook/media/dvb/video.xml | 333 +-
+ Documentation/DocBook/media/v4l/biblio.xml | 12 +-
+ Documentation/DocBook/media/v4l/compat.xml | 16 -
+ Documentation/DocBook/media/v4l/controls.xml | 453 ++-
+ Documentation/DocBook/media/v4l/dev-rds.xml | 2 +-
+ Documentation/DocBook/media/v4l/dev-subdev.xml | 20 +-
+ .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml | 3 +-
+ Documentation/DocBook/media/v4l/selection-api.xml | 22 +-
+ Documentation/DocBook/media/v4l/v4l2.xml | 14 +-
+ .../DocBook/media/v4l/vidioc-g-selection.xml | 9 +-
+ Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 2 +
+ .../media/v4l/vidioc-subdev-g-selection.xml | 8 +-
+ Documentation/DocBook/media_api.tmpl | 9 +-
+ Documentation/dvb/README.dvb-usb | 2 +-
+ Documentation/feature-removal-schedule.txt | 9 +
+ Documentation/ioctl/ioctl-number.txt | 5 -
+ MAINTAINERS | 28 +-
+ arch/arm/mach-imx/clk-imx27.c | 4 +-
+ arch/arm/mach-imx/devices-imx27.h | 4 +
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 45 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 30 +
+ arch/arm/plat-mxc/devices/Kconfig | 6 +-
+ arch/arm/plat-mxc/devices/Makefile | 1 +
+ arch/arm/plat-mxc/devices/platform-imx27-coda.c | 37 +
+ arch/arm/plat-mxc/include/mach/devices-common.h | 8 +
+ drivers/gpio/gpio-bt8xx.c | 2 +-
+ drivers/media/Kconfig | 53 +-
+ drivers/media/Makefile | 7 +-
+ drivers/media/common/Kconfig | 12 +-
+ drivers/media/common/Makefile | 7 +-
+ drivers/media/common/b2c2/Kconfig | 28 +
+ drivers/media/common/b2c2/Makefile | 8 +
+ .../media/{dvb => common}/b2c2/flexcop-common.h | 0
+ .../media/{dvb => common}/b2c2/flexcop-eeprom.c | 0
+ .../media/{dvb => common}/b2c2/flexcop-fe-tuner.c | 0
+ .../media/{dvb => common}/b2c2/flexcop-hw-filter.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-i2c.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-misc.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-reg.h | 0
+ drivers/media/{dvb => common}/b2c2/flexcop-sram.c | 0
+ drivers/media/{dvb => common}/b2c2/flexcop.c | 1 +
+ drivers/media/{dvb => common}/b2c2/flexcop.h | 0
+ .../{dvb => common}/b2c2/flexcop_ibi_value_be.h | 0
+ .../{dvb => common}/b2c2/flexcop_ibi_value_le.h | 0
+ drivers/media/common/saa7146/Kconfig | 9 +
+ drivers/media/common/saa7146/Makefile | 5 +
+ drivers/media/common/{ => saa7146}/saa7146_core.c | 8 -
+ drivers/media/common/{ => saa7146}/saa7146_fops.c | 55 +-
+ drivers/media/common/{ => saa7146}/saa7146_hlp.c | 0
+ drivers/media/common/{ => saa7146}/saa7146_i2c.c | 0
+ drivers/media/common/{ => saa7146}/saa7146_vbi.c | 0
+ drivers/media/common/{ => saa7146}/saa7146_video.c | 0
+ drivers/media/common/siano/Kconfig | 17 +
+ drivers/media/{dvb => common}/siano/Makefile | 6 +-
+ drivers/media/{dvb => common}/siano/sms-cards.c | 0
+ drivers/media/{dvb => common}/siano/sms-cards.h | 0
+ drivers/media/{dvb => common}/siano/smscoreapi.c | 0
+ drivers/media/{dvb => common}/siano/smscoreapi.h | 0
+ drivers/media/{dvb => common}/siano/smsdvb.c | 0
+ drivers/media/{dvb => common}/siano/smsendian.c | 0
+ drivers/media/{dvb => common}/siano/smsendian.h | 0
+ drivers/media/{dvb => common}/siano/smsir.c | 0
+ drivers/media/{dvb => common}/siano/smsir.h | 0
+ drivers/media/dvb-core/Kconfig | 29 +
+ drivers/media/{dvb => }/dvb-core/Makefile | 0
+ drivers/media/{dvb => }/dvb-core/demux.h | 0
+ drivers/media/{dvb => }/dvb-core/dmxdev.c | 4 +-
+ drivers/media/{dvb => }/dvb-core/dmxdev.h | 0
+ .../media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_demux.c | 19 +-
+ drivers/media/{dvb => }/dvb-core/dvb_demux.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_filter.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_filter.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_frontend.c | 72 +-
+ drivers/media/{dvb => }/dvb-core/dvb_frontend.h | 4 +
+ drivers/media/{dvb => }/dvb-core/dvb_math.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_math.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_net.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_net.h | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c | 0
+ drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h | 0
+ drivers/media/{dvb => }/dvb-core/dvbdev.c | 0
+ drivers/media/{dvb => }/dvb-core/dvbdev.h | 26 -
+ .../media/{dvb/frontends => dvb-frontends}/Kconfig | 195 +-
+ .../{dvb/frontends => dvb-frontends}/Makefile | 12 +-
+ .../media/{dvb/frontends => dvb-frontends}/a8293.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/a8293.h | 0
+ .../{dvb/frontends => dvb-frontends}/af9013.c | 0
+ .../{dvb/frontends => dvb-frontends}/af9013.h | 0
+ .../{dvb/frontends => dvb-frontends}/af9013_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/af9033.c | 0
+ .../{dvb/frontends => dvb-frontends}/af9033.h | 0
+ .../{dvb/frontends => dvb-frontends}/af9033_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/atbm8830.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/atbm8830.h | 0
+ .../frontends => dvb-frontends}/atbm8830_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/au8522.h | 0
+ .../frontends => dvb-frontends}/au8522_common.c | 22 +-
+ .../frontends => dvb-frontends}/au8522_decoder.c | 11 +-
+ .../{dvb/frontends => dvb-frontends}/au8522_dig.c | 98 +-
+ .../{dvb/frontends => dvb-frontends}/au8522_priv.h | 29 +-
+ .../{dvb/frontends => dvb-frontends}/bcm3510.c | 0
+ .../{dvb/frontends => dvb-frontends}/bcm3510.h | 0
+ .../frontends => dvb-frontends}/bcm3510_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/bsbe1-d01a.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/bsbe1.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/bsru6.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx22700.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx22700.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx22702.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx22702.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24110.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24110.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24113.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24113.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24116.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24116.h | 0
+ .../{dvb/frontends => dvb-frontends}/cx24123.c | 0
+ .../{dvb/frontends => dvb-frontends}/cx24123.h | 0
+ .../{dvb/frontends => dvb-frontends}/cxd2820r.h | 0
+ .../{dvb/frontends => dvb-frontends}/cxd2820r_c.c | 0
+ .../frontends => dvb-frontends}/cxd2820r_core.c | 0
+ .../frontends => dvb-frontends}/cxd2820r_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/cxd2820r_t.c | 3 +-
+ .../{dvb/frontends => dvb-frontends}/cxd2820r_t2.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib0070.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib0070.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib0090.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib0090.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000mb.c | 0
+ .../frontends => dvb-frontends}/dib3000mb_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000mc.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib3000mc.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000m.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000m.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000p.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib7000p.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib8000.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib8000.h | 0
+ .../{dvb/frontends => dvb-frontends}/dib9000.c | 0
+ .../{dvb/frontends => dvb-frontends}/dib9000.h | 0
+ .../frontends => dvb-frontends}/dibx000_common.c | 0
+ .../frontends => dvb-frontends}/dibx000_common.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/drxd.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxd_firm.c | 0
+ .../{dvb/frontends => dvb-frontends}/drxd_firm.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxd_hard.c | 0
+ .../frontends => dvb-frontends}/drxd_map_firm.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/drxk.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxk_hard.c | 0
+ .../{dvb/frontends => dvb-frontends}/drxk_hard.h | 0
+ .../{dvb/frontends => dvb-frontends}/drxk_map.h | 0
+ .../{dvb/frontends => dvb-frontends}/ds3000.c | 0
+ .../{dvb/frontends => dvb-frontends}/ds3000.h | 0
+ .../{dvb/frontends => dvb-frontends}/dvb-pll.c | 26 +
+ .../{dvb/frontends => dvb-frontends}/dvb-pll.h | 1 +
+ .../frontends => dvb-frontends}/dvb_dummy_fe.c | 0
+ .../frontends => dvb-frontends}/dvb_dummy_fe.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/ec100.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/ec100.h | 0
+ .../{dvb/frontends => dvb-frontends}/ec100_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/eds1547.h | 0
+ .../{dvb/frontends => dvb-frontends}/hd29l2.c | 0
+ .../{dvb/frontends => dvb-frontends}/hd29l2.h | 0
+ .../{dvb/frontends => dvb-frontends}/hd29l2_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/isl6405.c | 0
+ .../{dvb/frontends => dvb-frontends}/isl6405.h | 0
+ .../{dvb/frontends => dvb-frontends}/isl6421.c | 0
+ .../{dvb/frontends => dvb-frontends}/isl6421.h | 0
+ .../{dvb/frontends => dvb-frontends}/isl6423.c | 0
+ .../{dvb/frontends => dvb-frontends}/isl6423.h | 0
+ .../frontends => dvb-frontends}/it913x-fe-priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/it913x-fe.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/it913x-fe.h | 0
+ .../{dvb/frontends => dvb-frontends}/itd1000.c | 0
+ .../{dvb/frontends => dvb-frontends}/itd1000.h | 0
+ .../frontends => dvb-frontends}/itd1000_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/ix2505v.c | 0
+ .../{dvb/frontends => dvb-frontends}/ix2505v.h | 0
+ .../{dvb/frontends => dvb-frontends}/l64781.c | 0
+ .../{dvb/frontends => dvb-frontends}/l64781.h | 0
+ .../{dvb/frontends => dvb-frontends}/lg2160.c | 0
+ .../{dvb/frontends => dvb-frontends}/lg2160.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt3305.c | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt3305.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt330x.c | 0
+ .../{dvb/frontends => dvb-frontends}/lgdt330x.h | 0
+ .../frontends => dvb-frontends}/lgdt330x_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgs8gl5.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/lgs8gl5.h | 0
+ .../{dvb/frontends => dvb-frontends}/lgs8gxx.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/lgs8gxx.h | 0
+ .../frontends => dvb-frontends}/lgs8gxx_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/lnbh24.h | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp21.c | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp21.h | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp22.c | 0
+ .../{dvb/frontends => dvb-frontends}/lnbp22.h | 0
+ .../{dvb/frontends => dvb-frontends}/m88rs2000.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/m88rs2000.h | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a16.c | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a16.h | 0
+ .../frontends => dvb-frontends}/mb86a16_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a20s.c | 0
+ .../{dvb/frontends => dvb-frontends}/mb86a20s.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt312.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt312.h | 0
+ .../{dvb/frontends => dvb-frontends}/mt312_priv.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt352.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/mt352.h | 0
+ .../{dvb/frontends => dvb-frontends}/mt352_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/nxt200x.c | 64 +-
+ .../{dvb/frontends => dvb-frontends}/nxt200x.h | 0
+ .../{dvb/frontends => dvb-frontends}/nxt6000.c | 0
+ .../{dvb/frontends => dvb-frontends}/nxt6000.h | 0
+ .../frontends => dvb-frontends}/nxt6000_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/or51132.c | 0
+ .../{dvb/frontends => dvb-frontends}/or51132.h | 0
+ .../{dvb/frontends => dvb-frontends}/or51211.c | 0
+ .../{dvb/frontends => dvb-frontends}/or51211.h | 0
+ .../{dvb/frontends => dvb-frontends}/rtl2830.c | 2 +-
+ .../{dvb/frontends => dvb-frontends}/rtl2830.h | 0
+ .../frontends => dvb-frontends}/rtl2830_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/rtl2832.c | 0
+ .../{dvb/frontends => dvb-frontends}/rtl2832.h | 0
+ .../frontends => dvb-frontends}/rtl2832_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1409.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1409.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1411.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1411.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1420.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1420.h | 0
+ .../frontends => dvb-frontends}/s5h1420_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1432.c | 0
+ .../{dvb/frontends => dvb-frontends}/s5h1432.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/s921.c | 0
+ .../media/{dvb/frontends => dvb-frontends}/s921.h | 0
+ .../{dvb/frontends => dvb-frontends}/si21xx.c | 0
+ .../{dvb/frontends => dvb-frontends}/si21xx.h | 0
+ .../{dvb/frontends => dvb-frontends}/sp8870.c | 0
+ .../{dvb/frontends => dvb-frontends}/sp8870.h | 0
+ .../{dvb/frontends => dvb-frontends}/sp887x.c | 0
+ .../{dvb/frontends => dvb-frontends}/sp887x.h | 0
+ .../frontends => dvb-frontends}/stb0899_algo.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_cfg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_drv.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_drv.h | 0
+ .../frontends => dvb-frontends}/stb0899_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb0899_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb6000.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb6000.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb6100.c | 0
+ .../{dvb/frontends => dvb-frontends}/stb6100.h | 0
+ .../{dvb/frontends => dvb-frontends}/stb6100_cfg.h | 0
+ .../frontends => dvb-frontends}/stb6100_proc.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0288.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0288.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0297.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0297.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0299.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0299.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0367.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv0367.h | 0
+ .../frontends => dvb-frontends}/stv0367_priv.h | 0
+ .../frontends => dvb-frontends}/stv0367_regs.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0900.h | 0
+ .../frontends => dvb-frontends}/stv0900_core.c | 0
+ .../frontends => dvb-frontends}/stv0900_init.h | 0
+ .../frontends => dvb-frontends}/stv0900_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0900_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv0900_sw.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv090x.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv090x.h | 0
+ .../frontends => dvb-frontends}/stv090x_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv090x_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110.h | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110x.c | 0
+ .../{dvb/frontends => dvb-frontends}/stv6110x.h | 0
+ .../frontends => dvb-frontends}/stv6110x_priv.h | 0
+ .../frontends => dvb-frontends}/stv6110x_reg.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10021.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10023.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda1002x.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10048.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10048.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda1004x.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda1004x.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10071.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10071.h | 0
+ .../frontends => dvb-frontends}/tda10071_priv.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda10086.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda10086.h | 0
+ .../frontends => dvb-frontends}/tda18271c2dd.c | 0
+ .../frontends => dvb-frontends}/tda18271c2dd.h | 0
+ .../tda18271c2dd_maps.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda665x.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda665x.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda8083.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda8083.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda8261.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda8261.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda8261_cfg.h | 0
+ .../{dvb/frontends => dvb-frontends}/tda826x.c | 0
+ .../{dvb/frontends => dvb-frontends}/tda826x.h | 0
+ .../media/{dvb/frontends => dvb-frontends}/tdhd1.h | 0
+ .../{dvb/frontends => dvb-frontends}/tua6100.c | 0
+ .../{dvb/frontends => dvb-frontends}/tua6100.h | 0
+ .../{dvb/frontends => dvb-frontends}/ves1820.c | 0
+ .../{dvb/frontends => dvb-frontends}/ves1820.h | 0
+ .../{dvb/frontends => dvb-frontends}/ves1x93.c | 0
+ .../{dvb/frontends => dvb-frontends}/ves1x93.h | 0
+ .../{dvb/frontends => dvb-frontends}/z0194a.h | 0
+ .../{dvb/frontends => dvb-frontends}/zl10036.c | 0
+ .../{dvb/frontends => dvb-frontends}/zl10036.h | 0
+ .../{dvb/frontends => dvb-frontends}/zl10039.c | 0
+ .../{dvb/frontends => dvb-frontends}/zl10039.h | 0
+ .../{dvb/frontends => dvb-frontends}/zl10353.c | 0
+ .../{dvb/frontends => dvb-frontends}/zl10353.h | 0
+ .../frontends => dvb-frontends}/zl10353_priv.h | 0
+ drivers/media/dvb/Kconfig | 91 -
+ drivers/media/dvb/Makefile | 21 -
+ drivers/media/dvb/b2c2/Kconfig | 45 -
+ drivers/media/dvb/b2c2/Makefile | 16 -
+ drivers/media/dvb/bt8xx/Kconfig | 22 -
+ drivers/media/dvb/bt8xx/Makefile | 6 -
+ drivers/media/dvb/dm1105/Makefile | 3 -
+ drivers/media/dvb/dvb-usb/Kconfig | 440 --
+ drivers/media/dvb/dvb-usb/Makefile | 121 -
+ drivers/media/dvb/dvb-usb/af9015.c | 1952 ---------
+ drivers/media/dvb/dvb-usb/it913x.c | 931 -----
+ drivers/media/dvb/dvb-usb/mxl111sf.c | 1835 ---------
+ drivers/media/dvb/ngene/Kconfig | 13 -
+ drivers/media/dvb/pluto2/Makefile | 3 -
+ drivers/media/dvb/siano/Kconfig | 34 -
+ drivers/media/dvb/ttusb-budget/Makefile | 3 -
+ drivers/media/{dvb => }/firewire/Kconfig | 0
+ drivers/media/{dvb => }/firewire/Makefile | 4 +-
+ drivers/media/{dvb => }/firewire/firedtv-avc.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-ci.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-dvb.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-fe.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-fw.c | 0
+ drivers/media/{dvb => }/firewire/firedtv-rc.c | 0
+ drivers/media/{dvb => }/firewire/firedtv.h | 0
+ drivers/media/i2c/Kconfig | 561 +++
+ drivers/media/i2c/Makefile | 64 +
+ drivers/media/{video => i2c}/adp1653.c | 2 +-
+ drivers/media/{video => i2c}/adv7170.c | 0
+ drivers/media/{video => i2c}/adv7175.c | 0
+ drivers/media/{video => i2c}/adv7180.c | 0
+ drivers/media/{video => i2c}/adv7183.c | 0
+ drivers/media/{video => i2c}/adv7183_regs.h | 0
+ drivers/media/{video => i2c}/adv7343.c | 0
+ drivers/media/{video => i2c}/adv7343_regs.h | 0
+ drivers/media/{video => i2c}/adv7393.c | 0
+ drivers/media/{video => i2c}/adv7393_regs.h | 0
+ drivers/media/{video => i2c}/ak881x.c | 0
+ drivers/media/{video => i2c}/aptina-pll.c | 0
+ drivers/media/{video => i2c}/aptina-pll.h | 0
+ drivers/media/{video => i2c}/as3645a.c | 2 +-
+ drivers/media/{video => i2c}/bt819.c | 0
+ drivers/media/{video => i2c}/bt856.c | 0
+ drivers/media/{video => i2c}/bt866.c | 0
+ drivers/media/{video => i2c}/btcx-risc.c | 0
+ drivers/media/{video => i2c}/btcx-risc.h | 0
+ drivers/media/{video => i2c}/cs5345.c | 0
+ drivers/media/{video => i2c}/cs53l32a.c | 0
+ drivers/media/{video => i2c}/cx2341x.c | 0
+ drivers/media/{video => i2c}/cx25840/Kconfig | 0
+ drivers/media/{video => i2c}/cx25840/Makefile | 2 +-
+ .../media/{video => i2c}/cx25840/cx25840-audio.c | 0
+ .../media/{video => i2c}/cx25840/cx25840-core.c | 0
+ .../media/{video => i2c}/cx25840/cx25840-core.h | 0
+ .../{video => i2c}/cx25840/cx25840-firmware.c | 15 +-
+ drivers/media/{video => i2c}/cx25840/cx25840-ir.c | 0
+ drivers/media/{video => i2c}/cx25840/cx25840-vbi.c | 0
+ drivers/media/{video => i2c}/ir-kbd-i2c.c | 0
+ drivers/media/{video => i2c}/ks0127.c | 0
+ drivers/media/{video => i2c}/ks0127.h | 0
+ drivers/media/{video => i2c}/m52790.c | 0
+ drivers/media/{video => i2c}/m5mols/Kconfig | 0
+ drivers/media/{video => i2c}/m5mols/Makefile | 0
+ drivers/media/{video => i2c}/m5mols/m5mols.h | 0
+ .../media/{video => i2c}/m5mols/m5mols_capture.c | 0
+ .../media/{video => i2c}/m5mols/m5mols_controls.c | 0
+ drivers/media/{video => i2c}/m5mols/m5mols_core.c | 0
+ drivers/media/{video => i2c}/m5mols/m5mols_reg.h | 0
+ drivers/media/{video => i2c}/msp3400-driver.c | 0
+ drivers/media/{video => i2c}/msp3400-driver.h | 0
+ drivers/media/{video => i2c}/msp3400-kthreads.c | 0
+ drivers/media/{video => i2c}/mt9m032.c | 0
+ drivers/media/{video => i2c}/mt9p031.c | 0
+ drivers/media/{video => i2c}/mt9t001.c | 0
+ drivers/media/{video => i2c}/mt9v011.c | 0
+ drivers/media/{video => i2c}/mt9v032.c | 0
+ drivers/media/{video => i2c}/noon010pc30.c | 0
+ drivers/media/{video => i2c}/ov7670.c | 0
+ drivers/media/{video => i2c}/s5k6aa.c | 9 +-
+ drivers/media/{video => i2c}/saa6588.c | 0
+ drivers/media/{video => i2c}/saa7110.c | 0
+ drivers/media/{video => i2c}/saa7115.c | 0
+ drivers/media/{video => i2c}/saa711x_regs.h | 0
+ drivers/media/{video => i2c}/saa7127.c | 5 +-
+ drivers/media/{video => i2c}/saa717x.c | 0
+ drivers/media/{video => i2c}/saa7185.c | 0
+ drivers/media/{video => i2c}/saa7191.c | 0
+ drivers/media/{video => i2c}/saa7191.h | 0
+ drivers/media/{video => i2c}/smiapp-pll.c | 2 +-
+ drivers/media/{video => i2c}/smiapp-pll.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/Kconfig | 0
+ drivers/media/{video => i2c}/smiapp/Makefile | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-core.c | 2 +-
+ .../media/{video => i2c}/smiapp/smiapp-limits.c | 2 +-
+ .../media/{video => i2c}/smiapp/smiapp-limits.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-quirk.c | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-quirk.h | 2 +-
+ .../media/{video => i2c}/smiapp/smiapp-reg-defs.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-reg.h | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-regs.c | 2 +-
+ drivers/media/{video => i2c}/smiapp/smiapp-regs.h | 0
+ drivers/media/{video => i2c}/smiapp/smiapp.h | 2 +-
+ drivers/media/i2c/soc_camera/Kconfig | 89 +
+ drivers/media/i2c/soc_camera/Makefile | 14 +
+ drivers/media/{video => i2c/soc_camera}/imx074.c | 30 +-
+ drivers/media/{video => i2c/soc_camera}/mt9m001.c | 26 +-
+ drivers/media/{video => i2c/soc_camera}/mt9m111.c | 116 +-
+ drivers/media/{video => i2c/soc_camera}/mt9t031.c | 48 +-
+ drivers/media/{video => i2c/soc_camera}/mt9t112.c | 21 +-
+ drivers/media/{video => i2c/soc_camera}/mt9v022.c | 50 +-
+ drivers/media/{video => i2c/soc_camera}/ov2640.c | 20 +-
+ drivers/media/{video => i2c/soc_camera}/ov5642.c | 31 +-
+ drivers/media/{video => i2c/soc_camera}/ov6650.c | 28 +-
+ drivers/media/{video => i2c/soc_camera}/ov772x.c | 447 ++-
+ drivers/media/{video => i2c/soc_camera}/ov9640.c | 27 +-
+ drivers/media/{video => i2c/soc_camera}/ov9640.h | 0
+ drivers/media/{video => i2c/soc_camera}/ov9740.c | 47 +-
+ .../media/{video => i2c/soc_camera}/rj54n1cb0c.c | 27 +-
+ drivers/media/{video => i2c/soc_camera}/tw9910.c | 21 +-
+ drivers/media/{video => i2c}/sr030pc30.c | 0
+ drivers/media/{video => i2c}/tcm825x.c | 2 +-
+ drivers/media/{video => i2c}/tcm825x.h | 2 +-
+ drivers/media/{video => i2c}/tda7432.c | 0
+ drivers/media/{video => i2c}/tda9840.c | 0
+ drivers/media/{video => i2c}/tea6415c.c | 0
+ drivers/media/{video => i2c}/tea6415c.h | 0
+ drivers/media/{video => i2c}/tea6420.c | 0
+ drivers/media/{video => i2c}/tea6420.h | 0
+ drivers/media/{video => i2c}/ths7303.c | 0
+ drivers/media/{video => i2c}/tlv320aic23b.c | 0
+ drivers/media/{video => i2c}/tvaudio.c | 0
+ drivers/media/{video => i2c}/tveeprom.c | 0
+ drivers/media/{video => i2c}/tvp514x.c | 2 +-
+ drivers/media/{video => i2c}/tvp514x_regs.h | 2 +-
+ drivers/media/{video => i2c}/tvp5150.c | 0
+ drivers/media/{video => i2c}/tvp5150_reg.h | 0
+ drivers/media/{video => i2c}/tvp7002.c | 0
+ drivers/media/{video => i2c}/tvp7002_reg.h | 0
+ drivers/media/{video => i2c}/upd64031a.c | 0
+ drivers/media/{video => i2c}/upd64083.c | 0
+ drivers/media/{video => i2c}/vp27smpx.c | 0
+ drivers/media/{video => i2c}/vpx3220.c | 0
+ drivers/media/{video => i2c}/vs6624.c | 0
+ drivers/media/{video => i2c}/vs6624_regs.h | 0
+ drivers/media/{video => i2c}/wm8739.c | 0
+ drivers/media/{video => i2c}/wm8775.c | 0
+ drivers/media/media-device.c | 4 +-
+ drivers/media/mmc/Kconfig | 2 +
+ drivers/media/mmc/Makefile | 1 +
+ drivers/media/mmc/siano/Kconfig | 10 +
+ drivers/media/mmc/siano/Makefile | 6 +
+ drivers/media/{dvb => mmc}/siano/smssdio.c | 0
+ drivers/media/parport/Kconfig | 52 +
+ drivers/media/parport/Makefile | 4 +
+ drivers/media/{video => parport}/bw-qcam.c | 0
+ drivers/media/{video => parport}/c-qcam.c | 0
+ drivers/media/{video => parport}/pms.c | 0
+ drivers/media/{video => parport}/w9966.c | 0
+ drivers/media/pci/Kconfig | 47 +
+ drivers/media/pci/Makefile | 26 +
+ drivers/media/pci/b2c2/Kconfig | 15 +
+ drivers/media/pci/b2c2/Makefile | 9 +
+ drivers/media/{dvb => pci}/b2c2/flexcop-dma.c | 0
+ drivers/media/{dvb => pci}/b2c2/flexcop-pci.c | 0
+ drivers/media/pci/bt8xx/Kconfig | 43 +
+ drivers/media/pci/bt8xx/Makefile | 11 +
+ drivers/media/{video => pci}/bt8xx/bt848.h | 0
+ drivers/media/{dvb => pci}/bt8xx/bt878.c | 0
+ drivers/media/{dvb => pci}/bt8xx/bt878.h | 0
+ .../media/{video => pci}/bt8xx/bttv-audio-hook.c | 0
+ .../media/{video => pci}/bt8xx/bttv-audio-hook.h | 0
+ drivers/media/{video => pci}/bt8xx/bttv-cards.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-driver.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-gpio.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-i2c.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-if.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-input.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-risc.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv-vbi.c | 0
+ drivers/media/{video => pci}/bt8xx/bttv.h | 0
+ drivers/media/{video => pci}/bt8xx/bttvp.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dst.c | 0
+ drivers/media/{dvb => pci}/bt8xx/dst_ca.c | 3 +-
+ drivers/media/{dvb => pci}/bt8xx/dst_ca.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dst_common.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dst_priv.h | 0
+ drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c | 0
+ drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h | 0
+ drivers/media/{video => pci}/cx18/Kconfig | 10 +-
+ drivers/media/{video => pci}/cx18/Makefile | 6 +-
+ drivers/media/{video => pci}/cx18/cx18-alsa-main.c | 0
+ .../media/{video => pci}/cx18/cx18-alsa-mixer.c | 0
+ .../media/{video => pci}/cx18/cx18-alsa-mixer.h | 0
+ drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c | 0
+ drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h | 0
+ drivers/media/{video => pci}/cx18/cx18-alsa.h | 0
+ drivers/media/{video => pci}/cx18/cx18-audio.c | 0
+ drivers/media/{video => pci}/cx18/cx18-audio.h | 0
+ drivers/media/{video => pci}/cx18/cx18-av-audio.c | 0
+ drivers/media/{video => pci}/cx18/cx18-av-core.c | 0
+ drivers/media/{video => pci}/cx18/cx18-av-core.h | 0
+ .../media/{video => pci}/cx18/cx18-av-firmware.c | 2 +
+ drivers/media/{video => pci}/cx18/cx18-av-vbi.c | 0
+ drivers/media/{video => pci}/cx18/cx18-cards.c | 0
+ drivers/media/{video => pci}/cx18/cx18-cards.h | 0
+ drivers/media/{video => pci}/cx18/cx18-controls.c | 0
+ drivers/media/{video => pci}/cx18/cx18-controls.h | 0
+ drivers/media/{video => pci}/cx18/cx18-driver.c | 1 +
+ drivers/media/{video => pci}/cx18/cx18-driver.h | 0
+ drivers/media/{video => pci}/cx18/cx18-dvb.c | 6 +-
+ drivers/media/{video => pci}/cx18/cx18-dvb.h | 0
+ drivers/media/{video => pci}/cx18/cx18-fileops.c | 0
+ drivers/media/{video => pci}/cx18/cx18-fileops.h | 0
+ drivers/media/{video => pci}/cx18/cx18-firmware.c | 10 +-
+ drivers/media/{video => pci}/cx18/cx18-firmware.h | 0
+ drivers/media/{video => pci}/cx18/cx18-gpio.c | 0
+ drivers/media/{video => pci}/cx18/cx18-gpio.h | 0
+ drivers/media/{video => pci}/cx18/cx18-i2c.c | 0
+ drivers/media/{video => pci}/cx18/cx18-i2c.h | 0
+ drivers/media/{video => pci}/cx18/cx18-io.c | 0
+ drivers/media/{video => pci}/cx18/cx18-io.h | 0
+ drivers/media/{video => pci}/cx18/cx18-ioctl.c | 0
+ drivers/media/{video => pci}/cx18/cx18-ioctl.h | 0
+ drivers/media/{video => pci}/cx18/cx18-irq.c | 0
+ drivers/media/{video => pci}/cx18/cx18-irq.h | 0
+ drivers/media/{video => pci}/cx18/cx18-mailbox.c | 0
+ drivers/media/{video => pci}/cx18/cx18-mailbox.h | 0
+ drivers/media/{video => pci}/cx18/cx18-queue.c | 0
+ drivers/media/{video => pci}/cx18/cx18-queue.h | 0
+ drivers/media/{video => pci}/cx18/cx18-scb.c | 0
+ drivers/media/{video => pci}/cx18/cx18-scb.h | 0
+ drivers/media/{video => pci}/cx18/cx18-streams.c | 0
+ drivers/media/{video => pci}/cx18/cx18-streams.h | 0
+ drivers/media/{video => pci}/cx18/cx18-vbi.c | 0
+ drivers/media/{video => pci}/cx18/cx18-vbi.h | 0
+ drivers/media/{video => pci}/cx18/cx18-version.h | 0
+ drivers/media/{video => pci}/cx18/cx18-video.c | 0
+ drivers/media/{video => pci}/cx18/cx18-video.h | 0
+ drivers/media/{video => pci}/cx18/cx23418.h | 0
+ drivers/media/pci/cx23885/Kconfig | 46 +
+ drivers/media/{video => pci}/cx23885/Makefile | 8 +-
+ drivers/media/{video => pci}/cx23885/altera-ci.c | 0
+ drivers/media/{video => pci}/cx23885/altera-ci.h | 0
+ drivers/media/{video => pci}/cx23885/cimax2.c | 0
+ drivers/media/{video => pci}/cx23885/cimax2.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-417.c | 2 +
+ .../media/{video => pci}/cx23885/cx23885-alsa.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-av.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-av.h | 0
+ .../media/{video => pci}/cx23885/cx23885-cards.c | 6 +-
+ .../media/{video => pci}/cx23885/cx23885-core.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-dvb.c | 3 +-
+ .../media/{video => pci}/cx23885/cx23885-f300.c | 0
+ .../media/{video => pci}/cx23885/cx23885-f300.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-i2c.c | 0
+ .../media/{video => pci}/cx23885/cx23885-input.c | 9 +
+ .../media/{video => pci}/cx23885/cx23885-input.h | 0
+ .../media/{video => pci}/cx23885/cx23885-ioctl.c | 0
+ .../media/{video => pci}/cx23885/cx23885-ioctl.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-ir.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885-ir.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-reg.h | 0
+ drivers/media/{video => pci}/cx23885/cx23885-vbi.c | 0
+ .../media/{video => pci}/cx23885/cx23885-video.c | 0
+ drivers/media/{video => pci}/cx23885/cx23885.h | 0
+ drivers/media/{video => pci}/cx23885/cx23888-ir.c | 0
+ drivers/media/{video => pci}/cx23885/cx23888-ir.h | 0
+ .../media/{video => pci}/cx23885/netup-eeprom.c | 0
+ .../media/{video => pci}/cx23885/netup-eeprom.h | 0
+ drivers/media/{video => pci}/cx23885/netup-init.c | 0
+ drivers/media/{video => pci}/cx23885/netup-init.h | 0
+ drivers/media/{video => pci}/cx25821/Kconfig | 0
+ drivers/media/{video => pci}/cx25821/Makefile | 8 +-
+ .../media/{video => pci}/cx25821/cx25821-alsa.c | 0
+ .../cx25821/cx25821-audio-upstream.c | 0
+ .../cx25821/cx25821-audio-upstream.h | 0
+ .../media/{video => pci}/cx25821/cx25821-audio.h | 0
+ .../{video => pci}/cx25821/cx25821-biffuncs.h | 0
+ .../media/{video => pci}/cx25821/cx25821-cards.c | 0
+ .../media/{video => pci}/cx25821/cx25821-core.c | 0
+ .../media/{video => pci}/cx25821/cx25821-gpio.c | 0
+ drivers/media/{video => pci}/cx25821/cx25821-i2c.c | 0
+ .../cx25821/cx25821-medusa-defines.h | 0
+ .../{video => pci}/cx25821/cx25821-medusa-reg.h | 0
+ .../{video => pci}/cx25821/cx25821-medusa-video.c | 0
+ .../{video => pci}/cx25821/cx25821-medusa-video.h | 0
+ drivers/media/{video => pci}/cx25821/cx25821-reg.h | 0
+ .../media/{video => pci}/cx25821/cx25821-sram.h | 0
+ .../cx25821/cx25821-video-upstream-ch2.c | 0
+ .../cx25821/cx25821-video-upstream-ch2.h | 0
+ .../cx25821/cx25821-video-upstream.c | 0
+ .../cx25821/cx25821-video-upstream.h | 0
+ .../media/{video => pci}/cx25821/cx25821-video.c | 0
+ .../media/{video => pci}/cx25821/cx25821-video.h | 0
+ drivers/media/{video => pci}/cx25821/cx25821.h | 0
+ drivers/media/{video => pci}/cx88/Kconfig | 36 +-
+ drivers/media/{video => pci}/cx88/Makefile | 8 +-
+ drivers/media/{video => pci}/cx88/cx88-alsa.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-blackbird.c | 0
+ drivers/media/{video => pci}/cx88/cx88-cards.c | 0
+ drivers/media/{video => pci}/cx88/cx88-core.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-dsp.c | 0
+ drivers/media/{video => pci}/cx88/cx88-dvb.c | 2 +-
+ drivers/media/{video => pci}/cx88/cx88-i2c.c | 0
+ drivers/media/{video => pci}/cx88/cx88-input.c | 0
+ drivers/media/{video => pci}/cx88/cx88-mpeg.c | 0
+ drivers/media/{video => pci}/cx88/cx88-reg.h | 0
+ drivers/media/{video => pci}/cx88/cx88-tvaudio.c | 0
+ drivers/media/{video => pci}/cx88/cx88-vbi.c | 0
+ drivers/media/{video => pci}/cx88/cx88-video.c | 0
+ .../media/{video => pci}/cx88/cx88-vp3054-i2c.c | 0
+ .../media/{video => pci}/cx88/cx88-vp3054-i2c.h | 0
+ drivers/media/{video => pci}/cx88/cx88.h | 2 +-
+ drivers/media/{dvb => pci}/ddbridge/Kconfig | 10 +-
+ drivers/media/{dvb => pci}/ddbridge/Makefile | 6 +-
+ .../media/{dvb => pci}/ddbridge/ddbridge-core.c | 0
+ .../media/{dvb => pci}/ddbridge/ddbridge-regs.h | 0
+ drivers/media/{dvb => pci}/ddbridge/ddbridge.h | 0
+ drivers/media/{dvb => pci}/dm1105/Kconfig | 14 +-
+ drivers/media/pci/dm1105/Makefile | 3 +
+ drivers/media/{dvb => pci}/dm1105/dm1105.c | 0
+ drivers/media/{video => pci}/ivtv/Kconfig | 0
+ drivers/media/{video => pci}/ivtv/Makefile | 8 +-
+ drivers/media/{video => pci}/ivtv/ivtv-cards.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-cards.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-controls.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-controls.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-driver.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-driver.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-fileops.c | 52 +-
+ drivers/media/{video => pci}/ivtv/ivtv-fileops.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-firmware.c | 4 +
+ drivers/media/{video => pci}/ivtv/ivtv-firmware.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-gpio.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-gpio.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-i2c.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-i2c.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-ioctl.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-ioctl.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-irq.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-irq.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-mailbox.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-mailbox.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-queue.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-queue.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-routing.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-routing.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-streams.c | 4 -
+ drivers/media/{video => pci}/ivtv/ivtv-streams.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-udma.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-udma.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-vbi.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-vbi.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-version.h | 0
+ drivers/media/{video => pci}/ivtv/ivtv-yuv.c | 0
+ drivers/media/{video => pci}/ivtv/ivtv-yuv.h | 0
+ drivers/media/{video => pci}/ivtv/ivtvfb.c | 0
+ drivers/media/{dvb => pci}/mantis/Kconfig | 20 +-
+ drivers/media/{dvb => pci}/mantis/Makefile | 2 +-
+ drivers/media/{dvb => pci}/mantis/hopper_cards.c | 0
+ drivers/media/{dvb => pci}/mantis/hopper_vp3028.c | 0
+ drivers/media/{dvb => pci}/mantis/hopper_vp3028.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ca.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ca.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_cards.c | 2 +-
+ drivers/media/{dvb => pci}/mantis/mantis_common.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_core.c | 2 +-
+ drivers/media/{dvb => pci}/mantis/mantis_core.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_dma.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_dma.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_dvb.c | 6 +-
+ drivers/media/{dvb => pci}/mantis/mantis_dvb.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_evm.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_hif.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_hif.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_i2c.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_i2c.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_input.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ioc.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_ioc.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_link.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_pci.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_pci.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_reg.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_uart.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_uart.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1033.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1033.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1034.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1034.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1041.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp1041.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2033.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2033.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2040.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp2040.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3028.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3028.h | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3030.c | 0
+ drivers/media/{dvb => pci}/mantis/mantis_vp3030.h | 0
+ drivers/media/pci/meye/Kconfig | 13 +
+ drivers/media/pci/meye/Makefile | 1 +
+ drivers/media/{video => pci/meye}/meye.c | 0
+ drivers/media/{video => pci/meye}/meye.h | 0
+ drivers/media/pci/ngene/Kconfig | 13 +
+ drivers/media/{dvb => pci}/ngene/Makefile | 6 +-
+ drivers/media/{dvb => pci}/ngene/ngene-cards.c | 263 ++
+ drivers/media/{dvb => pci}/ngene/ngene-core.c | 14 +-
+ drivers/media/{dvb => pci}/ngene/ngene-dvb.c | 0
+ drivers/media/{dvb => pci}/ngene/ngene-i2c.c | 0
+ drivers/media/{dvb => pci}/ngene/ngene.h | 0
+ drivers/media/{dvb => pci}/pluto2/Kconfig | 0
+ drivers/media/pci/pluto2/Makefile | 3 +
+ drivers/media/{dvb => pci}/pluto2/pluto2.c | 0
+ drivers/media/{dvb => pci}/pt1/Kconfig | 0
+ drivers/media/{dvb => pci}/pt1/Makefile | 2 +-
+ drivers/media/{dvb => pci}/pt1/pt1.c | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c | 0
+ drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h | 0
+ drivers/media/{video => pci}/saa7134/Kconfig | 40 +-
+ drivers/media/{video => pci}/saa7134/Makefile | 10 +-
+ drivers/media/{video => pci}/saa7134/saa6752hs.c | 0
+ .../media/{video => pci}/saa7134/saa7134-alsa.c | 0
+ .../media/{video => pci}/saa7134/saa7134-cards.c | 0
+ .../media/{video => pci}/saa7134/saa7134-core.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134-dvb.c | 4 +-
+ .../media/{video => pci}/saa7134/saa7134-empress.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134-i2c.c | 0
+ .../media/{video => pci}/saa7134/saa7134-input.c | 10 +-
+ drivers/media/{video => pci}/saa7134/saa7134-reg.h | 0
+ drivers/media/{video => pci}/saa7134/saa7134-ts.c | 0
+ .../media/{video => pci}/saa7134/saa7134-tvaudio.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134-vbi.c | 0
+ .../media/{video => pci}/saa7134/saa7134-video.c | 0
+ drivers/media/{video => pci}/saa7134/saa7134.h | 1 -
+ drivers/media/pci/saa7146/Kconfig | 38 +
+ drivers/media/pci/saa7146/Makefile | 5 +
+ .../media/{video => pci/saa7146}/hexium_gemini.c | 0
+ .../media/{video => pci/saa7146}/hexium_orion.c | 0
+ drivers/media/{video => pci/saa7146}/mxb.c | 0
+ drivers/media/{video => pci}/saa7164/Kconfig | 8 +-
+ drivers/media/{video => pci}/saa7164/Makefile | 8 +-
+ drivers/media/{video => pci}/saa7164/saa7164-api.c | 15 +-
+ .../media/{video => pci}/saa7164/saa7164-buffer.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-bus.c | 0
+ .../media/{video => pci}/saa7164/saa7164-cards.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-cmd.c | 0
+ .../media/{video => pci}/saa7164/saa7164-core.c | 46 +-
+ drivers/media/{video => pci}/saa7164/saa7164-dvb.c | 0
+ .../media/{video => pci}/saa7164/saa7164-encoder.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-fw.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-i2c.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164-reg.h | 0
+ .../media/{video => pci}/saa7164/saa7164-types.h | 0
+ drivers/media/{video => pci}/saa7164/saa7164-vbi.c | 0
+ drivers/media/{video => pci}/saa7164/saa7164.h | 1 -
+ drivers/media/pci/sta2x11/Kconfig | 12 +
+ drivers/media/pci/sta2x11/Makefile | 1 +
+ drivers/media/{video => pci/sta2x11}/sta2x11_vip.c | 0
+ drivers/media/{video => pci/sta2x11}/sta2x11_vip.h | 0
+ drivers/media/{dvb => pci}/ttpci/Kconfig | 84 +-
+ drivers/media/{dvb => pci}/ttpci/Makefile | 4 +-
+ drivers/media/{dvb => pci}/ttpci/av7110.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_av.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_av.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ca.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ca.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_hw.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_hw.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ipack.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ipack.h | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_ir.c | 0
+ drivers/media/{dvb => pci}/ttpci/av7110_v4l.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-av.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-ci.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-core.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget-patch.c | 0
+ drivers/media/{dvb => pci}/ttpci/budget.c | 60 +
+ drivers/media/{dvb => pci}/ttpci/budget.h | 0
+ drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c | 0
+ drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h | 0
+ drivers/media/{video => pci}/zoran/Kconfig | 26 +-
+ drivers/media/{video => pci}/zoran/Makefile | 0
+ drivers/media/{video => pci}/zoran/videocodec.c | 0
+ drivers/media/{video => pci}/zoran/videocodec.h | 0
+ drivers/media/{video => pci}/zoran/zoran.h | 0
+ drivers/media/{video => pci}/zoran/zoran_card.c | 0
+ drivers/media/{video => pci}/zoran/zoran_card.h | 0
+ drivers/media/{video => pci}/zoran/zoran_device.c | 0
+ drivers/media/{video => pci}/zoran/zoran_device.h | 0
+ drivers/media/{video => pci}/zoran/zoran_driver.c | 0
+ drivers/media/{video => pci}/zoran/zoran_procfs.c | 0
+ drivers/media/{video => pci}/zoran/zoran_procfs.h | 0
+ drivers/media/{video => pci}/zoran/zr36016.c | 0
+ drivers/media/{video => pci}/zoran/zr36016.h | 0
+ drivers/media/{video => pci}/zoran/zr36050.c | 0
+ drivers/media/{video => pci}/zoran/zr36050.h | 0
+ drivers/media/{video => pci}/zoran/zr36057.h | 0
+ drivers/media/{video => pci}/zoran/zr36060.c | 0
+ drivers/media/{video => pci}/zoran/zr36060.h | 0
+ drivers/media/platform/Kconfig | 214 +
+ drivers/media/platform/Makefile | 49 +
+ drivers/media/{video => platform}/arv.c | 0
+ drivers/media/{video => platform}/blackfin/Kconfig | 0
+ .../media/{video => platform}/blackfin/Makefile | 0
+ .../{video => platform}/blackfin/bfin_capture.c | 17 +-
+ drivers/media/{video => platform}/blackfin/ppi.c | 0
+ drivers/media/platform/coda.c | 1849 +++++++++
+ drivers/media/platform/coda.h | 216 +
+ drivers/media/{video => platform}/davinci/Kconfig | 4 +-
+ drivers/media/{video => platform}/davinci/Makefile | 0
+ .../{video => platform}/davinci/ccdc_hw_device.h | 0
+ .../media/{video => platform}/davinci/dm355_ccdc.c | 2 +-
+ .../{video => platform}/davinci/dm355_ccdc_regs.h | 0
+ .../{video => platform}/davinci/dm644x_ccdc.c | 2 +-
+ .../{video => platform}/davinci/dm644x_ccdc_regs.h | 0
+ drivers/media/{video => platform}/davinci/isif.c | 2 +-
+ .../media/{video => platform}/davinci/isif_regs.h | 0
+ drivers/media/{video => platform}/davinci/vpbe.c | 0
+ .../{video => platform}/davinci/vpbe_display.c | 22 +-
+ .../media/{video => platform}/davinci/vpbe_osd.c | 0
+ .../{video => platform}/davinci/vpbe_osd_regs.h | 0
+ .../media/{video => platform}/davinci/vpbe_venc.c | 0
+ .../{video => platform}/davinci/vpbe_venc_regs.h | 0
+ .../{video => platform}/davinci/vpfe_capture.c | 2 +-
+ drivers/media/{video => platform}/davinci/vpif.c | 2 +-
+ drivers/media/{video => platform}/davinci/vpif.h | 0
+ .../{video => platform}/davinci/vpif_capture.c | 28 +-
+ .../{video => platform}/davinci/vpif_capture.h | 0
+ .../{video => platform}/davinci/vpif_display.c | 34 +-
+ .../{video => platform}/davinci/vpif_display.h | 0
+ drivers/media/{video => platform}/davinci/vpss.c | 2 +-
+ drivers/media/{video => platform}/fsl-viu.c | 27 +-
+ drivers/media/{video => platform}/indycam.c | 0
+ drivers/media/{video => platform}/indycam.h | 0
+ drivers/media/platform/m2m-deinterlace.c | 1120 ++++++
+ .../media/{video => platform}/marvell-ccic/Kconfig | 0
+ .../{video => platform}/marvell-ccic/Makefile | 0
+ .../{video => platform}/marvell-ccic/cafe-driver.c | 0
+ .../{video => platform}/marvell-ccic/mcam-core.c | 0
+ .../{video => platform}/marvell-ccic/mcam-core.h | 0
+ .../{video => platform}/marvell-ccic/mmp-driver.c | 0
+ .../media/{video => platform}/mem2mem_testdev.c | 36 +-
+ drivers/media/{video => platform}/mx2_emmaprp.c | 76 +-
+ drivers/media/{video => platform}/omap/Kconfig | 0
+ drivers/media/{video => platform}/omap/Makefile | 2 +-
+ drivers/media/{video => platform}/omap/omap_vout.c | 0
+ .../{video => platform}/omap/omap_vout_vrfb.c | 0
+ .../{video => platform}/omap/omap_vout_vrfb.h | 0
+ .../media/{video => platform}/omap/omap_voutdef.h | 0
+ .../media/{video => platform}/omap/omap_voutlib.c | 0
+ .../media/{video => platform}/omap/omap_voutlib.h | 0
+ .../media/{video => platform}/omap24xxcam-dma.c | 2 +-
+ drivers/media/{video => platform}/omap24xxcam.c | 2 +-
+ drivers/media/{video => platform}/omap24xxcam.h | 2 +-
+ .../media/{video => platform}/omap3isp/Makefile | 0
+ .../{video => platform}/omap3isp/cfa_coef_table.h | 16 +-
+ .../{video => platform}/omap3isp/gamma_table.h | 0
+ drivers/media/{video => platform}/omap3isp/isp.c | 51 +-
+ drivers/media/{video => platform}/omap3isp/isp.h | 11 +-
+ .../media/{video => platform}/omap3isp/ispccdc.c | 234 +-
+ .../media/{video => platform}/omap3isp/ispccdc.h | 37 -
+ .../media/{video => platform}/omap3isp/ispccp2.c | 0
+ .../media/{video => platform}/omap3isp/ispccp2.h | 0
+ .../media/{video => platform}/omap3isp/ispcsi2.c | 27 +-
+ .../media/{video => platform}/omap3isp/ispcsi2.h | 0
+ .../media/{video => platform}/omap3isp/ispcsiphy.c | 0
+ .../media/{video => platform}/omap3isp/ispcsiphy.h | 0
+ .../media/{video => platform}/omap3isp/isph3a.h | 0
+ .../{video => platform}/omap3isp/isph3a_aewb.c | 10 +-
+ .../media/{video => platform}/omap3isp/isph3a_af.c | 10 +-
+ .../media/{video => platform}/omap3isp/isphist.c | 6 +-
+ .../media/{video => platform}/omap3isp/isphist.h | 0
+ .../{video => platform}/omap3isp/isppreview.c | 707 ++--
+ .../{video => platform}/omap3isp/isppreview.h | 1 +
+ .../media/{video => platform}/omap3isp/ispqueue.c | 15 +-
+ .../media/{video => platform}/omap3isp/ispqueue.h | 0
+ .../media/{video => platform}/omap3isp/ispreg.h | 0
+ .../{video => platform}/omap3isp/ispresizer.c | 8 +-
+ .../{video => platform}/omap3isp/ispresizer.h | 0
+ .../media/{video => platform}/omap3isp/ispstat.c | 0
+ .../media/{video => platform}/omap3isp/ispstat.h | 0
+ .../media/{video => platform}/omap3isp/ispvideo.c | 57 +-
+ .../media/{video => platform}/omap3isp/ispvideo.h | 6 +-
+ .../omap3isp/luma_enhance_table.h | 0
+ .../omap3isp/noise_filter_table.h | 0
+ drivers/media/{video => platform}/s5p-fimc/Kconfig | 0
+ .../media/{video => platform}/s5p-fimc/Makefile | 0
+ .../{video => platform}/s5p-fimc/fimc-capture.c | 0
+ .../media/{video => platform}/s5p-fimc/fimc-core.c | 0
+ .../media/{video => platform}/s5p-fimc/fimc-core.h | 0
+ .../{video => platform}/s5p-fimc/fimc-lite-reg.c | 0
+ .../{video => platform}/s5p-fimc/fimc-lite-reg.h | 0
+ .../media/{video => platform}/s5p-fimc/fimc-lite.c | 0
+ .../media/{video => platform}/s5p-fimc/fimc-lite.h | 0
+ .../media/{video => platform}/s5p-fimc/fimc-m2m.c | 0
+ .../{video => platform}/s5p-fimc/fimc-mdevice.c | 0
+ .../{video => platform}/s5p-fimc/fimc-mdevice.h | 0
+ .../media/{video => platform}/s5p-fimc/fimc-reg.c | 0
+ .../media/{video => platform}/s5p-fimc/fimc-reg.h | 0
+ .../media/{video => platform}/s5p-fimc/mipi-csis.c | 0
+ .../media/{video => platform}/s5p-fimc/mipi-csis.h | 0
+ drivers/media/{video => platform}/s5p-g2d/Makefile | 0
+ drivers/media/{video => platform}/s5p-g2d/g2d-hw.c | 0
+ .../media/{video => platform}/s5p-g2d/g2d-regs.h | 0
+ drivers/media/{video => platform}/s5p-g2d/g2d.c | 27 +-
+ drivers/media/{video => platform}/s5p-g2d/g2d.h | 0
+ .../media/{video => platform}/s5p-jpeg/Makefile | 0
+ .../media/{video => platform}/s5p-jpeg/jpeg-core.c | 36 +-
+ .../media/{video => platform}/s5p-jpeg/jpeg-core.h | 2 +-
+ .../media/{video => platform}/s5p-jpeg/jpeg-hw.h | 2 +-
+ .../media/{video => platform}/s5p-jpeg/jpeg-regs.h | 2 +-
+ drivers/media/{video => platform}/s5p-mfc/Makefile | 0
+ .../media/{video => platform}/s5p-mfc/regs-mfc.h | 0
+ .../media/{video => platform}/s5p-mfc/s5p_mfc.c | 19 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_cmd.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_cmd.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_common.h | 0
+ .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_debug.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_dec.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_dec.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_enc.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_enc.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_intr.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_intr.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_opr.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_opr.h | 2 +-
+ .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.c | 2 +-
+ .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.h | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_shm.c | 2 +-
+ .../{video => platform}/s5p-mfc/s5p_mfc_shm.h | 2 +-
+ drivers/media/{video => platform}/s5p-tv/Kconfig | 2 +-
+ drivers/media/{video => platform}/s5p-tv/Makefile | 2 +-
+ .../media/{video => platform}/s5p-tv/hdmi_drv.c | 6 +-
+ .../media/{video => platform}/s5p-tv/hdmiphy_drv.c | 0
+ drivers/media/{video => platform}/s5p-tv/mixer.h | 0
+ .../media/{video => platform}/s5p-tv/mixer_drv.c | 6 +-
+ .../{video => platform}/s5p-tv/mixer_grp_layer.c | 0
+ .../media/{video => platform}/s5p-tv/mixer_reg.c | 0
+ .../media/{video => platform}/s5p-tv/mixer_video.c | 33 +-
+ .../{video => platform}/s5p-tv/mixer_vp_layer.c | 0
+ .../media/{video => platform}/s5p-tv/regs-hdmi.h | 0
+ .../media/{video => platform}/s5p-tv/regs-mixer.h | 0
+ .../media/{video => platform}/s5p-tv/regs-sdo.h | 2 +-
+ drivers/media/{video => platform}/s5p-tv/regs-vp.h | 0
+ drivers/media/{video => platform}/s5p-tv/sdo_drv.c | 10 +-
+ .../media/{video => platform}/s5p-tv/sii9234_drv.c | 17 +-
+ drivers/media/{video => platform}/sh_vou.c | 25 +-
+ drivers/media/platform/soc_camera/Kconfig | 87 +
+ drivers/media/platform/soc_camera/Makefile | 14 +
+ .../{video => platform/soc_camera}/atmel-isi.c | 0
+ .../{video => platform/soc_camera}/mx1_camera.c | 0
+ .../{video => platform/soc_camera}/mx2_camera.c | 40 +
+ .../{video => platform/soc_camera}/mx3_camera.c | 4 +-
+ .../{video => platform/soc_camera}/omap1_camera.c | 2 +-
+ .../{video => platform/soc_camera}/pxa_camera.c | 0
+ .../soc_camera}/sh_mobile_ceu_camera.c | 0
+ .../soc_camera}/sh_mobile_csi2.c | 0
+ .../{video => platform/soc_camera}/soc_camera.c | 197 +-
+ .../soc_camera}/soc_camera_platform.c | 11 +-
+ .../{video => platform/soc_camera}/soc_mediabus.c | 0
+ drivers/media/{video => platform}/timblogiw.c | 0
+ drivers/media/{video => platform}/via-camera.c | 0
+ drivers/media/{video => platform}/via-camera.h | 0
+ drivers/media/{video => platform}/vino.c | 0
+ drivers/media/{video => platform}/vino.h | 0
+ drivers/media/{video => platform}/vivi.c | 48 +-
+ drivers/media/radio/radio-shark2.c | 13 +-
+ drivers/media/radio/radio-si4713.c | 7 +-
+ drivers/media/radio/radio-timb.c | 8 +-
+ drivers/media/radio/radio-wl1273.c | 23 +-
+ drivers/media/radio/wl128x/fmdrv_v4l2.c | 38 +-
+ drivers/media/rc/Kconfig | 31 +-
+ drivers/media/rc/Makefile | 2 +
+ drivers/media/rc/ati_remote.c | 11 +-
+ drivers/media/rc/fintek-cir.c | 11 +-
+ drivers/media/rc/iguanair.c | 220 +-
+ drivers/media/rc/ir-lirc-codec.c | 35 +-
+ drivers/media/rc/ir-nec-decoder.c | 4 +-
+ drivers/media/rc/ir-raw.c | 6 +-
+ drivers/media/rc/ir-rx51.c | 496 +++
+ drivers/media/rc/keymaps/rc-tt-1500.c | 2 +-
+ drivers/media/rc/mceusb.c | 28 +-
+ drivers/media/rc/rc-loopback.c | 12 -
+ drivers/media/rc/ttusbir.c | 407 ++
+ drivers/media/{common => }/tuners/Kconfig | 88 +-
+ drivers/media/{common => }/tuners/Makefile | 4 +-
+ drivers/media/{common => }/tuners/fc0011.c | 0
+ drivers/media/{common => }/tuners/fc0011.h | 0
+ drivers/media/{common => }/tuners/fc0012-priv.h | 0
+ drivers/media/{common => }/tuners/fc0012.c | 0
+ drivers/media/{common => }/tuners/fc0012.h | 0
+ drivers/media/{common => }/tuners/fc0013-priv.h | 0
+ drivers/media/{common => }/tuners/fc0013.c | 0
+ drivers/media/{common => }/tuners/fc0013.h | 0
+ drivers/media/{common => }/tuners/fc001x-common.h | 0
+ drivers/media/{common => }/tuners/max2165.c | 0
+ drivers/media/{common => }/tuners/max2165.h | 0
+ drivers/media/{common => }/tuners/max2165_priv.h | 0
+ drivers/media/{common => }/tuners/mc44s803.c | 0
+ drivers/media/{common => }/tuners/mc44s803.h | 0
+ drivers/media/{common => }/tuners/mc44s803_priv.h | 0
+ drivers/media/{common => }/tuners/mt2060.c | 0
+ drivers/media/{common => }/tuners/mt2060.h | 0
+ drivers/media/{common => }/tuners/mt2060_priv.h | 0
+ drivers/media/{common => }/tuners/mt2063.c | 0
+ drivers/media/{common => }/tuners/mt2063.h | 0
+ drivers/media/{common => }/tuners/mt20xx.c | 0
+ drivers/media/{common => }/tuners/mt20xx.h | 0
+ drivers/media/{common => }/tuners/mt2131.c | 0
+ drivers/media/{common => }/tuners/mt2131.h | 0
+ drivers/media/{common => }/tuners/mt2131_priv.h | 0
+ drivers/media/{common => }/tuners/mt2266.c | 0
+ drivers/media/{common => }/tuners/mt2266.h | 0
+ drivers/media/{common => }/tuners/mxl5005s.c | 0
+ drivers/media/{common => }/tuners/mxl5005s.h | 0
+ drivers/media/{common => }/tuners/mxl5007t.c | 0
+ drivers/media/{common => }/tuners/mxl5007t.h | 0
+ drivers/media/{common => }/tuners/qt1010.c | 2 +-
+ drivers/media/{common => }/tuners/qt1010.h | 0
+ drivers/media/{common => }/tuners/qt1010_priv.h | 0
+ drivers/media/{common => }/tuners/tda18212.c | 37 +-
+ drivers/media/{common => }/tuners/tda18212.h | 0
+ drivers/media/{common => }/tuners/tda18218.c | 2 +-
+ drivers/media/{common => }/tuners/tda18218.h | 0
+ drivers/media/{common => }/tuners/tda18218_priv.h | 0
+ .../media/{common => }/tuners/tda18271-common.c | 0
+ drivers/media/{common => }/tuners/tda18271-fe.c | 0
+ drivers/media/{common => }/tuners/tda18271-maps.c | 0
+ drivers/media/{common => }/tuners/tda18271-priv.h | 0
+ drivers/media/{common => }/tuners/tda18271.h | 0
+ drivers/media/{common => }/tuners/tda827x.c | 0
+ drivers/media/{common => }/tuners/tda827x.h | 0
+ drivers/media/{common => }/tuners/tda8290.c | 0
+ drivers/media/{common => }/tuners/tda8290.h | 0
+ drivers/media/{common => }/tuners/tda9887.c | 0
+ drivers/media/{common => }/tuners/tda9887.h | 0
+ drivers/media/{common => }/tuners/tea5761.c | 0
+ drivers/media/{common => }/tuners/tea5761.h | 0
+ drivers/media/{common => }/tuners/tea5767.c | 0
+ drivers/media/{common => }/tuners/tea5767.h | 0
+ drivers/media/{common => }/tuners/tua9001.c | 0
+ drivers/media/{common => }/tuners/tua9001.h | 0
+ drivers/media/{common => }/tuners/tua9001_priv.h | 0
+ drivers/media/{common => }/tuners/tuner-i2c.h | 0
+ drivers/media/{common => }/tuners/tuner-simple.c | 0
+ drivers/media/{common => }/tuners/tuner-simple.h | 0
+ drivers/media/{common => }/tuners/tuner-types.c | 0
+ .../media/{common => }/tuners/tuner-xc2028-types.h | 0
+ drivers/media/{common => }/tuners/tuner-xc2028.c | 7 +-
+ drivers/media/{common => }/tuners/tuner-xc2028.h | 0
+ drivers/media/{common => }/tuners/xc4000.c | 3 +-
+ drivers/media/{common => }/tuners/xc4000.h | 0
+ drivers/media/{common => }/tuners/xc5000.c | 161 +-
+ drivers/media/{common => }/tuners/xc5000.h | 0
+ drivers/media/usb/Kconfig | 54 +
+ drivers/media/usb/Makefile | 22 +
+ drivers/media/{video => usb}/au0828/Kconfig | 10 +-
+ drivers/media/{video => usb}/au0828/Makefile | 6 +-
+ drivers/media/{video => usb}/au0828/au0828-cards.c | 4 +-
+ drivers/media/{video => usb}/au0828/au0828-cards.h | 0
+ drivers/media/{video => usb}/au0828/au0828-core.c | 59 +-
+ drivers/media/{video => usb}/au0828/au0828-dvb.c | 54 +-
+ drivers/media/{video => usb}/au0828/au0828-i2c.c | 21 +-
+ drivers/media/{video => usb}/au0828/au0828-reg.h | 1 +
+ drivers/media/{video => usb}/au0828/au0828-vbi.c | 0
+ drivers/media/{video => usb}/au0828/au0828-video.c | 76 +-
+ drivers/media/{video => usb}/au0828/au0828.h | 2 +
+ drivers/media/usb/b2c2/Kconfig | 15 +
+ drivers/media/usb/b2c2/Makefile | 5 +
+ drivers/media/{dvb => usb}/b2c2/flexcop-usb.c | 5 +-
+ drivers/media/{dvb => usb}/b2c2/flexcop-usb.h | 0
+ drivers/media/{video => usb}/cpia2/Kconfig | 0
+ drivers/media/{video => usb}/cpia2/Makefile | 0
+ drivers/media/{video => usb}/cpia2/cpia2.h | 0
+ drivers/media/{video => usb}/cpia2/cpia2_core.c | 6 +-
+ .../media/{video => usb}/cpia2/cpia2_registers.h | 0
+ drivers/media/{video => usb}/cpia2/cpia2_usb.c | 0
+ drivers/media/{video => usb}/cpia2/cpia2_v4l.c | 39 +-
+ drivers/media/{video => usb}/cx231xx/Kconfig | 6 +-
+ drivers/media/{video => usb}/cx231xx/Makefile | 11 +-
+ drivers/media/{video => usb}/cx231xx/cx231xx-417.c | 2 +
+ .../media/{video => usb}/cx231xx/cx231xx-audio.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-avcore.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-cards.c | 0
+ .../{video => usb}/cx231xx/cx231xx-conf-reg.h | 0
+ .../media/{video => usb}/cx231xx/cx231xx-core.c | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-dif.h | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-input.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c | 0
+ .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-reg.h | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c | 0
+ drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h | 0
+ .../media/{video => usb}/cx231xx/cx231xx-video.c | 47 +-
+ drivers/media/{video => usb}/cx231xx/cx231xx.h | 0
+ drivers/media/usb/dvb-usb-v2/Kconfig | 146 +
+ drivers/media/usb/dvb-usb-v2/Makefile | 49 +
+ drivers/media/usb/dvb-usb-v2/af9015.c | 1435 +++++++
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h | 68 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c | 735 ++--
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h | 6 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c | 663 ++-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h | 9 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c | 116 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h | 13 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c | 410 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c | 182 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h | 36 +-
+ drivers/media/usb/dvb-usb-v2/cypress_firmware.c | 125 +
+ drivers/media/usb/dvb-usb-v2/cypress_firmware.h | 31 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb.h | 392 ++
+ drivers/media/usb/dvb-usb-v2/dvb_usb_common.h | 35 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1046 +++++
+ drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c | 77 +
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c | 321 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h | 26 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c | 130 +-
+ .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h | 5 +-
+ drivers/media/usb/dvb-usb-v2/it913x.c | 799 ++++
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c | 586 ++-
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h | 0
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h | 0
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c | 2 +
+ .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h | 0
+ drivers/media/usb/dvb-usb-v2/mxl111sf.c | 1431 +++++++
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h | 22 +-
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c | 594 +--
+ .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h | 26 +-
+ drivers/media/usb/dvb-usb-v2/usb_urb.c | 357 ++
+ drivers/media/usb/dvb-usb/Kconfig | 313 ++
+ drivers/media/usb/dvb-usb/Makefile | 83 +
+ drivers/media/{dvb => usb}/dvb-usb/a800.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005-script.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/af9005.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/az6027.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/az6027.h | 0
+ .../media/{dvb => usb}/dvb-usb/cinergyT2-core.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/cxusb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/cxusb.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dib0700.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c | 6 +-
+ .../media/{dvb => usb}/dvb-usb/dib0700_devices.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dib07x0.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dibusb.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/digitv.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/digitv.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtt200u.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtt200u.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtv5100.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dtv5100.h | 0
+ .../media/{dvb => usb}/dvb-usb/dvb-usb-common.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c | 1 -
+ .../media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c | 0
+ .../media/{dvb => usb}/dvb-usb/dvb-usb-remote.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h | 2 -
+ drivers/media/usb/dvb-usb/dvb_usb_dvb.c | 403 ++
+ drivers/media/usb/dvb-usb/dvb_usb_remote.c | 117 +
+ drivers/media/{dvb => usb}/dvb-usb/dw2102.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/dw2102.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/friio-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/friio.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/friio.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/gp8psk.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/gp8psk.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/m920x.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/m920x.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/opera1.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/pctv452e.c | 7 +-
+ .../media/{dvb => usb}/dvb-usb/technisat-usb2.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/ttusb2.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/ttusb2.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/umt-010.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/usb-urb.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp702x.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp702x.h | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp7045.c | 0
+ drivers/media/{dvb => usb}/dvb-usb/vp7045.h | 0
+ drivers/media/{video => usb}/em28xx/Kconfig | 28 +-
+ drivers/media/{video => usb}/em28xx/Makefile | 10 +-
+ drivers/media/{video => usb}/em28xx/em28xx-audio.c | 1 -
+ drivers/media/{video => usb}/em28xx/em28xx-cards.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-core.c | 4 -
+ drivers/media/{video => usb}/em28xx/em28xx-dvb.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-i2c.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-input.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-reg.h | 0
+ drivers/media/{video => usb}/em28xx/em28xx-vbi.c | 0
+ drivers/media/{video => usb}/em28xx/em28xx-video.c | 52 +-
+ drivers/media/{video => usb}/em28xx/em28xx.h | 0
+ drivers/media/{video => usb}/gspca/Kconfig | 6 +-
+ drivers/media/{video => usb}/gspca/Makefile | 0
+ .../{video => usb}/gspca/autogain_functions.c | 0
+ .../{video => usb}/gspca/autogain_functions.h | 0
+ drivers/media/{video => usb}/gspca/benq.c | 0
+ drivers/media/{video => usb}/gspca/conex.c | 0
+ drivers/media/{video => usb}/gspca/cpia1.c | 0
+ drivers/media/{video => usb}/gspca/etoms.c | 0
+ drivers/media/{video => usb}/gspca/finepix.c | 0
+ drivers/media/{video => usb}/gspca/gl860/Kconfig | 0
+ drivers/media/{video => usb}/gspca/gl860/Makefile | 2 +-
+ .../{video => usb}/gspca/gl860/gl860-mi1320.c | 0
+ .../{video => usb}/gspca/gl860/gl860-mi2020.c | 0
+ .../{video => usb}/gspca/gl860/gl860-ov2640.c | 0
+ .../{video => usb}/gspca/gl860/gl860-ov9655.c | 0
+ drivers/media/{video => usb}/gspca/gl860/gl860.c | 0
+ drivers/media/{video => usb}/gspca/gl860/gl860.h | 0
+ drivers/media/{video => usb}/gspca/gspca.c | 0
+ drivers/media/{video => usb}/gspca/gspca.h | 0
+ drivers/media/{video => usb}/gspca/jeilinj.c | 0
+ drivers/media/{video => usb}/gspca/jl2005bcd.c | 0
+ drivers/media/{video => usb}/gspca/jpeg.h | 0
+ drivers/media/{video => usb}/gspca/kinect.c | 0
+ drivers/media/{video => usb}/gspca/konica.c | 0
+ drivers/media/{video => usb}/gspca/m5602/Kconfig | 0
+ drivers/media/{video => usb}/gspca/m5602/Makefile | 2 +-
+ .../{video => usb}/gspca/m5602/m5602_bridge.h | 0
+ .../media/{video => usb}/gspca/m5602/m5602_core.c | 0
+ .../{video => usb}/gspca/m5602/m5602_mt9m111.c | 0
+ .../{video => usb}/gspca/m5602/m5602_mt9m111.h | 0
+ .../{video => usb}/gspca/m5602/m5602_ov7660.c | 0
+ .../{video => usb}/gspca/m5602/m5602_ov7660.h | 0
+ .../{video => usb}/gspca/m5602/m5602_ov9650.c | 0
+ .../{video => usb}/gspca/m5602/m5602_ov9650.h | 0
+ .../{video => usb}/gspca/m5602/m5602_po1030.c | 0
+ .../{video => usb}/gspca/m5602/m5602_po1030.h | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k4aa.c | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k4aa.h | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k83a.c | 0
+ .../{video => usb}/gspca/m5602/m5602_s5k83a.h | 0
+ .../{video => usb}/gspca/m5602/m5602_sensor.h | 0
+ drivers/media/{video => usb}/gspca/mars.c | 0
+ drivers/media/{video => usb}/gspca/mr97310a.c | 0
+ drivers/media/{video => usb}/gspca/nw80x.c | 0
+ drivers/media/{video => usb}/gspca/ov519.c | 0
+ drivers/media/{video => usb}/gspca/ov534.c | 0
+ drivers/media/{video => usb}/gspca/ov534_9.c | 0
+ drivers/media/{video => usb}/gspca/pac207.c | 0
+ drivers/media/{video => usb}/gspca/pac7302.c | 0
+ drivers/media/{video => usb}/gspca/pac7311.c | 0
+ drivers/media/{video => usb}/gspca/pac_common.h | 0
+ drivers/media/{video => usb}/gspca/se401.c | 0
+ drivers/media/{video => usb}/gspca/se401.h | 0
+ drivers/media/{video => usb}/gspca/sn9c2028.c | 0
+ drivers/media/{video => usb}/gspca/sn9c2028.h | 0
+ drivers/media/{video => usb}/gspca/sn9c20x.c | 0
+ drivers/media/{video => usb}/gspca/sonixb.c | 0
+ drivers/media/{video => usb}/gspca/sonixj.c | 0
+ drivers/media/{video => usb}/gspca/spca1528.c | 0
+ drivers/media/{video => usb}/gspca/spca500.c | 0
+ drivers/media/{video => usb}/gspca/spca501.c | 0
+ drivers/media/{video => usb}/gspca/spca505.c | 0
+ drivers/media/{video => usb}/gspca/spca506.c | 0
+ drivers/media/{video => usb}/gspca/spca508.c | 0
+ drivers/media/{video => usb}/gspca/spca561.c | 0
+ drivers/media/{video => usb}/gspca/sq905.c | 0
+ drivers/media/{video => usb}/gspca/sq905c.c | 7 +-
+ drivers/media/{video => usb}/gspca/sq930x.c | 10 +-
+ drivers/media/{video => usb}/gspca/stk014.c | 0
+ drivers/media/{video => usb}/gspca/stv0680.c | 0
+ drivers/media/{video => usb}/gspca/stv06xx/Kconfig | 0
+ .../media/{video => usb}/gspca/stv06xx/Makefile | 2 +-
+ .../media/{video => usb}/gspca/stv06xx/stv06xx.c | 0
+ .../media/{video => usb}/gspca/stv06xx/stv06xx.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_sensor.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_st6422.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_st6422.h | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.c | 0
+ .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.h | 0
+ drivers/media/{video => usb}/gspca/sunplus.c | 0
+ drivers/media/{video => usb}/gspca/t613.c | 0
+ drivers/media/{video => usb}/gspca/topro.c | 0
+ drivers/media/{video => usb}/gspca/tv8532.c | 0
+ drivers/media/{video => usb}/gspca/vc032x.c | 7 +-
+ drivers/media/{video => usb}/gspca/vicam.c | 0
+ drivers/media/{video => usb}/gspca/w996Xcf.c | 0
+ drivers/media/{video => usb}/gspca/xirlink_cit.c | 0
+ drivers/media/{video => usb}/gspca/zc3xx-reg.h | 0
+ drivers/media/{video => usb}/gspca/zc3xx.c | 0
+ drivers/media/{video => usb}/hdpvr/Kconfig | 0
+ drivers/media/{video => usb}/hdpvr/Makefile | 2 +-
+ drivers/media/{video => usb}/hdpvr/hdpvr-control.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr-core.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr-video.c | 0
+ drivers/media/{video => usb}/hdpvr/hdpvr.h | 0
+ drivers/media/{video => usb}/pvrusb2/Kconfig | 14 +-
+ drivers/media/{video => usb}/pvrusb2/Makefile | 8 +-
+ .../media/{video => usb}/pvrusb2/pvrusb2-audio.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-audio.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-context.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-context.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-debug.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-debugifc.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-debugifc.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-devattr.c | 17 +-
+ .../media/{video => usb}/pvrusb2/pvrusb2-devattr.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-encoder.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-encoder.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-hdw-internal.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-i2c-core.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-i2c-core.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ioread.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-ioread.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-main.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-util.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.h | 0
+ .../{video => usb}/pvrusb2/pvrusb2-video-v4l.c | 0
+ .../{video => usb}/pvrusb2/pvrusb2-video-v4l.h | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.c | 0
+ .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.h | 0
+ drivers/media/{video => usb}/pvrusb2/pvrusb2.h | 0
+ drivers/media/{video => usb}/pwc/Kconfig | 0
+ drivers/media/{video => usb}/pwc/Makefile | 2 +-
+ drivers/media/{video => usb}/pwc/philips.txt | 0
+ drivers/media/{video => usb}/pwc/pwc-ctrl.c | 0
+ drivers/media/{video => usb}/pwc/pwc-dec1.c | 0
+ drivers/media/{video => usb}/pwc/pwc-dec1.h | 0
+ drivers/media/{video => usb}/pwc/pwc-dec23.c | 0
+ drivers/media/{video => usb}/pwc/pwc-dec23.h | 0
+ drivers/media/{video => usb}/pwc/pwc-if.c | 0
+ drivers/media/{video => usb}/pwc/pwc-kiara.c | 0
+ drivers/media/{video => usb}/pwc/pwc-kiara.h | 0
+ drivers/media/{video => usb}/pwc/pwc-misc.c | 0
+ drivers/media/{video => usb}/pwc/pwc-nala.h | 0
+ drivers/media/{video => usb}/pwc/pwc-timon.c | 0
+ drivers/media/{video => usb}/pwc/pwc-timon.h | 0
+ drivers/media/{video => usb}/pwc/pwc-uncompress.c | 0
+ drivers/media/{video => usb}/pwc/pwc-v4l.c | 0
+ drivers/media/{video => usb}/pwc/pwc.h | 0
+ drivers/media/usb/s2255/Kconfig | 9 +
+ drivers/media/usb/s2255/Makefile | 2 +
+ drivers/media/{video => usb/s2255}/s2255drv.c | 43 +-
+ drivers/media/usb/siano/Kconfig | 10 +
+ drivers/media/usb/siano/Makefile | 6 +
+ drivers/media/{dvb => usb}/siano/smsusb.c | 0
+ drivers/media/{video => usb}/sn9c102/Kconfig | 0
+ drivers/media/{video => usb}/sn9c102/Makefile | 0
+ drivers/media/{video => usb}/sn9c102/sn9c102.h | 0
+ .../media/{video => usb}/sn9c102/sn9c102_config.h | 0
+ .../media/{video => usb}/sn9c102/sn9c102_core.c | 0
+ .../{video => usb}/sn9c102/sn9c102_devtable.h | 0
+ .../media/{video => usb}/sn9c102/sn9c102_hv7131d.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_hv7131r.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_mi0343.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_mi0360.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_mt9v111.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_ov7630.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_ov7660.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_pas106b.c | 0
+ .../{video => usb}/sn9c102/sn9c102_pas202bcb.c | 0
+ .../media/{video => usb}/sn9c102/sn9c102_sensor.h | 0
+ .../{video => usb}/sn9c102/sn9c102_tas5110c1b.c | 0
+ .../{video => usb}/sn9c102/sn9c102_tas5110d.c | 0
+ .../{video => usb}/sn9c102/sn9c102_tas5130d1b.c | 0
+ drivers/media/usb/stk1160/Kconfig | 20 +
+ drivers/media/usb/stk1160/Makefile | 11 +
+ drivers/media/usb/stk1160/stk1160-ac97.c | 152 +
+ drivers/media/usb/stk1160/stk1160-core.c | 432 ++
+ drivers/media/usb/stk1160/stk1160-i2c.c | 294 ++
+ drivers/media/usb/stk1160/stk1160-reg.h | 93 +
+ drivers/media/usb/stk1160/stk1160-v4l.c | 740 ++++
+ drivers/media/usb/stk1160/stk1160-video.c | 518 +++
+ drivers/media/usb/stk1160/stk1160.h | 208 +
+ drivers/media/usb/stkwebcam/Kconfig | 13 +
+ drivers/media/usb/stkwebcam/Makefile | 4 +
+ .../media/{video => usb/stkwebcam}/stk-sensor.c | 0
+ .../media/{video => usb/stkwebcam}/stk-webcam.c | 0
+ .../media/{video => usb/stkwebcam}/stk-webcam.h | 0
+ drivers/media/{video => usb}/tlg2300/Kconfig | 0
+ drivers/media/usb/tlg2300/Makefile | 9 +
+ drivers/media/{video => usb}/tlg2300/pd-alsa.c | 0
+ drivers/media/{video => usb}/tlg2300/pd-common.h | 0
+ drivers/media/{video => usb}/tlg2300/pd-dvb.c | 0
+ drivers/media/{video => usb}/tlg2300/pd-main.c | 0
+ drivers/media/{video => usb}/tlg2300/pd-radio.c | 0
+ drivers/media/{video => usb}/tlg2300/pd-video.c | 0
+ drivers/media/{video => usb}/tlg2300/vendorcmds.h | 0
+ drivers/media/{video => usb}/tm6000/Kconfig | 0
+ drivers/media/{video => usb}/tm6000/Makefile | 8 +-
+ drivers/media/{video => usb}/tm6000/tm6000-alsa.c | 3 +-
+ drivers/media/{video => usb}/tm6000/tm6000-cards.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-core.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-dvb.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-i2c.c | 0
+ drivers/media/{video => usb}/tm6000/tm6000-input.c | 3 +-
+ drivers/media/{video => usb}/tm6000/tm6000-regs.h | 0
+ drivers/media/{video => usb}/tm6000/tm6000-stds.c | 0
+ .../media/{video => usb}/tm6000/tm6000-usb-isoc.h | 0
+ drivers/media/{video => usb}/tm6000/tm6000-video.c | 52 +-
+ drivers/media/{video => usb}/tm6000/tm6000.h | 0
+ drivers/media/{dvb => usb}/ttusb-budget/Kconfig | 14 +-
+ drivers/media/usb/ttusb-budget/Makefile | 3 +
+ .../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c | 0
+ drivers/media/{dvb => usb}/ttusb-dec/Kconfig | 0
+ drivers/media/{dvb => usb}/ttusb-dec/Makefile | 2 +-
+ drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c | 0
+ drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c | 0
+ drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h | 0
+ drivers/media/{video => usb}/usbvision/Kconfig | 2 +-
+ drivers/media/{video => usb}/usbvision/Makefile | 4 +-
+ .../{video => usb}/usbvision/usbvision-cards.c | 0
+ .../{video => usb}/usbvision/usbvision-cards.h | 0
+ .../{video => usb}/usbvision/usbvision-core.c | 0
+ .../media/{video => usb}/usbvision/usbvision-i2c.c | 0
+ .../{video => usb}/usbvision/usbvision-video.c | 42 +-
+ drivers/media/{video => usb}/usbvision/usbvision.h | 0
+ drivers/media/{video => usb}/uvc/Kconfig | 0
+ drivers/media/{video => usb}/uvc/Makefile | 0
+ drivers/media/{video => usb}/uvc/uvc_ctrl.c | 0
+ drivers/media/{video => usb}/uvc/uvc_debugfs.c | 0
+ drivers/media/{video => usb}/uvc/uvc_driver.c | 28 +-
+ drivers/media/{video => usb}/uvc/uvc_entity.c | 0
+ drivers/media/{video => usb}/uvc/uvc_isight.c | 0
+ drivers/media/{video => usb}/uvc/uvc_queue.c | 0
+ drivers/media/{video => usb}/uvc/uvc_status.c | 0
+ drivers/media/{video => usb}/uvc/uvc_v4l2.c | 0
+ drivers/media/{video => usb}/uvc/uvc_video.c | 30 +-
+ drivers/media/{video => usb}/uvc/uvcvideo.h | 9 +
+ drivers/media/usb/zr364xx/Kconfig | 14 +
+ drivers/media/usb/zr364xx/Makefile | 2 +
+ drivers/media/{video => usb/zr364xx}/zr364xx.c | 0
+ drivers/media/v4l2-core/Kconfig | 81 +
+ drivers/media/v4l2-core/Makefile | 35 +
+ drivers/media/{video => v4l2-core}/tuner-core.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-common.c | 2 +-
+ .../{video => v4l2-core}/v4l2-compat-ioctl32.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-ctrls.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-dev.c | 51 +-
+ drivers/media/{video => v4l2-core}/v4l2-device.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-event.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-fh.c | 0
+ .../media/{video => v4l2-core}/v4l2-int-device.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-ioctl.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-mem2mem.c | 0
+ drivers/media/{video => v4l2-core}/v4l2-subdev.c | 0
+ drivers/media/{video => v4l2-core}/videobuf-core.c | 0
+ .../{video => v4l2-core}/videobuf-dma-contig.c | 0
+ .../media/{video => v4l2-core}/videobuf-dma-sg.c | 0
+ drivers/media/{video => v4l2-core}/videobuf-dvb.c | 11 +-
+ .../media/{video => v4l2-core}/videobuf-vmalloc.c | 0
+ .../media/{video => v4l2-core}/videobuf2-core.c | 21 +-
+ .../{video => v4l2-core}/videobuf2-dma-contig.c | 0
+ .../media/{video => v4l2-core}/videobuf2-dma-sg.c | 0
+ .../media/{video => v4l2-core}/videobuf2-memops.c | 0
+ .../media/{video => v4l2-core}/videobuf2-vmalloc.c | 1 +
+ drivers/media/video/Kconfig | 1263 ------
+ drivers/media/video/Makefile | 218 -
+ drivers/media/video/bt8xx/Kconfig | 27 -
+ drivers/media/video/bt8xx/Makefile | 13 -
+ drivers/media/video/cx23885/Kconfig | 46 -
+ drivers/media/video/tlg2300/Makefile | 9 -
+ drivers/staging/media/Kconfig | 2 -
+ drivers/staging/media/Makefile | 1 -
+ drivers/staging/media/as102/Makefile | 2 +-
+ drivers/staging/media/cxd2099/Makefile | 6 +-
+ drivers/staging/media/cxd2099/cxd2099.c | 13 +-
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 29 +-
+ drivers/staging/media/easycap/Kconfig | 30 -
+ drivers/staging/media/easycap/Makefile | 10 -
+ drivers/staging/media/easycap/README | 141 -
+ drivers/staging/media/easycap/easycap.h | 567 ---
+ drivers/staging/media/easycap/easycap_ioctl.c | 2443 -----------
+ drivers/staging/media/easycap/easycap_low.c | 968 -----
+ drivers/staging/media/easycap/easycap_main.c | 4239 --------------------
+ drivers/staging/media/easycap/easycap_settings.c | 696 ----
+ drivers/staging/media/easycap/easycap_sound.c | 750 ----
+ drivers/staging/media/easycap/easycap_testcard.c | 155 -
+ drivers/staging/media/go7007/Makefile | 6 +-
+ drivers/staging/media/lirc/Kconfig | 6 -
+ drivers/staging/media/lirc/Makefile | 1 -
+ drivers/staging/media/lirc/lirc_ene0100.h | 169 -
+ drivers/staging/media/lirc/lirc_igorplugusb.c | 4 +-
+ drivers/staging/media/lirc/lirc_ttusbir.c | 376 --
+ drivers/staging/media/lirc/lirc_zilog.c | 3 +-
+ include/linux/dvb/frontend.h | 51 +-
+ include/linux/dvb/version.h | 2 +-
+ include/linux/omap3isp.h | 6 +-
+ include/linux/v4l2-common.h | 8 +-
+ include/media/ir-rx51.h | 10 +
+ include/media/omap3isp.h | 14 +-
+ include/media/saa7146.h | 4 -
+ include/media/soc_camera.h | 12 +
+ include/media/v4l2-common.h | 4 +-
+ include/media/v4l2-dev.h | 3 -
+ include/media/v4l2-subdev.h | 2 +-
+ include/media/videobuf-dvb.h | 4 +-
+ 1575 files changed, 22416 insertions(+), 22885 deletions(-)
+ create mode 100644 arch/arm/plat-mxc/devices/platform-imx27-coda.c
+ create mode 100644 drivers/media/common/b2c2/Kconfig
+ create mode 100644 drivers/media/common/b2c2/Makefile
+ rename drivers/media/{dvb => common}/b2c2/flexcop-common.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-eeprom.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-fe-tuner.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-hw-filter.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-i2c.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-misc.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-reg.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop-sram.c (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop.c (99%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_be.h (100%)
+ rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_le.h (100%)
+ create mode 100644 drivers/media/common/saa7146/Kconfig
+ create mode 100644 drivers/media/common/saa7146/Makefile
+ rename drivers/media/common/{ => saa7146}/saa7146_core.c (98%)
+ rename drivers/media/common/{ => saa7146}/saa7146_fops.c (94%)
+ rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
+ rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
+ rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
+ rename drivers/media/common/{ => saa7146}/saa7146_video.c (100%)
+ create mode 100644 drivers/media/common/siano/Kconfig
+ rename drivers/media/{dvb => common}/siano/Makefile (57%)
+ rename drivers/media/{dvb => common}/siano/sms-cards.c (100%)
+ rename drivers/media/{dvb => common}/siano/sms-cards.h (100%)
+ rename drivers/media/{dvb => common}/siano/smscoreapi.c (100%)
+ rename drivers/media/{dvb => common}/siano/smscoreapi.h (100%)
+ rename drivers/media/{dvb => common}/siano/smsdvb.c (100%)
+ rename drivers/media/{dvb => common}/siano/smsendian.c (100%)
+ rename drivers/media/{dvb => common}/siano/smsendian.h (100%)
+ rename drivers/media/{dvb => common}/siano/smsir.c (100%)
+ rename drivers/media/{dvb => common}/siano/smsir.h (100%)
+ create mode 100644 drivers/media/dvb-core/Kconfig
+ rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
+ rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dmxdev.c (99%)
+ rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
+ rename drivers/media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (98%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (98%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (98%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvbdev.c (100%)
+ rename drivers/media/{dvb => }/dvb-core/dvbdev.h (80%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (83%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (92%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (93%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (98%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (95%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (93%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (96%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (97%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ec100_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (93%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (99%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
+ rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
+ delete mode 100644 drivers/media/dvb/Kconfig
+ delete mode 100644 drivers/media/dvb/Makefile
+ delete mode 100644 drivers/media/dvb/b2c2/Kconfig
+ delete mode 100644 drivers/media/dvb/b2c2/Makefile
+ delete mode 100644 drivers/media/dvb/bt8xx/Kconfig
+ delete mode 100644 drivers/media/dvb/bt8xx/Makefile
+ delete mode 100644 drivers/media/dvb/dm1105/Makefile
+ delete mode 100644 drivers/media/dvb/dvb-usb/Kconfig
+ delete mode 100644 drivers/media/dvb/dvb-usb/Makefile
+ delete mode 100644 drivers/media/dvb/dvb-usb/af9015.c
+ delete mode 100644 drivers/media/dvb/dvb-usb/it913x.c
+ delete mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
+ delete mode 100644 drivers/media/dvb/ngene/Kconfig
+ delete mode 100644 drivers/media/dvb/pluto2/Makefile
+ delete mode 100644 drivers/media/dvb/siano/Kconfig
+ delete mode 100644 drivers/media/dvb/ttusb-budget/Makefile
+ rename drivers/media/{dvb => }/firewire/Kconfig (100%)
+ rename drivers/media/{dvb => }/firewire/Makefile (51%)
+ rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
+ rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
+ create mode 100644 drivers/media/i2c/Kconfig
+ create mode 100644 drivers/media/i2c/Makefile
+ rename drivers/media/{video => i2c}/adp1653.c (99%)
+ rename drivers/media/{video => i2c}/adv7170.c (100%)
+ rename drivers/media/{video => i2c}/adv7175.c (100%)
+ rename drivers/media/{video => i2c}/adv7180.c (100%)
+ rename drivers/media/{video => i2c}/adv7183.c (100%)
+ rename drivers/media/{video => i2c}/adv7183_regs.h (100%)
+ rename drivers/media/{video => i2c}/adv7343.c (100%)
+ rename drivers/media/{video => i2c}/adv7343_regs.h (100%)
+ rename drivers/media/{video => i2c}/adv7393.c (100%)
+ rename drivers/media/{video => i2c}/adv7393_regs.h (100%)
+ rename drivers/media/{video => i2c}/ak881x.c (100%)
+ rename drivers/media/{video => i2c}/aptina-pll.c (100%)
+ rename drivers/media/{video => i2c}/aptina-pll.h (100%)
+ rename drivers/media/{video => i2c}/as3645a.c (99%)
+ rename drivers/media/{video => i2c}/bt819.c (100%)
+ rename drivers/media/{video => i2c}/bt856.c (100%)
+ rename drivers/media/{video => i2c}/bt866.c (100%)
+ rename drivers/media/{video => i2c}/btcx-risc.c (100%)
+ rename drivers/media/{video => i2c}/btcx-risc.h (100%)
+ rename drivers/media/{video => i2c}/cs5345.c (100%)
+ rename drivers/media/{video => i2c}/cs53l32a.c (100%)
+ rename drivers/media/{video => i2c}/cx2341x.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/Kconfig (100%)
+ rename drivers/media/{video => i2c}/cx25840/Makefile (80%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-audio.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-core.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-core.h (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-firmware.c (92%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-ir.c (100%)
+ rename drivers/media/{video => i2c}/cx25840/cx25840-vbi.c (100%)
+ rename drivers/media/{video => i2c}/ir-kbd-i2c.c (100%)
+ rename drivers/media/{video => i2c}/ks0127.c (100%)
+ rename drivers/media/{video => i2c}/ks0127.h (100%)
+ rename drivers/media/{video => i2c}/m52790.c (100%)
+ rename drivers/media/{video => i2c}/m5mols/Kconfig (100%)
+ rename drivers/media/{video => i2c}/m5mols/Makefile (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols.h (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_capture.c (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_controls.c (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_core.c (100%)
+ rename drivers/media/{video => i2c}/m5mols/m5mols_reg.h (100%)
+ rename drivers/media/{video => i2c}/msp3400-driver.c (100%)
+ rename drivers/media/{video => i2c}/msp3400-driver.h (100%)
+ rename drivers/media/{video => i2c}/msp3400-kthreads.c (100%)
+ rename drivers/media/{video => i2c}/mt9m032.c (100%)
+ rename drivers/media/{video => i2c}/mt9p031.c (100%)
+ rename drivers/media/{video => i2c}/mt9t001.c (100%)
+ rename drivers/media/{video => i2c}/mt9v011.c (100%)
+ rename drivers/media/{video => i2c}/mt9v032.c (100%)
+ rename drivers/media/{video => i2c}/noon010pc30.c (100%)
+ rename drivers/media/{video => i2c}/ov7670.c (100%)
+ rename drivers/media/{video => i2c}/s5k6aa.c (99%)
+ rename drivers/media/{video => i2c}/saa6588.c (100%)
+ rename drivers/media/{video => i2c}/saa7110.c (100%)
+ rename drivers/media/{video => i2c}/saa7115.c (100%)
+ rename drivers/media/{video => i2c}/saa711x_regs.h (100%)
+ rename drivers/media/{video => i2c}/saa7127.c (99%)
+ rename drivers/media/{video => i2c}/saa717x.c (100%)
+ rename drivers/media/{video => i2c}/saa7185.c (100%)
+ rename drivers/media/{video => i2c}/saa7191.c (100%)
+ rename drivers/media/{video => i2c}/saa7191.h (100%)
+ rename drivers/media/{video => i2c}/smiapp-pll.c (99%)
+ rename drivers/media/{video => i2c}/smiapp-pll.h (98%)
+ rename drivers/media/{video => i2c}/smiapp/Kconfig (100%)
+ rename drivers/media/{video => i2c}/smiapp/Makefile (78%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-core.c (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-limits.c (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-limits.h (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.c (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.h (98%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-reg-defs.h (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-reg.h (98%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-regs.c (99%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp-regs.h (100%)
+ rename drivers/media/{video => i2c}/smiapp/smiapp.h (99%)
+ create mode 100644 drivers/media/i2c/soc_camera/Kconfig
+ create mode 100644 drivers/media/i2c/soc_camera/Makefile
+ rename drivers/media/{video => i2c/soc_camera}/imx074.c (95%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9m001.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9m111.c (96%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9t031.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9t112.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/mt9v022.c (94%)
+ rename drivers/media/{video => i2c/soc_camera}/ov2640.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/ov5642.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/ov6650.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/ov772x.c (81%)
+ rename drivers/media/{video => i2c/soc_camera}/ov9640.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/ov9640.h (100%)
+ rename drivers/media/{video => i2c/soc_camera}/ov9740.c (97%)
+ rename drivers/media/{video => i2c/soc_camera}/rj54n1cb0c.c (98%)
+ rename drivers/media/{video => i2c/soc_camera}/tw9910.c (98%)
+ rename drivers/media/{video => i2c}/sr030pc30.c (100%)
+ rename drivers/media/{video => i2c}/tcm825x.c (99%)
+ rename drivers/media/{video => i2c}/tcm825x.h (99%)
+ rename drivers/media/{video => i2c}/tda7432.c (100%)
+ rename drivers/media/{video => i2c}/tda9840.c (100%)
+ rename drivers/media/{video => i2c}/tea6415c.c (100%)
+ rename drivers/media/{video => i2c}/tea6415c.h (100%)
+ rename drivers/media/{video => i2c}/tea6420.c (100%)
+ rename drivers/media/{video => i2c}/tea6420.h (100%)
+ rename drivers/media/{video => i2c}/ths7303.c (100%)
+ rename drivers/media/{video => i2c}/tlv320aic23b.c (100%)
+ rename drivers/media/{video => i2c}/tvaudio.c (100%)
+ rename drivers/media/{video => i2c}/tveeprom.c (100%)
+ rename drivers/media/{video => i2c}/tvp514x.c (99%)
+ rename drivers/media/{video => i2c}/tvp514x_regs.h (99%)
+ rename drivers/media/{video => i2c}/tvp5150.c (100%)
+ rename drivers/media/{video => i2c}/tvp5150_reg.h (100%)
+ rename drivers/media/{video => i2c}/tvp7002.c (100%)
+ rename drivers/media/{video => i2c}/tvp7002_reg.h (100%)
+ rename drivers/media/{video => i2c}/upd64031a.c (100%)
+ rename drivers/media/{video => i2c}/upd64083.c (100%)
+ rename drivers/media/{video => i2c}/vp27smpx.c (100%)
+ rename drivers/media/{video => i2c}/vpx3220.c (100%)
+ rename drivers/media/{video => i2c}/vs6624.c (100%)
+ rename drivers/media/{video => i2c}/vs6624_regs.h (100%)
+ rename drivers/media/{video => i2c}/wm8739.c (100%)
+ rename drivers/media/{video => i2c}/wm8775.c (100%)
+ create mode 100644 drivers/media/mmc/Kconfig
+ create mode 100644 drivers/media/mmc/Makefile
+ create mode 100644 drivers/media/mmc/siano/Kconfig
+ create mode 100644 drivers/media/mmc/siano/Makefile
+ rename drivers/media/{dvb => mmc}/siano/smssdio.c (100%)
+ create mode 100644 drivers/media/parport/Kconfig
+ create mode 100644 drivers/media/parport/Makefile
+ rename drivers/media/{video => parport}/bw-qcam.c (100%)
+ rename drivers/media/{video => parport}/c-qcam.c (100%)
+ rename drivers/media/{video => parport}/pms.c (100%)
+ rename drivers/media/{video => parport}/w9966.c (100%)
+ create mode 100644 drivers/media/pci/Kconfig
+ create mode 100644 drivers/media/pci/Makefile
+ create mode 100644 drivers/media/pci/b2c2/Kconfig
+ create mode 100644 drivers/media/pci/b2c2/Makefile
+ rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
+ rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
+ create mode 100644 drivers/media/pci/bt8xx/Kconfig
+ create mode 100644 drivers/media/pci/bt8xx/Makefile
+ rename drivers/media/{video => pci}/bt8xx/bt848.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.h (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-cards.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-driver.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-gpio.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-i2c.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-if.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-input.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-risc.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv-vbi.c (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttv.h (100%)
+ rename drivers/media/{video => pci}/bt8xx/bttvp.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (99%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
+ rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
+ rename drivers/media/{video => pci}/cx18/Kconfig (77%)
+ rename drivers/media/{video => pci}/cx18/Makefile (78%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-main.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-alsa.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-audio.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-audio.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-audio.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-core.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-core.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-firmware.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-av-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-cards.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-cards.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-controls.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-controls.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-driver.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-driver.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-dvb.c (99%)
+ rename drivers/media/{video => pci}/cx18/cx18-dvb.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-fileops.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-fileops.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-firmware.c (98%)
+ rename drivers/media/{video => pci}/cx18/cx18-firmware.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-gpio.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-gpio.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-i2c.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-io.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-io.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-ioctl.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-ioctl.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-irq.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-irq.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-mailbox.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-mailbox.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-queue.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-queue.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-scb.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-scb.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-streams.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-streams.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-vbi.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-version.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-video.c (100%)
+ rename drivers/media/{video => pci}/cx18/cx18-video.h (100%)
+ rename drivers/media/{video => pci}/cx18/cx23418.h (100%)
+ create mode 100644 drivers/media/pci/cx23885/Kconfig
+ rename drivers/media/{video => pci}/cx23885/Makefile (72%)
+ rename drivers/media/{video => pci}/cx23885/altera-ci.c (100%)
+ rename drivers/media/{video => pci}/cx23885/altera-ci.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cimax2.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cimax2.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-417.c (99%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-alsa.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-av.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-av.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-cards.c (99%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-core.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-dvb.c (99%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-f300.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-f300.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-input.c (96%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-input.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ir.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-ir.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-reg.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885-video.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23885.h (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23888-ir.c (100%)
+ rename drivers/media/{video => pci}/cx23885/cx23888-ir.h (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-eeprom.c (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-eeprom.h (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-init.c (100%)
+ rename drivers/media/{video => pci}/cx23885/netup-init.h (100%)
+ rename drivers/media/{video => pci}/cx25821/Kconfig (100%)
+ rename drivers/media/{video => pci}/cx25821/Makefile (67%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-alsa.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-audio.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-biffuncs.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-cards.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-core.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-gpio.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-defines.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-reg.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-reg.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-sram.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video.c (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821-video.h (100%)
+ rename drivers/media/{video => pci}/cx25821/cx25821.h (100%)
+ rename drivers/media/{video => pci}/cx88/Kconfig (70%)
+ rename drivers/media/{video => pci}/cx88/Makefile (73%)
+ rename drivers/media/{video => pci}/cx88/cx88-alsa.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-blackbird.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-cards.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-core.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-dsp.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-dvb.c (99%)
+ rename drivers/media/{video => pci}/cx88/cx88-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-input.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-mpeg.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-reg.h (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-tvaudio.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-vbi.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-video.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.c (100%)
+ rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.h (100%)
+ rename drivers/media/{video => pci}/cx88/cx88.h (99%)
+ rename drivers/media/{dvb => pci}/ddbridge/Kconfig (60%)
+ rename drivers/media/{dvb => pci}/ddbridge/Makefile (61%)
+ rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (100%)
+ rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
+ rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
+ rename drivers/media/{dvb => pci}/dm1105/Kconfig (57%)
+ create mode 100644 drivers/media/pci/dm1105/Makefile
+ rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
+ rename drivers/media/{video => pci}/ivtv/Kconfig (100%)
+ rename drivers/media/{video => pci}/ivtv/Makefile (61%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-cards.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-cards.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-controls.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-controls.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-driver.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-driver.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-fileops.c (96%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-fileops.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-firmware.c (98%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-firmware.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-gpio.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-gpio.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-i2c.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-i2c.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-irq.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-irq.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-queue.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-queue.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-routing.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-routing.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-streams.c (99%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-streams.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-udma.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-udma.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-vbi.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-vbi.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-version.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-yuv.c (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtv-yuv.h (100%)
+ rename drivers/media/{video => pci}/ivtv/ivtvfb.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/Kconfig (62%)
+ rename drivers/media/{dvb => pci}/mantis/Makefile (88%)
+ rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (99%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_core.c (99%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (98%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
+ rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
+ create mode 100644 drivers/media/pci/meye/Kconfig
+ create mode 100644 drivers/media/pci/meye/Makefile
+ rename drivers/media/{video => pci/meye}/meye.c (100%)
+ rename drivers/media/{video => pci/meye}/meye.h (100%)
+ create mode 100644 drivers/media/pci/ngene/Kconfig
+ rename drivers/media/{dvb => pci}/ngene/Makefile (63%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (71%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-core.c (98%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
+ rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
+ rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
+ rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
+ create mode 100644 drivers/media/pci/pluto2/Makefile
+ rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
+ rename drivers/media/{dvb => pci}/pt1/Makefile (56%)
+ rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
+ rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
+ rename drivers/media/{video => pci}/saa7134/Kconfig (56%)
+ rename drivers/media/{video => pci}/saa7134/Makefile (54%)
+ rename drivers/media/{video => pci}/saa7134/saa6752hs.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-alsa.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-cards.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-core.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-dvb.c (99%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-empress.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-i2c.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-input.c (99%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-reg.h (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-ts.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-tvaudio.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-vbi.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134-video.c (100%)
+ rename drivers/media/{video => pci}/saa7134/saa7134.h (99%)
+ create mode 100644 drivers/media/pci/saa7146/Kconfig
+ create mode 100644 drivers/media/pci/saa7146/Makefile
+ rename drivers/media/{video => pci/saa7146}/hexium_gemini.c (100%)
+ rename drivers/media/{video => pci/saa7146}/hexium_orion.c (100%)
+ rename drivers/media/{video => pci/saa7146}/mxb.c (100%)
+ rename drivers/media/{video => pci}/saa7164/Kconfig (62%)
+ rename drivers/media/{video => pci}/saa7164/Makefile (57%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-api.c (98%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-buffer.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-bus.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-cards.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-cmd.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-core.c (96%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-dvb.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-encoder.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-fw.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-i2c.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-reg.h (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-types.h (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164-vbi.c (100%)
+ rename drivers/media/{video => pci}/saa7164/saa7164.h (99%)
+ create mode 100644 drivers/media/pci/sta2x11/Kconfig
+ create mode 100644 drivers/media/pci/sta2x11/Makefile
+ rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.c (100%)
+ rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/Kconfig (66%)
+ rename drivers/media/{dvb => pci}/ttpci/Makefile (82%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/budget.c (91%)
+ rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
+ rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
+ rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
+ rename drivers/media/{video => pci}/zoran/Kconfig (75%)
+ rename drivers/media/{video => pci}/zoran/Makefile (100%)
+ rename drivers/media/{video => pci}/zoran/videocodec.c (100%)
+ rename drivers/media/{video => pci}/zoran/videocodec.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_card.c (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_card.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_device.c (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_device.h (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_driver.c (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_procfs.c (100%)
+ rename drivers/media/{video => pci}/zoran/zoran_procfs.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36016.c (100%)
+ rename drivers/media/{video => pci}/zoran/zr36016.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36050.c (100%)
+ rename drivers/media/{video => pci}/zoran/zr36050.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36057.h (100%)
+ rename drivers/media/{video => pci}/zoran/zr36060.c (100%)
+ rename drivers/media/{video => pci}/zoran/zr36060.h (100%)
+ create mode 100644 drivers/media/platform/Kconfig
+ create mode 100644 drivers/media/platform/Makefile
+ rename drivers/media/{video => platform}/arv.c (100%)
+ rename drivers/media/{video => platform}/blackfin/Kconfig (100%)
+ rename drivers/media/{video => platform}/blackfin/Makefile (100%)
+ rename drivers/media/{video => platform}/blackfin/bfin_capture.c (98%)
+ rename drivers/media/{video => platform}/blackfin/ppi.c (100%)
+ create mode 100644 drivers/media/platform/coda.c
+ create mode 100644 drivers/media/platform/coda.h
+ rename drivers/media/{video => platform}/davinci/Kconfig (97%)
+ rename drivers/media/{video => platform}/davinci/Makefile (100%)
+ rename drivers/media/{video => platform}/davinci/ccdc_hw_device.h (100%)
+ rename drivers/media/{video => platform}/davinci/dm355_ccdc.c (99%)
+ rename drivers/media/{video => platform}/davinci/dm355_ccdc_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/dm644x_ccdc.c (99%)
+ rename drivers/media/{video => platform}/davinci/dm644x_ccdc_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/isif.c (99%)
+ rename drivers/media/{video => platform}/davinci/isif_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe.c (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_display.c (99%)
+ rename drivers/media/{video => platform}/davinci/vpbe_osd.c (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_osd_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_venc.c (100%)
+ rename drivers/media/{video => platform}/davinci/vpbe_venc_regs.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpfe_capture.c (99%)
+ rename drivers/media/{video => platform}/davinci/vpif.c (99%)
+ rename drivers/media/{video => platform}/davinci/vpif.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpif_capture.c (99%)
+ rename drivers/media/{video => platform}/davinci/vpif_capture.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpif_display.c (98%)
+ rename drivers/media/{video => platform}/davinci/vpif_display.h (100%)
+ rename drivers/media/{video => platform}/davinci/vpss.c (99%)
+ rename drivers/media/{video => platform}/fsl-viu.c (98%)
+ rename drivers/media/{video => platform}/indycam.c (100%)
+ rename drivers/media/{video => platform}/indycam.h (100%)
+ create mode 100644 drivers/media/platform/m2m-deinterlace.c
+ rename drivers/media/{video => platform}/marvell-ccic/Kconfig (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/Makefile (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/cafe-driver.c (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/mcam-core.c (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/mcam-core.h (100%)
+ rename drivers/media/{video => platform}/marvell-ccic/mmp-driver.c (100%)
+ rename drivers/media/{video => platform}/mem2mem_testdev.c (97%)
+ rename drivers/media/{video => platform}/mx2_emmaprp.c (94%)
+ rename drivers/media/{video => platform}/omap/Kconfig (100%)
+ rename drivers/media/{video => platform}/omap/Makefile (81%)
+ rename drivers/media/{video => platform}/omap/omap_vout.c (100%)
+ rename drivers/media/{video => platform}/omap/omap_vout_vrfb.c (100%)
+ rename drivers/media/{video => platform}/omap/omap_vout_vrfb.h (100%)
+ rename drivers/media/{video => platform}/omap/omap_voutdef.h (100%)
+ rename drivers/media/{video => platform}/omap/omap_voutlib.c (100%)
+ rename drivers/media/{video => platform}/omap/omap_voutlib.h (100%)
+ rename drivers/media/{video => platform}/omap24xxcam-dma.c (99%)
+ rename drivers/media/{video => platform}/omap24xxcam.c (99%)
+ rename drivers/media/{video => platform}/omap24xxcam.h (99%)
+ rename drivers/media/{video => platform}/omap3isp/Makefile (100%)
+ rename drivers/media/{video => platform}/omap3isp/cfa_coef_table.h (91%)
+ rename drivers/media/{video => platform}/omap3isp/gamma_table.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isp.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/isp.h (97%)
+ rename drivers/media/{video => platform}/omap3isp/ispccdc.c (94%)
+ rename drivers/media/{video => platform}/omap3isp/ispccdc.h (83%)
+ rename drivers/media/{video => platform}/omap3isp/ispccp2.c (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispccp2.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsi2.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsi2.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsiphy.c (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispcsiphy.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isph3a.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isph3a_aewb.c (96%)
+ rename drivers/media/{video => platform}/omap3isp/isph3a_af.c (96%)
+ rename drivers/media/{video => platform}/omap3isp/isphist.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/isphist.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/isppreview.c (89%)
+ rename drivers/media/{video => platform}/omap3isp/isppreview.h (99%)
+ rename drivers/media/{video => platform}/omap3isp/ispqueue.c (98%)
+ rename drivers/media/{video => platform}/omap3isp/ispqueue.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispreg.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispresizer.c (99%)
+ rename drivers/media/{video => platform}/omap3isp/ispresizer.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispstat.c (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispstat.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/ispvideo.c (96%)
+ rename drivers/media/{video => platform}/omap3isp/ispvideo.h (97%)
+ rename drivers/media/{video => platform}/omap3isp/luma_enhance_table.h (100%)
+ rename drivers/media/{video => platform}/omap3isp/noise_filter_table.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/Kconfig (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-capture.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-core.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-core.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-m2m.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.h (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.c (100%)
+ rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.h (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d-hw.c (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d-regs.h (100%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d.c (97%)
+ rename drivers/media/{video => platform}/s5p-g2d/g2d.h (100%)
+ rename drivers/media/{video => platform}/s5p-jpeg/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.c (98%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.h (98%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-hw.h (99%)
+ rename drivers/media/{video => platform}/s5p-jpeg/jpeg-regs.h (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/Makefile (100%)
+ rename drivers/media/{video => platform}/s5p-mfc/regs-mfc.h (100%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc.c (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.c (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_common.h (100%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.c (99%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_debug.h (95%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.c (99%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.c (99%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.c (97%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.h (93%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.c (99%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.h (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.c (98%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.h (92%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.c (96%)
+ rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.h (98%)
+ rename drivers/media/{video => platform}/s5p-tv/Kconfig (98%)
+ rename drivers/media/{video => platform}/s5p-tv/Makefile (92%)
+ rename drivers/media/{video => platform}/s5p-tv/hdmi_drv.c (99%)
+ rename drivers/media/{video => platform}/s5p-tv/hdmiphy_drv.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_drv.c (98%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_grp_layer.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_reg.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_video.c (97%)
+ rename drivers/media/{video => platform}/s5p-tv/mixer_vp_layer.c (100%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-hdmi.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-mixer.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-sdo.h (97%)
+ rename drivers/media/{video => platform}/s5p-tv/regs-vp.h (100%)
+ rename drivers/media/{video => platform}/s5p-tv/sdo_drv.c (98%)
+ rename drivers/media/{video => platform}/s5p-tv/sii9234_drv.c (97%)
+ rename drivers/media/{video => platform}/sh_vou.c (98%)
+ create mode 100644 drivers/media/platform/soc_camera/Kconfig
+ create mode 100644 drivers/media/platform/soc_camera/Makefile
+ rename drivers/media/{video => platform/soc_camera}/atmel-isi.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/mx1_camera.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/mx2_camera.c (97%)
+ rename drivers/media/{video => platform/soc_camera}/mx3_camera.c (99%)
+ rename drivers/media/{video => platform/soc_camera}/omap1_camera.c (99%)
+ rename drivers/media/{video => platform/soc_camera}/pxa_camera.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/sh_mobile_ceu_camera.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/sh_mobile_csi2.c (100%)
+ rename drivers/media/{video => platform/soc_camera}/soc_camera.c (92%)
+ rename drivers/media/{video => platform/soc_camera}/soc_camera_platform.c (94%)
+ rename drivers/media/{video => platform/soc_camera}/soc_mediabus.c (100%)
+ rename drivers/media/{video => platform}/timblogiw.c (100%)
+ rename drivers/media/{video => platform}/via-camera.c (100%)
+ rename drivers/media/{video => platform}/via-camera.h (100%)
+ rename drivers/media/{video => platform}/vino.c (100%)
+ rename drivers/media/{video => platform}/vino.h (100%)
+ rename drivers/media/{video => platform}/vivi.c (97%)
+ create mode 100644 drivers/media/rc/ir-rx51.c
+ create mode 100644 drivers/media/rc/ttusbir.c
+ rename drivers/media/{common => }/tuners/Kconfig (73%)
+ rename drivers/media/{common => }/tuners/Makefile (93%)
+ rename drivers/media/{common => }/tuners/fc0011.c (100%)
+ rename drivers/media/{common => }/tuners/fc0011.h (100%)
+ rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
+ rename drivers/media/{common => }/tuners/fc0012.c (100%)
+ rename drivers/media/{common => }/tuners/fc0012.h (100%)
+ rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
+ rename drivers/media/{common => }/tuners/fc0013.c (100%)
+ rename drivers/media/{common => }/tuners/fc0013.h (100%)
+ rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
+ rename drivers/media/{common => }/tuners/max2165.c (100%)
+ rename drivers/media/{common => }/tuners/max2165.h (100%)
+ rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mc44s803.c (100%)
+ rename drivers/media/{common => }/tuners/mc44s803.h (100%)
+ rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mt2060.c (100%)
+ rename drivers/media/{common => }/tuners/mt2060.h (100%)
+ rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mt2063.c (100%)
+ rename drivers/media/{common => }/tuners/mt2063.h (100%)
+ rename drivers/media/{common => }/tuners/mt20xx.c (100%)
+ rename drivers/media/{common => }/tuners/mt20xx.h (100%)
+ rename drivers/media/{common => }/tuners/mt2131.c (100%)
+ rename drivers/media/{common => }/tuners/mt2131.h (100%)
+ rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
+ rename drivers/media/{common => }/tuners/mt2266.c (100%)
+ rename drivers/media/{common => }/tuners/mt2266.h (100%)
+ rename drivers/media/{common => }/tuners/mxl5005s.c (100%)
+ rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
+ rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
+ rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
+ rename drivers/media/{common => }/tuners/qt1010.c (99%)
+ rename drivers/media/{common => }/tuners/qt1010.h (100%)
+ rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
+ rename drivers/media/{common => }/tuners/tda18212.c (91%)
+ rename drivers/media/{common => }/tuners/tda18212.h (100%)
+ rename drivers/media/{common => }/tuners/tda18218.c (99%)
+ rename drivers/media/{common => }/tuners/tda18218.h (100%)
+ rename drivers/media/{common => }/tuners/tda18218_priv.h (100%)
+ rename drivers/media/{common => }/tuners/tda18271-common.c (100%)
+ rename drivers/media/{common => }/tuners/tda18271-fe.c (100%)
+ rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
+ rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
+ rename drivers/media/{common => }/tuners/tda18271.h (100%)
+ rename drivers/media/{common => }/tuners/tda827x.c (100%)
+ rename drivers/media/{common => }/tuners/tda827x.h (100%)
+ rename drivers/media/{common => }/tuners/tda8290.c (100%)
+ rename drivers/media/{common => }/tuners/tda8290.h (100%)
+ rename drivers/media/{common => }/tuners/tda9887.c (100%)
+ rename drivers/media/{common => }/tuners/tda9887.h (100%)
+ rename drivers/media/{common => }/tuners/tea5761.c (100%)
+ rename drivers/media/{common => }/tuners/tea5761.h (100%)
+ rename drivers/media/{common => }/tuners/tea5767.c (100%)
+ rename drivers/media/{common => }/tuners/tea5767.h (100%)
+ rename drivers/media/{common => }/tuners/tua9001.c (100%)
+ rename drivers/media/{common => }/tuners/tua9001.h (100%)
+ rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
+ rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-types.c (100%)
+ rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
+ rename drivers/media/{common => }/tuners/tuner-xc2028.c (99%)
+ rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
+ rename drivers/media/{common => }/tuners/xc4000.c (99%)
+ rename drivers/media/{common => }/tuners/xc4000.h (100%)
+ rename drivers/media/{common => }/tuners/xc5000.c (88%)
+ rename drivers/media/{common => }/tuners/xc5000.h (100%)
+ create mode 100644 drivers/media/usb/Kconfig
+ create mode 100644 drivers/media/usb/Makefile
+ rename drivers/media/{video => usb}/au0828/Kconfig (58%)
+ rename drivers/media/{video => usb}/au0828/Makefile (59%)
+ rename drivers/media/{video => usb}/au0828/au0828-cards.c (99%)
+ rename drivers/media/{video => usb}/au0828/au0828-cards.h (100%)
+ rename drivers/media/{video => usb}/au0828/au0828-core.c (85%)
+ rename drivers/media/{video => usb}/au0828/au0828-dvb.c (90%)
+ rename drivers/media/{video => usb}/au0828/au0828-i2c.c (93%)
+ rename drivers/media/{video => usb}/au0828/au0828-reg.h (98%)
+ rename drivers/media/{video => usb}/au0828/au0828-vbi.c (100%)
+ rename drivers/media/{video => usb}/au0828/au0828-video.c (96%)
+ rename drivers/media/{video => usb}/au0828/au0828.h (98%)
+ create mode 100644 drivers/media/usb/b2c2/Kconfig
+ create mode 100644 drivers/media/usb/b2c2/Makefile
+ rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.c (99%)
+ rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.h (100%)
+ rename drivers/media/{video => usb}/cpia2/Kconfig (100%)
+ rename drivers/media/{video => usb}/cpia2/Makefile (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2.h (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_core.c (99%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_registers.h (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_usb.c (100%)
+ rename drivers/media/{video => usb}/cpia2/cpia2_v4l.c (97%)
+ rename drivers/media/{video => usb}/cx231xx/Kconfig (89%)
+ rename drivers/media/{video => usb}/cx231xx/Makefile (65%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-417.c (99%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-audio.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-avcore.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-cards.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-conf-reg.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-core.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-dif.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-input.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-reg.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h (100%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx-video.c (98%)
+ rename drivers/media/{video => usb}/cx231xx/cx231xx.h (100%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/Kconfig
+ create mode 100644 drivers/media/usb/dvb-usb-v2/Makefile
+ create mode 100644 drivers/media/usb/dvb-usb-v2/af9015.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h (72%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c (62%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h (96%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c (67%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h (97%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c (64%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h (80%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c (63%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c (59%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h (60%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.c
+ create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.h
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb.h
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
+ create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c (58%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h (65%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c (54%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h (59%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/it913x.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c (69%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h (100%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c (99%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h (100%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/mxl111sf.c
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h (98%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c (68%)
+ rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h (92%)
+ create mode 100644 drivers/media/usb/dvb-usb-v2/usb_urb.c
+ create mode 100644 drivers/media/usb/dvb-usb/Kconfig
+ create mode 100644 drivers/media/usb/dvb-usb/Makefile
+ rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (99%)
+ create mode 100644 drivers/media/usb/dvb-usb/dvb_usb_dvb.c
+ create mode 100644 drivers/media/usb/dvb-usb/dvb_usb_remote.c
+ rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (99%)
+ rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
+ rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
+ rename drivers/media/{video => usb}/em28xx/Kconfig (67%)
+ rename drivers/media/{video => usb}/em28xx/Makefile (57%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-audio.c (99%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-cards.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-core.c (99%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-dvb.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-i2c.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-input.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-reg.h (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-vbi.c (100%)
+ rename drivers/media/{video => usb}/em28xx/em28xx-video.c (98%)
+ rename drivers/media/{video => usb}/em28xx/em28xx.h (100%)
+ rename drivers/media/{video => usb}/gspca/Kconfig (98%)
+ rename drivers/media/{video => usb}/gspca/Makefile (100%)
+ rename drivers/media/{video => usb}/gspca/autogain_functions.c (100%)
+ rename drivers/media/{video => usb}/gspca/autogain_functions.h (100%)
+ rename drivers/media/{video => usb}/gspca/benq.c (100%)
+ rename drivers/media/{video => usb}/gspca/conex.c (100%)
+ rename drivers/media/{video => usb}/gspca/cpia1.c (100%)
+ rename drivers/media/{video => usb}/gspca/etoms.c (100%)
+ rename drivers/media/{video => usb}/gspca/finepix.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/Kconfig (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/Makefile (75%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-mi1320.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-mi2020.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-ov2640.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860-ov9655.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860.c (100%)
+ rename drivers/media/{video => usb}/gspca/gl860/gl860.h (100%)
+ rename drivers/media/{video => usb}/gspca/gspca.c (100%)
+ rename drivers/media/{video => usb}/gspca/gspca.h (100%)
+ rename drivers/media/{video => usb}/gspca/jeilinj.c (100%)
+ rename drivers/media/{video => usb}/gspca/jl2005bcd.c (100%)
+ rename drivers/media/{video => usb}/gspca/jpeg.h (100%)
+ rename drivers/media/{video => usb}/gspca/kinect.c (100%)
+ rename drivers/media/{video => usb}/gspca/konica.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/Kconfig (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/Makefile (80%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_bridge.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_core.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.c (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.h (100%)
+ rename drivers/media/{video => usb}/gspca/m5602/m5602_sensor.h (100%)
+ rename drivers/media/{video => usb}/gspca/mars.c (100%)
+ rename drivers/media/{video => usb}/gspca/mr97310a.c (100%)
+ rename drivers/media/{video => usb}/gspca/nw80x.c (100%)
+ rename drivers/media/{video => usb}/gspca/ov519.c (100%)
+ rename drivers/media/{video => usb}/gspca/ov534.c (100%)
+ rename drivers/media/{video => usb}/gspca/ov534_9.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac207.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac7302.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac7311.c (100%)
+ rename drivers/media/{video => usb}/gspca/pac_common.h (100%)
+ rename drivers/media/{video => usb}/gspca/se401.c (100%)
+ rename drivers/media/{video => usb}/gspca/se401.h (100%)
+ rename drivers/media/{video => usb}/gspca/sn9c2028.c (100%)
+ rename drivers/media/{video => usb}/gspca/sn9c2028.h (100%)
+ rename drivers/media/{video => usb}/gspca/sn9c20x.c (100%)
+ rename drivers/media/{video => usb}/gspca/sonixb.c (100%)
+ rename drivers/media/{video => usb}/gspca/sonixj.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca1528.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca500.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca501.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca505.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca506.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca508.c (100%)
+ rename drivers/media/{video => usb}/gspca/spca561.c (100%)
+ rename drivers/media/{video => usb}/gspca/sq905.c (100%)
+ rename drivers/media/{video => usb}/gspca/sq905c.c (97%)
+ rename drivers/media/{video => usb}/gspca/sq930x.c (99%)
+ rename drivers/media/{video => usb}/gspca/stk014.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv0680.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/Kconfig (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/Makefile (78%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_sensor.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.h (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.c (100%)
+ rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.h (100%)
+ rename drivers/media/{video => usb}/gspca/sunplus.c (100%)
+ rename drivers/media/{video => usb}/gspca/t613.c (100%)
+ rename drivers/media/{video => usb}/gspca/topro.c (100%)
+ rename drivers/media/{video => usb}/gspca/tv8532.c (100%)
+ rename drivers/media/{video => usb}/gspca/vc032x.c (99%)
+ rename drivers/media/{video => usb}/gspca/vicam.c (100%)
+ rename drivers/media/{video => usb}/gspca/w996Xcf.c (100%)
+ rename drivers/media/{video => usb}/gspca/xirlink_cit.c (100%)
+ rename drivers/media/{video => usb}/gspca/zc3xx-reg.h (100%)
+ rename drivers/media/{video => usb}/gspca/zc3xx.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/Kconfig (100%)
+ rename drivers/media/{video => usb}/hdpvr/Makefile (81%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-control.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-core.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr-video.c (100%)
+ rename drivers/media/{video => usb}/hdpvr/hdpvr.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/Kconfig (82%)
+ rename drivers/media/{video => usb}/pvrusb2/Makefile (80%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debug.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.c (97%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw-internal.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-main.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-util.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.c (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.h (100%)
+ rename drivers/media/{video => usb}/pvrusb2/pvrusb2.h (100%)
+ rename drivers/media/{video => usb}/pwc/Kconfig (100%)
+ rename drivers/media/{video => usb}/pwc/Makefile (60%)
+ rename drivers/media/{video => usb}/pwc/philips.txt (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-ctrl.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec1.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec1.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec23.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-dec23.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-if.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-kiara.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-kiara.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-misc.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-nala.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-timon.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-timon.h (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-uncompress.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc-v4l.c (100%)
+ rename drivers/media/{video => usb}/pwc/pwc.h (100%)
+ create mode 100644 drivers/media/usb/s2255/Kconfig
+ create mode 100644 drivers/media/usb/s2255/Makefile
+ rename drivers/media/{video => usb/s2255}/s2255drv.c (99%)
+ create mode 100644 drivers/media/usb/siano/Kconfig
+ create mode 100644 drivers/media/usb/siano/Makefile
+ rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/Kconfig (100%)
+ rename drivers/media/{video => usb}/sn9c102/Makefile (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_config.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_core.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_devtable.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131d.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131r.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0343.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0360.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_mt9v111.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7630.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7660.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_pas106b.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_pas202bcb.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_sensor.h (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110c1b.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110d.c (100%)
+ rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5130d1b.c (100%)
+ create mode 100644 drivers/media/usb/stk1160/Kconfig
+ create mode 100644 drivers/media/usb/stk1160/Makefile
+ create mode 100644 drivers/media/usb/stk1160/stk1160-ac97.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-core.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-i2c.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-reg.h
+ create mode 100644 drivers/media/usb/stk1160/stk1160-v4l.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160-video.c
+ create mode 100644 drivers/media/usb/stk1160/stk1160.h
+ create mode 100644 drivers/media/usb/stkwebcam/Kconfig
+ create mode 100644 drivers/media/usb/stkwebcam/Makefile
+ rename drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%)
+ rename drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%)
+ rename drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%)
+ rename drivers/media/{video => usb}/tlg2300/Kconfig (100%)
+ create mode 100644 drivers/media/usb/tlg2300/Makefile
+ rename drivers/media/{video => usb}/tlg2300/pd-alsa.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-common.h (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-dvb.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-main.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-radio.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/pd-video.c (100%)
+ rename drivers/media/{video => usb}/tlg2300/vendorcmds.h (100%)
+ rename drivers/media/{video => usb}/tm6000/Kconfig (100%)
+ rename drivers/media/{video => usb}/tm6000/Makefile (62%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-alsa.c (99%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-cards.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-core.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-dvb.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-i2c.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-input.c (99%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-regs.h (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-stds.c (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-usb-isoc.h (100%)
+ rename drivers/media/{video => usb}/tm6000/tm6000-video.c (97%)
+ rename drivers/media/{video => usb}/tm6000/tm6000.h (100%)
+ rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (56%)
+ create mode 100644 drivers/media/usb/ttusb-budget/Makefile
+ rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (57%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
+ rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
+ rename drivers/media/{video => usb}/usbvision/Kconfig (88%)
+ rename drivers/media/{video => usb}/usbvision/Makefile (63%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-cards.c (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-cards.h (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-core.c (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-i2c.c (100%)
+ rename drivers/media/{video => usb}/usbvision/usbvision-video.c (97%)
+ rename drivers/media/{video => usb}/usbvision/usbvision.h (100%)
+ rename drivers/media/{video => usb}/uvc/Kconfig (100%)
+ rename drivers/media/{video => usb}/uvc/Makefile (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_ctrl.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_debugfs.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_driver.c (98%)
+ rename drivers/media/{video => usb}/uvc/uvc_entity.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_isight.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_queue.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_status.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_v4l2.c (100%)
+ rename drivers/media/{video => usb}/uvc/uvc_video.c (98%)
+ rename drivers/media/{video => usb}/uvc/uvcvideo.h (98%)
+ create mode 100644 drivers/media/usb/zr364xx/Kconfig
+ create mode 100644 drivers/media/usb/zr364xx/Makefile
+ rename drivers/media/{video => usb/zr364xx}/zr364xx.c (100%)
+ create mode 100644 drivers/media/v4l2-core/Kconfig
+ create mode 100644 drivers/media/v4l2-core/Makefile
+ rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-common.c (99%)
+ rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-dev.c (95%)
+ rename drivers/media/{video => v4l2-core}/v4l2-device.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-event.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (100%)
+ rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (96%)
+ rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-core.c (98%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
+ rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (99%)
+ delete mode 100644 drivers/media/video/Kconfig
+ delete mode 100644 drivers/media/video/Makefile
+ delete mode 100644 drivers/media/video/bt8xx/Kconfig
+ delete mode 100644 drivers/media/video/bt8xx/Makefile
+ delete mode 100644 drivers/media/video/cx23885/Kconfig
+ delete mode 100644 drivers/media/video/tlg2300/Makefile
+ delete mode 100644 drivers/staging/media/easycap/Kconfig
+ delete mode 100644 drivers/staging/media/easycap/Makefile
+ delete mode 100644 drivers/staging/media/easycap/README
+ delete mode 100644 drivers/staging/media/easycap/easycap.h
+ delete mode 100644 drivers/staging/media/easycap/easycap_ioctl.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_low.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_main.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_settings.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_sound.c
+ delete mode 100644 drivers/staging/media/easycap/easycap_testcard.c
+ delete mode 100644 drivers/staging/media/lirc/lirc_ene0100.h
+ delete mode 100644 drivers/staging/media/lirc/lirc_ttusbir.c
+ create mode 100644 include/media/ir-rx51.h
+Merging kbuild/for-next (c781288 Merge branches 'kbuild/kbuild', 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging scripts/kernel-doc
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 5 -
+ Makefile | 19 +--
+ scripts/Makefile.modinst | 2 +-
+ scripts/Makefile.modpost | 2 +-
+ scripts/coccinelle/api/ptr_ret.cocci | 26 ++++
+ scripts/kconfig/conf.c | 2 +-
+ scripts/kconfig/lxdialog/dialog.h | 1 +
+ scripts/kconfig/lxdialog/util.c | 7 +
+ scripts/kconfig/mconf.c | 4 -
+ scripts/kernel-doc | 273 +++++++++++++++++++++++++++++++++-
+ scripts/tags.sh | 8 +-
+ 11 files changed, 312 insertions(+), 37 deletions(-)
+Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop in streamline_config.pl)
+$ git merge kconfig/for-next
+Merge made by the 'recursive' strategy.
+ scripts/kconfig/streamline_config.pl | 48 ++++++++++++++++------------------
+ 1 file changed, 22 insertions(+), 26 deletions(-)
+Merging libata/NEXT (1b26d29 [libata] scsi: implement MODE SELECT command)
+$ git merge libata/NEXT
+Auto-merging drivers/ata/libata-core.c
+Merge made by the 'recursive' strategy.
+ drivers/ata/libata-core.c | 4 +-
+ drivers/ata/libata-scsi.c | 255 +++++++++++++++++++++++++++++++++++++++++----
+ 2 files changed, 234 insertions(+), 25 deletions(-)
+Merging infiniband/for-next (fea7a08 Linux 3.6-rc3)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging pstore/master (b4a871b pstore/ram: Add missing platform_device_unregister)
+$ git merge pstore/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 12 ++++++++++++
+ fs/pstore/ram.c | 28 +++++++++++++++-------------
+ 2 files changed, 27 insertions(+), 13 deletions(-)
+Merging acpi/next (9d0b01a Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base)
+$ git merge acpi/next
+Already up-to-date.
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 986dc00] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (449488c thermal: Fix potential NULL pointer accesses)
+$ git merge thermal/next
+Auto-merging drivers/acpi/thermal.c
+Merge made by the 'recursive' strategy.
+ Documentation/thermal/sysfs-api.txt | 9 +-
+ drivers/acpi/thermal.c | 93 ++++--
+ drivers/platform/x86/acerhdf.c | 5 +-
+ drivers/platform/x86/intel_mid_thermal.c | 2 +-
+ drivers/power/power_supply_core.c | 2 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c | 2 +-
+ drivers/thermal/Kconfig | 8 +
+ drivers/thermal/Makefile | 3 +-
+ drivers/thermal/rcar_thermal.c | 260 ++++++++++++++++
+ drivers/thermal/spear_thermal.c | 2 +-
+ drivers/thermal/thermal_sys.c | 321 ++++++++++++--------
+ include/linux/thermal.h | 28 +-
+ 12 files changed, 576 insertions(+), 159 deletions(-)
+ create mode 100644 drivers/thermal/rcar_thermal.c
+Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (d9de5fa UBI: fix a horrible memory deallocation bug)
+$ git merge ubi/linux-next
+Auto-merging drivers/mtd/ubi/vtbl.c
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/sam9_l9260_defconfig | 2 +-
+ drivers/mtd/mtdpart.c | 12 +-
+ drivers/mtd/ubi/Kconfig | 40 ++++---
+ drivers/mtd/ubi/attach.c | 46 ++++----
+ drivers/mtd/ubi/build.c | 204 ++++++++++++++++++++-------------
+ drivers/mtd/ubi/cdev.c | 18 +--
+ drivers/mtd/ubi/debug.c | 153 ++++++++++++-------------
+ drivers/mtd/ubi/debug.h | 12 +-
+ drivers/mtd/ubi/eba.c | 33 +++---
+ drivers/mtd/ubi/gluebi.c | 30 +++--
+ drivers/mtd/ubi/io.c | 80 +++++++------
+ drivers/mtd/ubi/misc.c | 14 ++-
+ drivers/mtd/ubi/ubi.h | 16 +--
+ drivers/mtd/ubi/vtbl.c | 10 +-
+ drivers/mtd/ubi/wl.c | 48 +++++---
+ include/linux/mtd/partitions.h | 3 +-
+ include/mtd/ubi-user.h | 16 ++-
+ 17 files changed, 412 insertions(+), 325 deletions(-)
+Merging dlm/next (9c5bef5 dlm: cleanup send_to_sock routine)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/ast.c | 4 +-
+ fs/dlm/config.c | 79 ++++--------------
+ fs/dlm/config.h | 2 -
+ fs/dlm/dlm_internal.h | 46 ++++++++---
+ fs/dlm/lockspace.c | 15 +++-
+ fs/dlm/lowcomms.c | 215 +++++++++++++++++++++++++++++++++++++++++--------
+ fs/dlm/lowcomms.h | 2 +
+ fs/dlm/main.c | 2 +
+ fs/dlm/member.c | 17 ++--
+ fs/dlm/rcom.c | 2 +-
+ fs/dlm/recoverd.c | 27 ++++---
+ fs/dlm/recoverd.h | 1 -
+ 12 files changed, 282 insertions(+), 130 deletions(-)
+Merging scsi/for-next (fec178b Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/ipr.c
+Auto-merging drivers/ata/libata-core.c
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 3 +
+ Documentation/scsi/ChangeLog.megaraid_sas | 10 ++
+ drivers/ata/libata-core.c | 69 +++++++++----
+ drivers/ata/libata-eh.c | 2 +
+ drivers/scsi/ipr.c | 149 +++++++++++++++++++--------
+ drivers/scsi/ipr.h | 5 +-
+ drivers/scsi/isci/host.c | 2 +-
+ drivers/scsi/isci/host.h | 2 +-
+ drivers/scsi/isci/init.c | 58 ++++++++++-
+ drivers/scsi/libsas/sas_ata.c | 91 +++++++++++++++-
+ drivers/scsi/libsas/sas_discover.c | 69 +++++++++++--
+ drivers/scsi/libsas/sas_dump.c | 1 +
+ drivers/scsi/libsas/sas_event.c | 4 +-
+ drivers/scsi/libsas/sas_init.c | 90 +++++++++++++++-
+ drivers/scsi/libsas/sas_internal.h | 1 +
+ drivers/scsi/libsas/sas_phy.c | 21 ++++
+ drivers/scsi/libsas/sas_port.c | 52 +++++++++-
+ drivers/scsi/megaraid/megaraid_sas.h | 8 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 42 ++++++--
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +-
+ drivers/scsi/mpt2sas/Kconfig | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2.h | 14 ++-
+ drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 7 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 19 ++--
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 14 +--
+ drivers/scsi/mpt2sas/mpt2sas_config.c | 38 ++++++-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 72 ++++++++++++-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 30 +++++-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +-
+ drivers/scsi/scsi_error.c | 10 ++
+ drivers/scsi/scsi_lib.c | 5 +-
+ drivers/scsi/scsi_scan.c | 10 ++
+ include/linux/libata.h | 15 ++-
+ include/scsi/libsas.h | 20 +++-
+ include/scsi/sas_ata.h | 10 ++
+ 39 files changed, 834 insertions(+), 139 deletions(-)
+Merging target-updates/for-next (2c4d84b target: use list_move_tail instead of list_del/list_add_tail)
+$ git merge target-updates/for-next
+Auto-merging drivers/vhost/tcm_vhost.c
+Auto-merging drivers/target/tcm_fc/tfc_sess.c
+Auto-merging drivers/target/tcm_fc/tfc_cmd.c
+Auto-merging drivers/target/target_core_transport.c
+Auto-merging drivers/target/target_core_pscsi.c
+Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
+Merge made by the 'recursive' strategy.
+ Documentation/target/tcm_mod_builder.py | 16 ---
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 12 --
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 15 ---
+ drivers/target/iscsi/iscsi_target.c | 13 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 25 ----
+ drivers/target/iscsi/iscsi_target_nego.c | 1 -
+ drivers/target/loopback/tcm_loop.c | 12 --
+ drivers/target/sbp/sbp_target.c | 23 +---
+ drivers/target/target_core_alua.c | 2 +-
+ drivers/target/target_core_configfs.c | 10 +-
+ drivers/target/target_core_device.c | 16 +--
+ drivers/target/target_core_fabric_configfs.c | 1 -
+ drivers/target/target_core_fabric_lib.c | 8 +-
+ drivers/target/target_core_file.c | 2 -
+ drivers/target/target_core_iblock.c | 11 +-
+ drivers/target/target_core_pr.c | 4 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ drivers/target/target_core_stat.c | 1 -
+ drivers/target/target_core_tpg.c | 2 +-
+ drivers/target/target_core_transport.c | 167 ++++++++++++--------------
+ drivers/target/tcm_fc/tfc_cmd.c | 1 -
+ drivers/target/tcm_fc/tfc_conf.c | 12 --
+ drivers/target/tcm_fc/tfc_io.c | 1 -
+ drivers/target/tcm_fc/tfc_sess.c | 1 -
+ drivers/usb/gadget/tcm_usb_gadget.c | 12 --
+ drivers/vhost/tcm_vhost.c | 13 --
+ include/target/target_core_backend.h | 3 -
+ include/target/target_core_fabric.h | 2 -
+ 28 files changed, 109 insertions(+), 279 deletions(-)
+Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Auto-merging drivers/scsi/isci/init.c
+Auto-merging drivers/scsi/isci/host.c
+Merge made by the 'recursive' strategy.
+ drivers/scsi/isci/host.c | 2 +-
+ drivers/scsi/isci/init.c | 1 -
+ drivers/scsi/isci/phy.c | 4 +++-
+ drivers/scsi/isci/probe_roms.c | 1 -
+ drivers/scsi/isci/remote_node_context.h | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+Merging slave-dma/next (b5f1433 spi: davici - make davinci select edma)
+$ git merge slave-dma/next
+Auto-merging drivers/spi/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/dma/Kconfig | 10 +
+ drivers/dma/Makefile | 1 +
+ drivers/dma/amba-pl08x.c | 2 +
+ drivers/dma/dw_dmac.c | 53 +---
+ drivers/dma/dw_dmac_regs.h | 2 -
+ drivers/dma/edma.c | 671 ++++++++++++++++++++++++++++++++++++++++
+ drivers/dma/ioat/pci.c | 22 ++
+ drivers/dma/sirf-dma.c | 23 +-
+ drivers/dma/ste_dma40.c | 14 +-
+ drivers/mmc/host/davinci_mmc.c | 271 +++++-----------
+ drivers/spi/Kconfig | 1 +
+ drivers/spi/spi-davinci.c | 292 ++++++++---------
+ include/linux/edma.h | 29 ++
+ 13 files changed, 974 insertions(+), 417 deletions(-)
+ create mode 100644 drivers/dma/edma.c
+ create mode 100644 include/linux/edma.h
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (7ab4551 tcp: fix TFO regression)
+$ git merge net-next/master
+Resolved 'net/socket.c' using previous resolution.
+Auto-merging net/xfrm/xfrm_state.c
+Auto-merging net/wireless/nl80211.c
+Auto-merging net/socket.c
+CONFLICT (content): Merge conflict in net/socket.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/sctp/output.c
+Auto-merging net/openvswitch/flow.h
+Auto-merging net/openvswitch/datapath.c
+Auto-merging net/openvswitch/actions.c
+Removing net/netfilter/xt_NOTRACK.c
+Auto-merging net/netfilter/nf_nat_tftp.c
+Auto-merging net/netfilter/nf_nat_sip.c
+Auto-merging net/netfilter/nf_nat_proto_unknown.c
+Auto-merging net/netfilter/nf_nat_proto_udplite.c
+Auto-merging net/netfilter/nf_nat_proto_udp.c
+Auto-merging net/netfilter/nf_nat_proto_tcp.c
+Auto-merging net/netfilter/nf_nat_proto_sctp.c
+Auto-merging net/netfilter/nf_nat_proto_dccp.c
+Auto-merging net/netfilter/nf_nat_proto_common.c
+Auto-merging net/netfilter/nf_nat_irc.c
+Auto-merging net/netfilter/nf_nat_helper.c
+Auto-merging net/netfilter/nf_nat_ftp.c
+Auto-merging net/netfilter/nf_nat_core.c
+Auto-merging net/netfilter/nf_nat_amanda.c
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/cfg.c
+Auto-merging net/l2tp/l2tp_eth.c
+Auto-merging net/ipv6/tcp_ipv6.c
+Removing net/ipv4/netfilter/nf_nat_rule.c
+Auto-merging net/ipv4/netfilter/iptable_nat.c
+Auto-merging net/core/sock.c
+Auto-merging net/bluetooth/l2cap_sock.c
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging init/Kconfig
+Auto-merging include/net/xfrm.h
+Removing include/net/netfilter/nf_nat_rule.h
+Removing include/net/netfilter/nf_nat_protocol.h
+Auto-merging include/net/bluetooth/smp.h
+Removing firmware/cxgb3/t3fw-7.10.0.bin.ihex
+Auto-merging drivers/net/wireless/rtlwifi/pci.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c
+Auto-merging drivers/net/wireless/mwifiex/cmdevt.c
+Auto-merging drivers/net/wireless/iwlwifi/pcie/trans.c
+Auto-merging drivers/net/wireless/iwlegacy/common.h
+Auto-merging drivers/net/wireless/ath/ath9k/xmit.c
+Auto-merging drivers/net/ieee802154/fakehard.c
+Auto-merging drivers/net/ieee802154/at86rf230.c
+Auto-merging drivers/net/ieee802154/Makefile
+Auto-merging drivers/net/ieee802154/Kconfig
+Auto-merging drivers/net/ethernet/ti/davinci_mdio.c
+Auto-merging drivers/net/ethernet/realtek/r8169.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
+Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
+Removing drivers/net/ethernet/freescale/fsl_pq_mdio.h
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+Auto-merging drivers/bluetooth/btusb.c
+Auto-merging arch/mips/configs/nlm_xlp_defconfig
+Auto-merging Documentation/feature-removal-schedule.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 84e4b19] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/net/cpsw.txt | 109 ++
+ .../devicetree/bindings/net/davinci-mdio.txt | 33 +
+ .../devicetree/bindings/net/mdio-mux-mmioreg.txt | 75 +
+ Documentation/feature-removal-schedule.txt | 8 -
+ Documentation/networking/batman-adv.txt | 7 +-
+ Documentation/networking/bonding.txt | 30 +-
+ Documentation/networking/ip-sysctl.txt | 37 +-
+ Documentation/networking/stmmac.txt | 5 -
+ arch/m68k/configs/amiga_defconfig | 1 -
+ arch/m68k/configs/apollo_defconfig | 1 -
+ arch/m68k/configs/atari_defconfig | 1 -
+ arch/m68k/configs/bvme6000_defconfig | 1 -
+ arch/m68k/configs/hp300_defconfig | 1 -
+ arch/m68k/configs/mac_defconfig | 1 -
+ arch/m68k/configs/multi_defconfig | 1 -
+ arch/m68k/configs/mvme147_defconfig | 1 -
+ arch/m68k/configs/mvme16x_defconfig | 1 -
+ arch/m68k/configs/q40_defconfig | 1 -
+ arch/m68k/configs/sun3_defconfig | 1 -
+ arch/m68k/configs/sun3x_defconfig | 1 -
+ arch/mips/configs/ar7_defconfig | 1 -
+ arch/mips/configs/bcm47xx_defconfig | 1 -
+ arch/mips/configs/ip22_defconfig | 1 -
+ arch/mips/configs/jazz_defconfig | 1 -
+ arch/mips/configs/malta_defconfig | 1 -
+ arch/mips/configs/markeins_defconfig | 1 -
+ arch/mips/configs/nlm_xlp_defconfig | 1 -
+ arch/mips/configs/nlm_xlr_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/powerpc/configs/pmac32_defconfig | 1 -
+ arch/powerpc/configs/ppc64_defconfig | 1 -
+ arch/powerpc/configs/ppc64e_defconfig | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 1 -
+ arch/tile/configs/tilegx_defconfig | 1 -
+ arch/tile/configs/tilepro_defconfig | 1 -
+ drivers/Makefile | 1 -
+ drivers/bcma/Kconfig | 4 +-
+ drivers/bcma/bcma_private.h | 2 +
+ drivers/bcma/driver_chipcommon_nflash.c | 28 +-
+ drivers/bcma/driver_chipcommon_pmu.c | 4 +-
+ drivers/bcma/driver_chipcommon_sflash.c | 123 +-
+ drivers/bcma/host_pci.c | 11 +-
+ drivers/bcma/host_soc.c | 2 +-
+ drivers/bcma/main.c | 17 +
+ drivers/bluetooth/bcm203x.c | 8 +-
+ drivers/bluetooth/bfusb.c | 12 +-
+ drivers/bluetooth/bluecard_cs.c | 5 +-
+ drivers/bluetooth/bpa10x.c | 8 +-
+ drivers/bluetooth/bt3c_cs.c | 5 +-
+ drivers/bluetooth/btmrvl_sdio.c | 15 +-
+ drivers/bluetooth/btsdio.c | 8 +-
+ drivers/bluetooth/btuart_cs.c | 5 +-
+ drivers/bluetooth/btusb.c | 13 +-
+ drivers/bluetooth/btwilink.c | 8 +-
+ drivers/bluetooth/dtl1_cs.c | 3 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 2 +-
+ drivers/net/Kconfig | 4 +-
+ drivers/net/Makefile | 1 +
+ drivers/net/bonding/bond_main.c | 140 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 18 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 12 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 54 +-
+ drivers/net/ethernet/emulex/benet/be.h | 1 +
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 30 +-
+ drivers/net/ethernet/freescale/Kconfig | 7 +
+ drivers/net/ethernet/freescale/Makefile | 1 +
+ drivers/net/ethernet/freescale/fsl_pq_mdio.c | 549 +++---
+ drivers/net/ethernet/freescale/fsl_pq_mdio.h | 52 -
+ drivers/net/ethernet/freescale/gianfar.c | 1 -
+ drivers/net/ethernet/freescale/ucc_geth.c | 1 -
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 274 +++
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 39 +
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +
+ drivers/net/ethernet/intel/e1000e/82571.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 44 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 19 +-
+ drivers/net/ethernet/intel/e1000e/phy.c | 31 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 29 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.h | 5 +-
+ drivers/net/ethernet/intel/igb/igb.h | 4 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 114 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 4 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 25 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 502 ++---
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 4 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 160 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.c | 14 +
+ drivers/net/ethernet/intel/ixgbevf/vf.h | 1 +
+ drivers/net/ethernet/nvidia/forcedeth.c | 17 +-
+ drivers/net/ethernet/realtek/r8169.c | 2 +
+ drivers/net/ethernet/sfc/efx.c | 235 +--
+ drivers/net/ethernet/sfc/ethtool.c | 4 +-
+ drivers/net/ethernet/sfc/falcon_boards.c | 2 +-
+ drivers/net/ethernet/sfc/net_driver.h | 49 +-
+ drivers/net/ethernet/sfc/nic.c | 6 +-
+ drivers/net/ethernet/sfc/tx.c | 621 +++----
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 11 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 -
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 39 +-
+ drivers/net/ethernet/ti/Kconfig | 4 +-
+ drivers/net/ethernet/ti/cpsw.c | 174 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 41 +-
+ drivers/net/ethernet/tundra/tsi108_eth.c | 1 -
+ drivers/net/ethernet/wiznet/w5100.c | 3 +-
+ drivers/net/ethernet/wiznet/w5300.c | 3 +-
+ drivers/net/hyperv/netvsc_drv.c | 2 +-
+ drivers/net/hyperv/rndis_filter.c | 8 +-
+ drivers/{ => net}/ieee802154/Kconfig | 11 +
+ drivers/{ => net}/ieee802154/Makefile | 1 +
+ drivers/{ => net}/ieee802154/at86rf230.c | 12 +-
+ drivers/{ => net}/ieee802154/fakehard.c | 1 -
+ drivers/{ => net}/ieee802154/fakelb.c | 0
+ drivers/net/ieee802154/mrf24j40.c | 767 ++++++++
+ drivers/net/loopback.c | 1 +
+ drivers/net/phy/Kconfig | 13 +
+ drivers/net/phy/Makefile | 1 +
+ drivers/net/phy/mdio-gpio.c | 132 +-
+ drivers/net/phy/mdio-mux-mmioreg.c | 170 ++
+ drivers/net/phy/phy.c | 74 +-
+ drivers/net/ppp/ppp_generic.c | 58 +-
+ drivers/net/team/Kconfig | 4 +-
+ drivers/net/team/team.c | 304 ++-
+ drivers/net/team/team_mode_broadcast.c | 8 +-
+ drivers/net/team/team_mode_roundrobin.c | 8 +-
+ drivers/net/tun.c | 46 +-
+ drivers/net/usb/cx82310_eth.c | 11 +-
+ drivers/net/usb/sierra_net.c | 23 +-
+ drivers/net/veth.c | 3 +
+ drivers/net/virtio_net.c | 2 +-
+ drivers/net/wimax/i2400m/driver.c | 3 +-
+ drivers/net/wireless/adm8211.c | 4 +-
+ drivers/net/wireless/airo.c | 48 +-
+ drivers/net/wireless/at76c50x-usb.c | 4 +-
+ drivers/net/wireless/ath/ath5k/ath5k.h | 2 +-
+ drivers/net/wireless/ath/ath5k/base.c | 5 +-
+ drivers/net/wireless/ath/ath5k/mac80211-ops.c | 7 +-
+ drivers/net/wireless/ath/ath5k/phy.c | 43 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 149 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
+ drivers/net/wireless/ath/ath9k/htc.h | 1 +
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 35 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +-
+ drivers/net/wireless/ath/ath9k/main.c | 5 +-
+ drivers/net/wireless/ath/ath9k/rc.c | 812 ++++----
+ drivers/net/wireless/ath/ath9k/rc.h | 4 -
+ drivers/net/wireless/ath/ath9k/xmit.c | 9 +-
+ drivers/net/wireless/ath/carl9170/carl9170.h | 5 +-
+ drivers/net/wireless/ath/carl9170/fw.c | 1 +
+ drivers/net/wireless/ath/carl9170/mac.c | 2 +-
+ drivers/net/wireless/ath/carl9170/main.c | 4 +-
+ drivers/net/wireless/ath/carl9170/rx.c | 16 +-
+ drivers/net/wireless/ath/carl9170/tx.c | 16 +-
+ drivers/net/wireless/b43/Makefile | 1 +
+ drivers/net/wireless/b43/b43.h | 10 +-
+ drivers/net/wireless/b43/main.c | 54 +-
+ drivers/net/wireless/b43/phy_common.c | 17 +-
+ drivers/net/wireless/b43/phy_common.h | 6 +
+ drivers/net/wireless/b43/phy_n.c | 668 ++++++-
+ drivers/net/wireless/b43/phy_n.h | 1 +
+ drivers/net/wireless/b43/radio_2057.c | 141 ++
+ drivers/net/wireless/b43/radio_2057.h | 430 +++++
+ drivers/net/wireless/b43/tables_nphy.c | 75 +
+ drivers/net/wireless/b43/tables_nphy.h | 10 +
+ drivers/net/wireless/b43legacy/main.c | 3 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 10 +-
+ drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 +-
+ .../net/wireless/brcm80211/include/brcmu_wifi.h | 5 -
+ drivers/net/wireless/iwlegacy/3945-mac.c | 12 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 26 +-
+ drivers/net/wireless/iwlegacy/4965.h | 8 +-
+ drivers/net/wireless/iwlegacy/common.c | 15 +-
+ drivers/net/wireless/iwlegacy/common.h | 2 -
+ drivers/net/wireless/iwlwifi/dvm/agn.h | 13 +-
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 56 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 8 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 24 +-
+ drivers/net/wireless/iwlwifi/dvm/sta.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 18 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 141 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.h | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 3 +-
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 12 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 6 +
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 1 +
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 16 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 28 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 26 +-
+ drivers/net/wireless/libertas_tf/main.c | 4 +-
+ drivers/net/wireless/mac80211_hwsim.c | 8 +-
+ drivers/net/wireless/mwifiex/11n.c | 26 +
+ drivers/net/wireless/mwifiex/11n.h | 15 +
+ drivers/net/wireless/mwifiex/11n_aggr.c | 14 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.c | 66 +-
+ drivers/net/wireless/mwifiex/11n_rxreorder.h | 5 +
+ drivers/net/wireless/mwifiex/Makefile | 2 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 17 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 5 +-
+ drivers/net/wireless/mwifiex/decl.h | 3 +
+ drivers/net/wireless/mwifiex/fw.h | 42 +-
+ drivers/net/wireless/mwifiex/init.c | 107 +-
+ drivers/net/wireless/mwifiex/ioctl.h | 5 +-
+ drivers/net/wireless/mwifiex/main.c | 3 +
+ drivers/net/wireless/mwifiex/main.h | 38 +-
+ drivers/net/wireless/mwifiex/scan.c | 6 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 55 +-
+ drivers/net/wireless/mwifiex/sta_event.c | 64 +-
+ drivers/net/wireless/mwifiex/sta_ioctl.c | 12 +-
+ drivers/net/wireless/mwifiex/sta_rx.c | 38 +-
+ drivers/net/wireless/mwifiex/txrx.c | 5 +
+ drivers/net/wireless/mwifiex/uap_cmd.c | 1 +
+ drivers/net/wireless/mwifiex/uap_event.c | 290 +++
+ drivers/net/wireless/mwifiex/uap_txrx.c | 255 +++
+ drivers/net/wireless/mwifiex/wmm.c | 59 +-
+ drivers/net/wireless/mwl8k.c | 17 +-
+ drivers/net/wireless/p54/eeprom.c | 108 +-
+ drivers/net/wireless/p54/eeprom.h | 12 +
+ drivers/net/wireless/p54/lmac.h | 4 +-
+ drivers/net/wireless/p54/main.c | 2 +-
+ drivers/net/wireless/p54/p54pci.c | 88 +-
+ drivers/net/wireless/p54/p54pci.h | 1 +
+ drivers/net/wireless/p54/txrx.c | 15 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 20 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 6 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 6 +-
+ drivers/net/wireless/rtlwifi/base.c | 3 +-
+ drivers/net/wireless/rtlwifi/core.c | 8 +-
+ drivers/net/wireless/rtlwifi/pci.c | 16 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.h | 1 +
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 1 +
+ drivers/net/wireless/rtlwifi/usb.c | 15 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 13 +-
+ drivers/net/wireless/ti/wl1251/main.c | 4 +-
+ drivers/net/wireless/ti/wlcore/main.c | 6 +-
+ drivers/net/wireless/ti/wlcore/tx.c | 61 +-
+ drivers/net/wireless/ti/wlcore/tx.h | 4 +-
+ drivers/net/wireless/zd1211rw/zd_mac.c | 6 +-
+ drivers/net/xen-netfront.c | 2 +-
+ drivers/ssb/driver_mipscore.c | 28 +-
+ drivers/staging/winbond/wbusb.c | 4 +-
+ firmware/Makefile | 1 -
+ firmware/cxgb3/t3fw-7.10.0.bin.ihex | 1935 --------------------
+ fs/namei.c | 6 +-
+ fs/seq_file.c | 4 +
+ include/linux/Kbuild | 2 +
+ include/linux/bcma/bcma_driver_chipcommon.h | 111 ++
+ include/linux/bcma/bcma_regs.h | 4 +
+ include/linux/ethtool.h | 17 +-
+ include/linux/hash.h | 10 +
+ include/linux/if_arp.h | 1 +
+ include/linux/if_team.h | 11 +-
+ include/linux/if_tunnel.h | 3 +
+ include/linux/if_vlan.h | 9 +-
+ include/linux/inet_diag.h | 1 +
+ include/linux/inetdevice.h | 11 +-
+ include/linux/ip6_tunnel.h | 17 +
+ include/linux/ipv6.h | 1 +
+ include/linux/jiffies.h | 6 +
+ include/linux/mdio.h | 83 +
+ include/linux/netdevice.h | 10 +-
+ include/linux/netfilter.h | 14 +-
+ include/linux/netfilter/nf_conntrack_amanda.h | 1 +
+ include/linux/netfilter/nf_conntrack_ftp.h | 1 +
+ include/linux/netfilter/nf_conntrack_h323.h | 15 +-
+ include/linux/netfilter/nf_conntrack_irc.h | 1 +
+ include/linux/netfilter/nf_conntrack_pptp.h | 2 +
+ include/linux/netfilter/nf_conntrack_sip.h | 21 +-
+ include/linux/netfilter/nf_nat.h | 8 +
+ include/linux/netfilter/nfnetlink_conntrack.h | 8 +-
+ include/linux/netfilter_ipv4.h | 1 -
+ include/linux/netfilter_ipv6/Kbuild | 1 +
+ include/linux/netfilter_ipv6/ip6t_NPT.h | 16 +
+ include/linux/netlink.h | 1 +
+ include/linux/nl80211.h | 30 +-
+ include/linux/of_mdio.h | 33 +
+ include/linux/packet_diag.h | 72 +
+ include/linux/rfkill.h | 31 +
+ include/linux/seq_file.h | 14 +
+ include/linux/skbuff.h | 9 +-
+ include/linux/snmp.h | 16 +-
+ include/linux/ssb/ssb_driver_chipcommon.h | 4 +-
+ include/linux/stmmac.h | 1 -
+ include/linux/tcp.h | 45 +-
+ include/linux/tcp_metrics.h | 54 +
+ include/linux/tipc_config.h | 8 +-
+ include/net/addrconf.h | 2 +-
+ include/net/arp.h | 3 +-
+ include/net/ax25.h | 4 +-
+ include/net/bluetooth/bluetooth.h | 10 +
+ include/net/bluetooth/hci.h | 11 +
+ include/net/bluetooth/hci_core.h | 22 +-
+ include/net/bluetooth/l2cap.h | 17 +-
+ include/net/bluetooth/smp.h | 8 +-
+ include/net/cfg80211.h | 40 +-
+ include/net/checksum.h | 3 +
+ include/net/dst.h | 10 +-
+ include/net/ieee80211_radiotap.h | 11 +
+ include/net/inet_frag.h | 2 +
+ include/net/ip.h | 2 +
+ include/net/ip6_fib.h | 1 +
+ include/net/ip6_tunnel.h | 41 +-
+ include/net/ip_vs.h | 16 +-
+ include/net/ipv6.h | 6 +-
+ include/net/mac80211.h | 87 +-
+ include/net/ndisc.h | 3 +-
+ include/net/neighbour.h | 14 +-
+ include/net/net_namespace.h | 12 +
+ include/net/netfilter/nf_conntrack_expect.h | 2 +-
+ include/net/netfilter/nf_conntrack_timeout.h | 20 +
+ include/net/netfilter/nf_nat.h | 6 +-
+ include/net/netfilter/nf_nat_core.h | 5 +-
+ include/net/netfilter/nf_nat_helper.h | 11 +-
+ include/net/netfilter/nf_nat_l3proto.h | 52 +
+ include/net/netfilter/nf_nat_l4proto.h | 72 +
+ include/net/netfilter/nf_nat_protocol.h | 67 -
+ include/net/netfilter/nf_nat_rule.h | 15 -
+ include/net/netlink.h | 98 +
+ include/net/netns/conntrack.h | 4 +
+ include/net/netns/ipv4.h | 5 +-
+ include/net/netns/ipv6.h | 1 +
+ include/net/netns/packet.h | 4 +-
+ include/net/netns/sctp.h | 131 ++
+ include/net/request_sock.h | 49 +-
+ include/net/sch_generic.h | 3 +-
+ include/net/sctp/sctp.h | 69 +-
+ include/net/sctp/sm.h | 8 +-
+ include/net/sctp/structs.h | 154 +-
+ include/net/snmp.h | 10 +-
+ include/net/sock.h | 11 +-
+ include/net/tcp.h | 83 +-
+ include/net/xfrm.h | 2 +-
+ init/Kconfig | 19 -
+ kernel/pid.c | 1 +
+ kernel/pid_namespace.c | 2 +
+ lib/nlattr.c | 4 +
+ net/8021q/vlan_core.c | 6 +
+ net/Kconfig | 2 +
+ net/appletalk/atalk_proc.c | 3 +-
+ net/atm/resources.c | 2 +-
+ net/ax25/ax25_uid.c | 21 +-
+ net/batman-adv/bat_iv_ogm.c | 96 +-
+ net/batman-adv/bridge_loop_avoidance.c | 214 ++-
+ net/batman-adv/bridge_loop_avoidance.h | 11 +-
+ net/batman-adv/debugfs.c | 12 +
+ net/batman-adv/gateway_client.c | 53 +-
+ net/batman-adv/hard-interface.c | 13 +-
+ net/batman-adv/main.c | 27 +-
+ net/batman-adv/main.h | 29 +-
+ net/batman-adv/packet.h | 35 +-
+ net/batman-adv/routing.c | 85 +-
+ net/batman-adv/send.c | 8 +-
+ net/batman-adv/soft-interface.c | 79 +-
+ net/batman-adv/soft-interface.h | 5 +-
+ net/batman-adv/translation-table.c | 416 +++--
+ net/batman-adv/translation-table.h | 4 +-
+ net/batman-adv/types.h | 120 +-
+ net/batman-adv/unicast.c | 16 +-
+ net/batman-adv/vis.c | 144 +-
+ net/batman-adv/vis.h | 2 +-
+ net/bluetooth/a2mp.c | 16 +-
+ net/bluetooth/af_bluetooth.c | 141 ++
+ net/bluetooth/bnep/sock.c | 22 +-
+ net/bluetooth/cmtp/sock.c | 23 +-
+ net/bluetooth/hci_core.c | 6 +-
+ net/bluetooth/hci_event.c | 93 +-
+ net/bluetooth/hci_sock.c | 13 +-
+ net/bluetooth/hidp/sock.c | 22 +-
+ net/bluetooth/l2cap_core.c | 32 +-
+ net/bluetooth/l2cap_sock.c | 22 +-
+ net/bluetooth/mgmt.c | 34 +-
+ net/bluetooth/rfcomm/sock.c | 14 +-
+ net/bluetooth/sco.c | 16 +-
+ net/bridge/br_fdb.c | 2 +-
+ net/bridge/br_stp_timer.c | 2 +-
+ net/bridge/netfilter/ebtable_filter.c | 4 +-
+ net/bridge/netfilter/ebtable_nat.c | 4 +-
+ net/core/dev.c | 67 +-
+ net/core/dst.c | 2 +-
+ net/core/link_watch.c | 8 +
+ net/core/net-sysfs.c | 18 +-
+ net/core/netpoll.c | 3 +-
+ net/core/request_sock.c | 95 +
+ net/core/rtnetlink.c | 16 +-
+ net/core/scm.c | 31 +-
+ net/core/secure_seq.c | 1 +
+ net/core/sock.c | 12 +-
+ net/core/utils.c | 20 +
+ net/decnet/af_decnet.c | 4 +-
+ net/decnet/dn_route.c | 6 +-
+ net/ieee802154/6lowpan.c | 53 +-
+ net/ipv4/af_inet.c | 29 +-
+ net/ipv4/devinet.c | 39 +-
+ net/ipv4/fib_frontend.c | 13 +-
+ net/ipv4/fib_trie.c | 13 +-
+ net/ipv4/igmp.c | 7 +-
+ net/ipv4/inet_connection_sock.c | 57 +-
+ net/ipv4/inet_diag.c | 21 +-
+ net/ipv4/ip_fragment.c | 8 +-
+ net/ipv4/ip_output.c | 4 +-
+ net/ipv4/ipmr.c | 2 +-
+ net/ipv4/netfilter.c | 41 +-
+ net/ipv4/netfilter/Kconfig | 69 +-
+ net/ipv4/netfilter/Makefile | 16 +-
+ net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +-
+ net/ipv4/netfilter/ipt_NETMAP.c | 15 +-
+ net/ipv4/netfilter/ipt_REDIRECT.c | 15 +-
+ net/ipv4/netfilter/ipt_rpfilter.c | 2 +-
+ net/ipv4/netfilter/iptable_filter.c | 10 +-
+ net/ipv4/netfilter/iptable_mangle.c | 10 +-
+ .../{nf_nat_standalone.c => iptable_nat.c} | 264 ++-
+ net/ipv4/netfilter/iptable_raw.c | 10 +-
+ net/ipv4/netfilter/iptable_security.c | 5 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 +-
+ net/ipv4/netfilter/nf_nat_h323.c | 71 +-
+ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 281 +++
+ net/ipv4/netfilter/nf_nat_pptp.c | 21 +-
+ net/ipv4/netfilter/nf_nat_proto_gre.c | 30 +-
+ net/ipv4/netfilter/nf_nat_proto_icmp.c | 24 +-
+ net/ipv4/netfilter/nf_nat_rule.c | 214 ---
+ net/ipv4/ping.c | 22 +-
+ net/ipv4/proc.c | 4 +
+ net/ipv4/raw.c | 4 +-
+ net/ipv4/route.c | 22 +-
+ net/ipv4/syncookies.c | 1 +
+ net/ipv4/sysctl_net_ipv4.c | 87 +-
+ net/ipv4/tcp.c | 49 +-
+ net/ipv4/tcp_fastopen.c | 83 +-
+ net/ipv4/tcp_input.c | 279 +--
+ net/ipv4/tcp_ipv4.c | 288 ++-
+ net/ipv4/tcp_metrics.c | 354 +++-
+ net/ipv4/tcp_minisocks.c | 61 +-
+ net/ipv4/tcp_output.c | 27 +-
+ net/ipv4/tcp_timer.c | 39 +-
+ net/ipv4/udp.c | 4 +-
+ net/ipv4/udp_diag.c | 5 +-
+ net/ipv6/Kconfig | 16 +
+ net/ipv6/Makefile | 1 +
+ net/ipv6/addrconf.c | 31 +-
+ net/ipv6/ip6_flowlabel.c | 47 +-
+ net/ipv6/ip6_gre.c | 1792 ++++++++++++++++++
+ net/ipv6/ip6_output.c | 7 +-
+ net/ipv6/ip6_tunnel.c | 91 +-
+ net/ipv6/netfilter.c | 8 +
+ net/ipv6/netfilter/Kconfig | 54 +
+ net/ipv6/netfilter/Makefile | 8 +
+ net/ipv6/netfilter/ip6t_MASQUERADE.c | 135 ++
+ net/ipv6/netfilter/ip6t_NETMAP.c | 94 +
+ net/ipv6/netfilter/ip6t_NPT.c | 165 ++
+ net/ipv6/netfilter/ip6t_REDIRECT.c | 98 +
+ net/ipv6/netfilter/ip6table_filter.c | 4 +-
+ net/ipv6/netfilter/ip6table_mangle.c | 4 +-
+ net/ipv6/netfilter/ip6table_nat.c | 321 ++++
+ net/ipv6/netfilter/ip6table_raw.c | 4 +-
+ net/ipv6/netfilter/ip6table_security.c | 5 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 137 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 19 +-
+ net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 288 +++
+ net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 90 +
+ net/ipv6/raw.c | 3 +-
+ net/ipv6/route.c | 34 +-
+ net/ipv6/syncookies.c | 1 +
+ net/ipv6/tcp_ipv6.c | 20 +-
+ net/ipv6/udp.c | 3 +-
+ net/ipx/ipx_proc.c | 3 +-
+ net/key/af_key.c | 6 +-
+ net/l2tp/l2tp_eth.c | 3 +-
+ net/llc/llc_proc.c | 2 +-
+ net/mac80211/aes_cmac.c | 6 +-
+ net/mac80211/cfg.c | 66 +-
+ net/mac80211/debugfs.c | 32 -
+ net/mac80211/driver-ops.h | 11 +-
+ net/mac80211/ibss.c | 15 +-
+ net/mac80211/ieee80211_i.h | 30 +-
+ net/mac80211/iface.c | 289 +--
+ net/mac80211/main.c | 21 +-
+ net/mac80211/mesh.c | 49 +-
+ net/mac80211/mesh.h | 5 +-
+ net/mac80211/mesh_hwmp.c | 2 -
+ net/mac80211/mesh_pathtbl.c | 44 +-
+ net/mac80211/mesh_plink.c | 82 +-
+ net/mac80211/mlme.c | 240 ++-
+ net/mac80211/offchannel.c | 6 +
+ net/mac80211/rate.h | 2 +-
+ net/mac80211/rx.c | 58 +-
+ net/mac80211/scan.c | 12 +-
+ net/mac80211/status.c | 22 +-
+ net/mac80211/trace.h | 11 +-
+ net/mac80211/tx.c | 71 +-
+ net/mac80211/util.c | 57 +-
+ net/netfilter/Kconfig | 62 +-
+ net/netfilter/Makefile | 19 +-
+ net/netfilter/core.c | 21 +-
+ net/netfilter/ipvs/Kconfig | 3 +-
+ net/netfilter/ipvs/ip_vs_app.c | 58 +-
+ net/netfilter/ipvs/ip_vs_core.c | 76 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 16 +-
+ net/netfilter/ipvs/ip_vs_ftp.c | 22 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 111 +-
+ net/netfilter/nf_conntrack_amanda.c | 5 +-
+ net/netfilter/nf_conntrack_core.c | 13 +-
+ net/netfilter/nf_conntrack_ftp.c | 3 +-
+ net/netfilter/nf_conntrack_h323_main.c | 232 ++-
+ net/netfilter/nf_conntrack_irc.c | 3 +-
+ net/netfilter/nf_conntrack_netlink.c | 35 +-
+ net/netfilter/nf_conntrack_pptp.c | 18 +-
+ net/netfilter/nf_conntrack_proto.c | 5 -
+ net/netfilter/nf_conntrack_proto_tcp.c | 8 +-
+ net/netfilter/nf_conntrack_sip.c | 143 +-
+ net/netfilter/nf_internals.h | 4 +-
+ net/{ipv4 => }/netfilter/nf_nat_amanda.c | 4 +-
+ net/{ipv4 => }/netfilter/nf_nat_core.c | 675 ++++---
+ net/{ipv4 => }/netfilter/nf_nat_ftp.c | 34 +-
+ net/{ipv4 => }/netfilter/nf_nat_helper.c | 109 +-
+ net/{ipv4 => }/netfilter/nf_nat_irc.c | 10 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_common.c | 54 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_dccp.c | 56 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_sctp.c | 53 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_tcp.c | 40 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_udp.c | 42 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_udplite.c | 58 +-
+ net/{ipv4 => }/netfilter/nf_nat_proto_unknown.c | 16 +-
+ net/{ipv4 => }/netfilter/nf_nat_sip.c | 270 +--
+ net/{ipv4 => }/netfilter/nf_nat_tftp.c | 1 -
+ net/netfilter/nf_queue.c | 10 +-
+ net/netfilter/nfnetlink_acct.c | 4 +-
+ net/netfilter/nfnetlink_cthelper.c | 2 +-
+ net/netfilter/nfnetlink_log.c | 14 +-
+ net/netfilter/xt_CT.c | 262 ++-
+ net/netfilter/xt_LOG.c | 16 +-
+ net/netfilter/xt_NFQUEUE.c | 8 +-
+ net/netfilter/xt_NOTRACK.c | 53 -
+ net/netfilter/xt_nat.c | 170 ++
+ net/netfilter/xt_osf.c | 2 +-
+ net/netfilter/xt_owner.c | 30 +-
+ net/netfilter/xt_recent.c | 13 +-
+ net/netfilter/xt_socket.c | 12 +-
+ net/netlink/af_netlink.c | 6 +-
+ net/openvswitch/actions.c | 2 +-
+ net/openvswitch/datapath.c | 375 ++--
+ net/openvswitch/datapath.h | 50 +-
+ net/openvswitch/dp_notify.c | 8 +-
+ net/openvswitch/flow.c | 21 +-
+ net/openvswitch/flow.h | 3 +-
+ net/openvswitch/vport-internal_dev.c | 7 +-
+ net/openvswitch/vport-netdev.c | 2 +-
+ net/openvswitch/vport.c | 23 +-
+ net/openvswitch/vport.h | 7 +-
+ net/packet/Kconfig | 8 +
+ net/packet/Makefile | 2 +
+ net/packet/af_packet.c | 145 +-
+ net/packet/diag.c | 242 +++
+ net/packet/internal.h | 121 ++
+ net/phonet/socket.c | 6 +-
+ net/rds/tcp_connect.c | 4 +-
+ net/rds/tcp_listen.c | 4 +-
+ net/rds/tcp_recv.c | 4 +-
+ net/rds/tcp_send.c | 4 +-
+ net/rfkill/core.c | 14 +
+ net/sched/cls_api.c | 2 +-
+ net/sched/cls_basic.c | 3 +-
+ net/sched/cls_cgroup.c | 3 +-
+ net/sched/cls_flow.c | 19 +-
+ net/sched/cls_fw.c | 3 +-
+ net/sched/cls_route.c | 3 +-
+ net/sched/cls_rsvp.h | 3 +-
+ net/sched/cls_tcindex.c | 3 +-
+ net/sched/cls_u32.c | 3 +-
+ net/sched/sch_generic.c | 27 +-
+ net/sctp/associola.c | 25 +-
+ net/sctp/auth.c | 20 +-
+ net/sctp/bind_addr.c | 20 +-
+ net/sctp/chunk.c | 2 +-
+ net/sctp/endpointola.c | 25 +-
+ net/sctp/input.c | 115 +-
+ net/sctp/ipv6.c | 36 +-
+ net/sctp/objcnt.c | 8 +-
+ net/sctp/output.c | 2 +-
+ net/sctp/outqueue.c | 28 +-
+ net/sctp/primitive.c | 4 +-
+ net/sctp/proc.c | 61 +-
+ net/sctp/protocol.c | 454 ++---
+ net/sctp/sm_make_chunk.c | 61 +-
+ net/sctp/sm_sideeffect.c | 26 +-
+ net/sctp/sm_statefuns.c | 725 ++++----
+ net/sctp/sm_statetable.c | 17 +-
+ net/sctp/socket.c | 119 +-
+ net/sctp/sysctl.c | 198 +-
+ net/sctp/transport.c | 23 +-
+ net/sctp/ulpqueue.c | 18 +-
+ net/socket.c | 83 +-
+ net/tipc/bearer.c | 21 +-
+ net/tipc/config.c | 48 +-
+ net/tipc/core.c | 22 +-
+ net/tipc/core.h | 18 +-
+ net/tipc/eth_media.c | 29 +-
+ net/tipc/handler.c | 2 +-
+ net/tipc/link.c | 4 +-
+ net/tipc/name_table.c | 14 +-
+ net/tipc/net.c | 3 +-
+ net/tipc/net.h | 2 +-
+ net/tipc/subscr.c | 4 +-
+ net/unix/af_unix.c | 12 +-
+ net/wireless/chan.c | 7 +-
+ net/wireless/core.c | 53 +-
+ net/wireless/mlme.c | 10 +-
+ net/wireless/nl80211.c | 122 +-
+ net/wireless/radiotap.c | 2 +
+ net/wireless/util.c | 36 +-
+ net/xfrm/xfrm_policy.c | 83 +-
+ net/xfrm/xfrm_state.c | 2 +-
+ net/xfrm/xfrm_user.c | 9 +-
+ 623 files changed, 20194 insertions(+), 10063 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/cpsw.txt
+ create mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
+ create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt
+ delete mode 100644 drivers/net/ethernet/freescale/fsl_pq_mdio.h
+ create mode 100644 drivers/net/ethernet/freescale/xgmac_mdio.c
+ rename drivers/{ => net}/ieee802154/Kconfig (76%)
+ rename drivers/{ => net}/ieee802154/Makefile (74%)
+ rename drivers/{ => net}/ieee802154/at86rf230.c (98%)
+ rename drivers/{ => net}/ieee802154/fakehard.c (99%)
+ rename drivers/{ => net}/ieee802154/fakelb.c (100%)
+ create mode 100644 drivers/net/ieee802154/mrf24j40.c
+ create mode 100644 drivers/net/phy/mdio-mux-mmioreg.c
+ create mode 100644 drivers/net/wireless/b43/radio_2057.c
+ create mode 100644 drivers/net/wireless/b43/radio_2057.h
+ create mode 100644 drivers/net/wireless/mwifiex/uap_event.c
+ create mode 100644 drivers/net/wireless/mwifiex/uap_txrx.c
+ delete mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
+ create mode 100644 include/linux/netfilter_ipv6/ip6t_NPT.h
+ create mode 100644 include/linux/packet_diag.h
+ create mode 100644 include/linux/tcp_metrics.h
+ create mode 100644 include/net/netfilter/nf_nat_l3proto.h
+ create mode 100644 include/net/netfilter/nf_nat_l4proto.h
+ delete mode 100644 include/net/netfilter/nf_nat_protocol.h
+ delete mode 100644 include/net/netfilter/nf_nat_rule.h
+ create mode 100644 include/net/netns/sctp.h
+ rename net/ipv4/netfilter/{nf_nat_standalone.c => iptable_nat.c} (52%)
+ create mode 100644 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
+ delete mode 100644 net/ipv4/netfilter/nf_nat_rule.c
+ create mode 100644 net/ipv6/ip6_gre.c
+ create mode 100644 net/ipv6/netfilter/ip6t_MASQUERADE.c
+ create mode 100644 net/ipv6/netfilter/ip6t_NETMAP.c
+ create mode 100644 net/ipv6/netfilter/ip6t_NPT.c
+ create mode 100644 net/ipv6/netfilter/ip6t_REDIRECT.c
+ create mode 100644 net/ipv6/netfilter/ip6table_nat.c
+ create mode 100644 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
+ create mode 100644 net/ipv6/netfilter/nf_nat_proto_icmpv6.c
+ rename net/{ipv4 => }/netfilter/nf_nat_amanda.c (96%)
+ rename net/{ipv4 => }/netfilter/nf_nat_core.c (51%)
+ rename net/{ipv4 => }/netfilter/nf_nat_ftp.c (79%)
+ rename net/{ipv4 => }/netfilter/nf_nat_helper.c (82%)
+ rename net/{ipv4 => }/netfilter/nf_nat_irc.c (89%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_common.c (62%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_dccp.c (61%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_sctp.c (61%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_tcp.c (65%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_udp.c (60%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_udplite.c (58%)
+ rename net/{ipv4 => }/netfilter/nf_nat_proto_unknown.c (76%)
+ rename net/{ipv4 => }/netfilter/nf_nat_sip.c (62%)
+ rename net/{ipv4 => }/netfilter/nf_nat_tftp.c (97%)
+ delete mode 100644 net/netfilter/xt_NOTRACK.c
+ create mode 100644 net/netfilter/xt_nat.c
+ create mode 100644 net/packet/diag.c
+ create mode 100644 net/packet/internal.h
+$ git am -3 ../patches/0001-net-cope-with-sock_alloc_file-API-change.patch
+Applying: net: cope with sock_alloc_file() API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/net.h
+M net/9p/trans_fd.c
+M net/sctp/socket.c
+$ git add .
+$ git commit -v -a --amend
+[master af0ace9] Merge remote-tracking branch 'net-next/master'
+Merging wireless-next/master (a4881cc Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (1e00c2f Bluetooth: Remove unneeded zero init)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging net/bluetooth/hci_conn.c
+Auto-merging drivers/bluetooth/btusb.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_sdio.c | 3 +-
+ drivers/bluetooth/btusb.c | 2 +-
+ drivers/bluetooth/btwilink.c | 16 +------
+ include/net/bluetooth/hci.h | 3 ++
+ include/net/bluetooth/hci_core.h | 13 +-----
+ include/net/bluetooth/l2cap.h | 3 +-
+ include/net/bluetooth/mgmt.h | 9 ++++
+ net/bluetooth/af_bluetooth.c | 10 ++--
+ net/bluetooth/hci_conn.c | 96 ++++++++++++++++++++++++--------------
+ net/bluetooth/hci_core.c | 2 +-
+ net/bluetooth/hci_event.c | 32 ++++++++++---
+ net/bluetooth/l2cap_core.c | 17 +++----
+ net/bluetooth/mgmt.c | 9 ++--
+ 13 files changed, 123 insertions(+), 92 deletions(-)
+Merging mtd/master (2361f73 Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux)
+$ git merge mtd/master
+Removing drivers/mtd/maps/wr_sbc82xx_flash.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/mtdnand.tmpl | 2 -
+ .../devicetree/bindings/mtd/atmel-nand.txt | 40 +-
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 4 +
+ .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 +
+ .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 +
+ arch/arm/boot/dts/imx51.dtsi | 7 +
+ arch/arm/boot/dts/imx53.dtsi | 7 +
+ arch/arm/mach-imx/clk-imx51-imx53.c | 2 +
+ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +-
+ drivers/mtd/chips/Kconfig | 11 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++
+ drivers/mtd/devices/Kconfig | 2 +-
+ drivers/mtd/devices/m25p80.c | 6 +
+ drivers/mtd/devices/spear_smi.c | 54 +-
+ drivers/mtd/maps/Kconfig | 12 -
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ----
+ drivers/mtd/mtdcore.c | 9 +
+ drivers/mtd/mtdoops.c | 14 +-
+ drivers/mtd/nand/Kconfig | 62 +-
+ drivers/mtd/nand/Makefile | 2 +
+ drivers/mtd/nand/atmel_nand.c | 934 +++++++++++++++--
+ drivers/mtd/nand/atmel_nand_ecc.h | 114 ++-
+ drivers/mtd/nand/bcm_umi_bch.c | 6 +-
+ drivers/mtd/nand/bf5xx_nand.c | 6 +-
+ drivers/mtd/nand/cafe_nand.c | 13 +-
+ drivers/mtd/nand/denali.c | 12 +-
+ drivers/mtd/nand/docg4.c | 8 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 15 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 5 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 13 +-
+ drivers/mtd/nand/lpc32xx_mlc.c | 925 +++++++++++++++++
+ drivers/mtd/nand/lpc32xx_slc.c | 1059 ++++++++++++++++++++
+ drivers/mtd/nand/mxc_nand.c | 141 +--
+ drivers/mtd/nand/nand_base.c | 50 +-
+ drivers/mtd/nand/nand_bbt.c | 21 +-
+ drivers/mtd/nand/nand_ids.c | 7 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 5 +-
+ drivers/mtd/nand/sh_flctl.c | 302 +++---
+ drivers/mtd/tests/mtd_speedtest.c | 16 +-
+ drivers/mtd/tests/mtd_stresstest.c | 39 +-
+ include/linux/mtd/bbm.h | 7 +-
+ include/linux/mtd/mtd.h | 9 +-
+ include/linux/mtd/nand.h | 11 +-
+ include/linux/mtd/sh_flctl.h | 23 +-
+ 45 files changed, 3653 insertions(+), 677 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
+ delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
+Merging l2-mtd/master (44e42b9 mtd: mtd_nandecctest: ensure alignment requirement for bitops)
+$ git merge l2-mtd/master
+Auto-merging drivers/mtd/mtdpart.c
+Auto-merging arch/powerpc/configs/mpc83xx_defconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/davinci/nand.txt | 51 +++++
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 7 +
+ arch/arm/configs/bcmring_defconfig | 1 -
+ arch/arm/configs/cam60_defconfig | 1 -
+ arch/arm/configs/corgi_defconfig | 1 -
+ arch/arm/configs/ep93xx_defconfig | 1 -
+ arch/arm/configs/mini2440_defconfig | 1 -
+ arch/arm/configs/mv78xx0_defconfig | 1 -
+ arch/arm/configs/nhk8815_defconfig | 1 -
+ arch/arm/configs/orion5x_defconfig | 1 -
+ arch/arm/configs/pxa3xx_defconfig | 1 -
+ arch/arm/configs/spitz_defconfig | 1 -
+ arch/arm/mach-clps711x/autcpu12.c | 19 ++
+ arch/arm/plat-mxc/include/mach/mxc_nand.h | 2 +
+ arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
+ arch/mips/configs/rb532_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 -
+ arch/powerpc/configs/mpc83xx_defconfig | 1 -
+ drivers/mtd/Kconfig | 7 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/bcm47xxpart.c | 202 ++++++++++++++++++++
+ drivers/mtd/chips/cfi_cmdset_0001.c | 14 +-
+ drivers/mtd/cmdlinepart.c | 171 ++++++++---------
+ drivers/mtd/devices/doc2001plus.c | 14 +-
+ drivers/mtd/devices/docg3.c | 12 +-
+ drivers/mtd/devices/m25p80.c | 16 +-
+ drivers/mtd/devices/spear_smi.c | 87 ++-------
+ drivers/mtd/maps/Kconfig | 4 +-
+ drivers/mtd/maps/autcpu12-nvram.c | 153 ++++++++-------
+ drivers/mtd/maps/pci.c | 23 ---
+ drivers/mtd/maps/physmap_of.c | 14 ++
+ drivers/mtd/maps/rbtx4939-flash.c | 2 -
+ drivers/mtd/maps/uclinux.c | 15 +-
+ drivers/mtd/mtdcore.c | 14 +-
+ drivers/mtd/mtdpart.c | 5 +-
+ drivers/mtd/nand/Kconfig | 21 +-
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/ams-delta.c | 13 --
+ drivers/mtd/nand/atmel_nand.c | 62 +++++-
+ drivers/mtd/nand/au1550nd.c | 46 -----
+ drivers/mtd/nand/bcm_umi_bch.c | 17 +-
+ drivers/mtd/nand/bcm_umi_nand.c | 22 ---
+ drivers/mtd/nand/cafe_nand.c | 7 -
+ drivers/mtd/nand/cmx270_nand.c | 13 --
+ drivers/mtd/nand/davinci_nand.c | 72 ++++++-
+ drivers/mtd/nand/diskonchip.c | 63 ------
+ drivers/mtd/nand/docg4.c | 33 +---
+ drivers/mtd/nand/fsl_elbc_nand.c | 36 ----
+ drivers/mtd/nand/fsl_ifc_nand.c | 41 ----
+ drivers/mtd/nand/gpio.c | 39 ----
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 49 ++++-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 102 ++++++++--
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 7 +-
+ drivers/mtd/nand/lpc32xx_mlc.c | 59 +++---
+ drivers/mtd/nand/lpc32xx_slc.c | 84 ++++----
+ drivers/mtd/nand/mpc5121_nfc.c | 22 ---
+ drivers/mtd/nand/mxc_nand.c | 35 +++-
+ drivers/mtd/nand/nand_base.c | 69 +------
+ drivers/mtd/nand/nand_bbt.c | 116 +++++------
+ drivers/mtd/nand/nandsim.c | 16 --
+ drivers/mtd/nand/ndfc.c | 13 --
+ drivers/mtd/nand/nuc900_nand.c | 17 --
+ drivers/mtd/nand/omap2.c | 36 +---
+ drivers/mtd/nand/orion_nand.c | 1 -
+ drivers/mtd/nand/plat_nand.c | 5 +
+ drivers/mtd/nand/pxa3xx_nand.c | 7 -
+ drivers/mtd/nand/r852.c | 22 ---
+ drivers/mtd/nand/s3c2410.c | 191 ++++++++----------
+ drivers/mtd/nand/sh_flctl.c | 41 ++--
+ drivers/mtd/nand/socrates_nand.c | 19 --
+ drivers/mtd/nand/tmio_nand.c | 13 --
+ drivers/mtd/nand/txx9ndfmc.c | 13 --
+ drivers/mtd/nand/xway_nand.c | 201 +++++++++++++++++++
+ drivers/mtd/sm_ftl.c | 1 -
+ drivers/mtd/tests/mtd_nandecctest.c | 83 +++++---
+ fs/jffs2/super.c | 4 +
+ fs/jffs2/wbuf.c | 8 +-
+ include/linux/mtd/lpc32xx_mlc.h | 20 ++
+ include/linux/mtd/lpc32xx_slc.h | 20 ++
+ include/linux/mtd/nand.h | 14 +-
+ include/linux/mtd/sh_flctl.h | 2 +-
+ 82 files changed, 1382 insertions(+), 1242 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/davinci/nand.txt
+ create mode 100644 drivers/mtd/bcm47xxpart.c
+ create mode 100644 drivers/mtd/nand/xway_nand.c
+ create mode 100644 include/linux/mtd/lpc32xx_mlc.h
+ create mode 100644 include/linux/mtd/lpc32xx_slc.h
+Merging crypto/master (821873a hwrng: mxc-rnga - Access data via structure)
+$ git merge crypto/master
+Recorded preimage for 'crypto/Kconfig'
+Auto-merging drivers/crypto/caam/key_gen.c
+Auto-merging crypto/cast6_generic.c
+Auto-merging crypto/cast5_generic.c
+Auto-merging crypto/Kconfig
+CONFLICT (content): Merge conflict in crypto/Kconfig
+Auto-merging arch/powerpc/kernel/prom_init.c
+Auto-merging arch/powerpc/configs/ppc64_defconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'crypto/Kconfig'.
+[master d761f68] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 12 +
+ arch/arm/Makefile | 1 +
+ arch/arm/crypto/Makefile | 9 +
+ arch/arm/crypto/aes-armv4.S | 1112 ++++++++++++
+ arch/arm/crypto/aes_glue.c | 108 ++
+ arch/arm/crypto/sha1-armv4-large.S | 503 ++++++
+ arch/arm/crypto/sha1_glue.c | 179 ++
+ arch/powerpc/configs/ppc64_defconfig | 3 +-
+ arch/powerpc/configs/pseries_defconfig | 3 +-
+ arch/powerpc/kernel/prom_init.c | 4 +-
+ arch/s390/crypto/aes_s390.c | 5 -
+ arch/s390/crypto/des_s390.c | 10 -
+ arch/s390/crypto/ghash_s390.c | 1 -
+ arch/x86/crypto/Makefile | 4 +
+ arch/x86/crypto/aes_glue.c | 1 -
+ arch/x86/crypto/aesni-intel_glue.c | 258 ++-
+ arch/x86/crypto/blowfish_glue.c | 4 -
+ arch/x86/crypto/camellia_glue.c | 1382 ++++++++-------
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 376 ++++
+ arch/x86/crypto/cast5_avx_glue.c | 530 ++++++
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 383 ++++
+ arch/x86/crypto/cast6_avx_glue.c | 648 +++++++
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 -
+ arch/x86/crypto/salsa20_glue.c | 1 -
+ arch/x86/crypto/serpent_avx_glue.c | 10 -
+ arch/x86/crypto/serpent_sse2_glue.c | 10 -
+ arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 227 ++-
+ arch/x86/crypto/twofish_avx_glue.c | 10 -
+ arch/x86/crypto/twofish_glue.c | 1 -
+ arch/x86/crypto/twofish_glue_3way.c | 5 -
+ crypto/842.c | 182 ++
+ crypto/Kconfig | 75 +
+ crypto/Makefile | 5 +-
+ crypto/aes_generic.c | 1 -
+ crypto/ansi_cprng.c | 63 +-
+ crypto/anubis.c | 1 -
+ crypto/blowfish_generic.c | 1 -
+ crypto/camellia_generic.c | 1 -
+ crypto/{cast5.c => cast5_generic.c} | 80 +-
+ crypto/{cast6.c => cast6_generic.c} | 73 +-
+ crypto/crypto_null.c | 57 +-
+ crypto/crypto_user.c | 2 +-
+ crypto/deflate.c | 1 -
+ crypto/des_generic.c | 25 +-
+ crypto/fcrypt.c | 1 -
+ crypto/ghash-generic.c | 1 -
+ crypto/khazad.c | 1 -
+ crypto/krng.c | 1 -
+ crypto/lzo.c | 1 -
+ crypto/salsa20_generic.c | 1 -
+ crypto/seed.c | 1 -
+ crypto/serpent_generic.c | 53 +-
+ crypto/sha256_generic.c | 25 +-
+ crypto/sha512_generic.c | 20 +-
+ crypto/shash.c | 36 +
+ crypto/tcrypt.c | 82 +
+ crypto/tcrypt.h | 1 +
+ crypto/tea.c | 41 +-
+ crypto/testmgr.c | 210 +++
+ crypto/testmgr.h | 2538 +++++++++++++++++++++++++--
+ crypto/tgr192.c | 38 +-
+ crypto/twofish_generic.c | 1 -
+ crypto/vmac.c | 10 +-
+ crypto/wp512.c | 39 +-
+ drivers/char/hw_random/mxc-rnga.c | 108 +-
+ drivers/char/hw_random/octeon-rng.c | 17 +-
+ drivers/crypto/Kconfig | 22 +-
+ drivers/crypto/atmel-aes.c | 7 -
+ drivers/crypto/atmel-sha.c | 5 -
+ drivers/crypto/atmel-tdes.c | 6 -
+ drivers/crypto/caam/caamalg.c | 51 +-
+ drivers/crypto/caam/caamhash.c | 22 +-
+ drivers/crypto/caam/caamrng.c | 9 +-
+ drivers/crypto/caam/compat.h | 1 +
+ drivers/crypto/caam/key_gen.c | 4 +
+ drivers/crypto/geode-aes.c | 18 +-
+ drivers/crypto/nx/Kconfig | 26 +
+ drivers/crypto/nx/Makefile | 5 +-
+ drivers/crypto/nx/nx-842.c | 1617 +++++++++++++++++
+ drivers/crypto/nx/nx-aes-cbc.c | 1 -
+ drivers/crypto/nx/nx-aes-ccm.c | 2 -
+ drivers/crypto/nx/nx-aes-ctr.c | 2 -
+ drivers/crypto/nx/nx-aes-ecb.c | 1 -
+ drivers/crypto/nx/nx-aes-gcm.c | 2 -
+ drivers/crypto/omap-aes.c | 1 -
+ drivers/crypto/padlock-aes.c | 3 -
+ drivers/crypto/s5p-sss.c | 1 -
+ drivers/crypto/talitos.c | 442 ++---
+ drivers/crypto/tegra-aes.c | 2 -
+ drivers/crypto/ux500/hash/hash_core.c | 1 -
+ include/crypto/cast5.h | 27 +
+ include/crypto/cast6.h | 28 +
+ include/crypto/internal/hash.h | 2 +
+ include/linux/nx842.h | 11 +
+ 94 files changed, 10114 insertions(+), 1800 deletions(-)
+ create mode 100644 arch/arm/crypto/Makefile
+ create mode 100644 arch/arm/crypto/aes-armv4.S
+ create mode 100644 arch/arm/crypto/aes_glue.c
+ create mode 100644 arch/arm/crypto/sha1-armv4-large.S
+ create mode 100644 arch/arm/crypto/sha1_glue.c
+ create mode 100644 arch/x86/crypto/cast5-avx-x86_64-asm_64.S
+ create mode 100644 arch/x86/crypto/cast5_avx_glue.c
+ create mode 100644 arch/x86/crypto/cast6-avx-x86_64-asm_64.S
+ create mode 100644 arch/x86/crypto/cast6_avx_glue.c
+ create mode 100644 crypto/842.c
+ rename crypto/{cast5.c => cast5_generic.c} (95%)
+ rename crypto/{cast6.c => cast6_generic.c} (93%)
+ create mode 100644 drivers/crypto/nx/Kconfig
+ create mode 100644 drivers/crypto/nx/nx-842.c
+ create mode 100644 include/crypto/cast5.h
+ create mode 100644 include/crypto/cast6.h
+ create mode 100644 include/linux/nx842.h
+Merging drm/drm-next (95ca19c drm: udl: usb: Fix recursive Kconfig dependency)
+$ git merge drm/drm-next
+Auto-merging include/drm/drm_crtc.h
+Auto-merging drivers/gpu/drm/i915/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Removing drivers/gpu/drm/gma500/gem_glue.h
+Removing drivers/gpu/drm/gma500/gem_glue.c
+Auto-merging drivers/gpu/drm/drm_edid.c
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/drm.tmpl | 2835 +++++++++++++++++++------
+ drivers/gpu/drm/Kconfig | 2 +-
+ drivers/gpu/drm/ast/ast_drv.h | 1 -
+ drivers/gpu/drm/ast/ast_mode.c | 1 +
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 1 -
+ drivers/gpu/drm/drm_edid.c | 3 -
+ drivers/gpu/drm/drm_edid_load.c | 23 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +-
+ drivers/gpu/drm/drm_irq.c | 2 +-
+ drivers/gpu/drm/drm_vm.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_connector.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 13 -
+ drivers/gpu/drm/gma500/Makefile | 5 +-
+ drivers/gpu/drm/gma500/backlight.c | 45 +
+ drivers/gpu/drm/gma500/cdv_device.c | 72 +-
+ drivers/gpu/drm/gma500/cdv_intel_display.c | 236 +-
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 1951 +++++++++++++++++
+ drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 4 +-
+ drivers/gpu/drm/gma500/cdv_intel_lvds.c | 12 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 7 +
+ drivers/gpu/drm/gma500/gem.c | 9 +-
+ drivers/gpu/drm/gma500/gem_glue.c | 90 -
+ drivers/gpu/drm/gma500/gem_glue.h | 2 -
+ drivers/gpu/drm/gma500/intel_bios.c | 101 +
+ drivers/gpu/drm/gma500/intel_bios.h | 46 +
+ drivers/gpu/drm/gma500/mdfld_dsi_output.c | 13 +-
+ drivers/gpu/drm/gma500/mid_bios.c | 8 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi.c | 1 -
+ drivers/gpu/drm/gma500/opregion.c | 3 +-
+ drivers/gpu/drm/gma500/psb_device.c | 1 +
+ drivers/gpu/drm/gma500/psb_drv.h | 20 +-
+ drivers/gpu/drm/gma500/psb_intel_drv.h | 28 +-
+ drivers/gpu/drm/gma500/psb_intel_lvds.c | 13 +-
+ drivers/gpu/drm/gma500/psb_intel_reg.h | 197 +-
+ drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 -
+ drivers/gpu/drm/i2c/ch7006_drv.c | 16 +-
+ drivers/gpu/drm/i915/Makefile | 1 +
+ drivers/gpu/drm/i915/dvo.h | 10 +-
+ drivers/gpu/drm/i915/dvo_ch7017.c | 8 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c | 4 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 8 +-
+ drivers/gpu/drm/i915/dvo_ns2501.c | 573 +++++
+ drivers/gpu/drm/i915/dvo_sil164.c | 4 +-
+ drivers/gpu/drm/i915/dvo_tfp410.c | 4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 183 +-
+ drivers/gpu/drm/i915/i915_dma.c | 57 +-
+ drivers/gpu/drm/i915/i915_drv.c | 52 +-
+ drivers/gpu/drm/i915/i915_drv.h | 145 +-
+ drivers/gpu/drm/i915/i915_gem.c | 1377 ++++++------
+ drivers/gpu/drm/i915/i915_gem_context.c | 65 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 37 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 44 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 378 +---
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 21 +-
+ drivers/gpu/drm/i915/i915_irq.c | 143 +-
+ drivers/gpu/drm/i915/i915_reg.h | 322 +--
+ drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_trace.h | 10 +-
+ drivers/gpu/drm/i915/intel_crt.c | 35 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 85 +-
+ drivers/gpu/drm/i915/intel_display.c | 454 ++--
+ drivers/gpu/drm/i915/intel_dp.c | 181 +-
+ drivers/gpu/drm/i915/intel_drv.h | 80 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 21 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 54 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 2 +-
+ drivers/gpu/drm/i915/intel_modes.c | 1 -
+ drivers/gpu/drm/i915/intel_overlay.c | 60 +-
+ drivers/gpu/drm/i915/intel_pm.c | 252 +--
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 83 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 20 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 17 +-
+ drivers/gpu/drm/i915/intel_tv.c | 9 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 1 -
+ drivers/gpu/drm/mgag200/mgag200_mode.c | 1 -
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +-
+ drivers/gpu/drm/udl/udl_connector.c | 3 -
+ drivers/gpu/drm/udl/udl_fb.c | 22 +-
+ drivers/gpu/drm/udl/udl_gem.c | 7 -
+ drivers/staging/omapdrm/omap_connector.c | 5 +-
+ include/drm/drm_crtc.h | 2 -
+ include/drm/drm_sarea.h | 2 +
+ include/drm/i915_drm.h | 35 +-
+ 83 files changed, 7733 insertions(+), 2928 deletions(-)
+ create mode 100644 drivers/gpu/drm/gma500/cdv_intel_dp.c
+ delete mode 100644 drivers/gpu/drm/gma500/gem_glue.c
+ delete mode 100644 drivers/gpu/drm/gma500/gem_glue.h
+ create mode 100644 drivers/gpu/drm/i915/dvo_ns2501.c
+Merging sound/for-next (a8d372f ALSA: control: Fix missing VOLATILE flag at creating controls)
+$ git merge sound/for-next
+Auto-merging sound/usb/endpoint.c
+Auto-merging sound/pci/hda/patch_sigmatel.c
+Removing include/sound/version.h
+Merge made by the 'recursive' strategy.
+ Documentation/sound/alsa/HD-Audio-Models.txt | 3 +-
+ include/sound/ad1816a.h | 9 +-
+ include/sound/emu10k1.h | 4 +-
+ include/sound/initval.h | 14 +
+ include/sound/version.h | 3 -
+ sound/core/control.c | 1 +
+ sound/core/info.c | 7 +-
+ sound/core/info_oss.c | 3 +-
+ sound/core/oss/mixer_oss.c | 2 +
+ sound/core/seq/seq_device.c | 2 +
+ sound/core/sound.c | 3 +-
+ sound/drivers/opl4/opl4_synth.c | 9 +-
+ sound/isa/Kconfig | 12 +
+ sound/isa/Makefile | 2 +
+ sound/isa/ad1816a/ad1816a.c | 64 ++--
+ sound/isa/ad1816a/ad1816a_lib.c | 38 +-
+ sound/isa/cmi8328.c | 483 ++++++++++++++++++++++++++
+ sound/isa/gus/interwave.c | 5 +-
+ sound/isa/opti9xx/miro.c | 15 +-
+ sound/isa/opti9xx/opti92x-ad1848.c | 14 +-
+ sound/isa/sb/emu8000.c | 15 +-
+ sound/last.c | 1 -
+ sound/pci/ali5451/ali5451.c | 10 +-
+ sound/pci/als300.c | 2 +-
+ sound/pci/als4000.c | 4 +-
+ sound/pci/asihpi/asihpi.c | 2 +-
+ sound/pci/atiixp.c | 6 +-
+ sound/pci/atiixp_modem.c | 6 +-
+ sound/pci/azt3328.c | 6 +-
+ sound/pci/ca0106/ca0106.h | 4 +-
+ sound/pci/ca0106/ca0106_main.c | 2 +-
+ sound/pci/ca0106/ca0106_mixer.c | 4 +-
+ sound/pci/cmipci.c | 6 +-
+ sound/pci/cs4281.c | 6 +-
+ sound/pci/cs46xx/cs46xx.c | 2 +-
+ sound/pci/cs46xx/cs46xx.h | 2 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 8 +-
+ sound/pci/cs46xx/cs46xx_lib.h | 2 +-
+ sound/pci/cs46xx/dsp_spos.c | 8 +-
+ sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +-
+ sound/pci/cs5530.c | 3 +-
+ sound/pci/cs5535audio/Makefile | 2 +-
+ sound/pci/cs5535audio/cs5535audio.c | 2 +-
+ sound/pci/ctxfi/ctatc.c | 4 +-
+ sound/pci/ctxfi/ctatc.h | 2 +-
+ sound/pci/ctxfi/cthardware.h | 2 +-
+ sound/pci/ctxfi/cthw20k1.c | 4 +-
+ sound/pci/ctxfi/cthw20k2.c | 4 +-
+ sound/pci/ctxfi/ctmixer.c | 4 +-
+ sound/pci/ctxfi/ctmixer.h | 2 +-
+ sound/pci/ctxfi/ctpcm.c | 2 +-
+ sound/pci/ctxfi/xfi.c | 2 +-
+ sound/pci/echoaudio/echoaudio.c | 12 +-
+ sound/pci/echoaudio/echoaudio.h | 2 +-
+ sound/pci/emu10k1/emu10k1.c | 4 +-
+ sound/pci/emu10k1/emu10k1_main.c | 8 +-
+ sound/pci/emu10k1/emufx.c | 2 +-
+ sound/pci/emu10k1/memory.c | 4 +-
+ sound/pci/emu10k1/p16v.c | 2 +-
+ sound/pci/ens1370.c | 4 +-
+ sound/pci/es1938.c | 6 +-
+ sound/pci/es1968.c | 12 +-
+ sound/pci/fm801.c | 6 +-
+ sound/pci/hda/Kconfig | 10 +-
+ sound/pci/hda/hda_codec.c | 234 +++++++------
+ sound/pci/hda/hda_codec.h | 80 ++++-
+ sound/pci/hda/hda_generic.c | 8 +-
+ sound/pci/hda/hda_hwdep.c | 43 +--
+ sound/pci/hda/hda_intel.c | 212 +++++++++--
+ sound/pci/hda/hda_local.h | 2 +-
+ sound/pci/hda/hda_proc.c | 9 +-
+ sound/pci/hda/hda_trace.h | 26 ++
+ sound/pci/hda/patch_analog.c | 76 +++-
+ sound/pci/hda/patch_cirrus.c | 2 -
+ sound/pci/hda/patch_conexant.c | 7 +-
+ sound/pci/hda/patch_hdmi.c | 64 +++-
+ sound/pci/hda/patch_realtek.c | 16 +-
+ sound/pci/hda/patch_sigmatel.c | 11 +-
+ sound/pci/hda/patch_via.c | 5 +-
+ sound/pci/ice1712/aureon.c | 4 +-
+ sound/pci/ice1712/ice1712.h | 2 +-
+ sound/pci/ice1712/ice1724.c | 4 +-
+ sound/pci/ice1712/juli.c | 4 +-
+ sound/pci/ice1712/prodigy_hifi.c | 4 +-
+ sound/pci/intel8x0.c | 4 +-
+ sound/pci/intel8x0m.c | 4 +-
+ sound/pci/korg1212/korg1212.c | 4 +-
+ sound/pci/maestro3.c | 10 +-
+ sound/pci/nm256/nm256.c | 4 +-
+ sound/pci/oxygen/oxygen.c | 2 +-
+ sound/pci/oxygen/oxygen.h | 2 +-
+ sound/pci/oxygen/oxygen_lib.c | 4 +-
+ sound/pci/oxygen/virtuoso.c | 2 +-
+ sound/pci/pcxhr/pcxhr.c | 24 ++
+ sound/pci/pcxhr/pcxhr_hwdep.c | 6 +-
+ sound/pci/riptide/riptide.c | 6 +-
+ sound/pci/sis7019.c | 6 +-
+ sound/pci/trident/trident.c | 2 +-
+ sound/pci/trident/trident_main.c | 4 +-
+ sound/pci/via82xx.c | 10 +-
+ sound/pci/via82xx_modem.c | 4 +-
+ sound/pci/vx222/vx222.c | 2 +-
+ sound/pci/ymfpci/ymfpci.c | 2 +-
+ sound/pci/ymfpci/ymfpci.h | 2 +-
+ sound/pci/ymfpci/ymfpci_main.c | 8 +-
+ sound/usb/6fire/firmware.c | 5 +-
+ sound/usb/card.h | 4 +-
+ sound/usb/endpoint.c | 8 +
+ sound/usb/helper.c | 5 +
+ sound/usb/quirks-table.h | 53 +++
+ sound/usb/quirks.c | 24 ++
+ sound/usb/quirks.h | 10 +
+ 112 files changed, 1438 insertions(+), 492 deletions(-)
+ delete mode 100644 include/sound/version.h
+ create mode 100644 sound/isa/cmi8328.c
+Merging sound-asoc/for-next (4a11c34 Merge branch 'for-3.7' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/omap/overo.c
+Removing sound/soc/omap/omap3evm.c
+Removing sound/soc/omap/omap3beagle.c
+Removing sound/soc/omap/igep0020.c
+Auto-merging include/sound/tegra_wm8903.h
+Auto-merging include/linux/platform_data/davinci_asp.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/sound/cs4270.txt | 21 +
+ .../bindings/sound/davinci-mcasp-audio.txt | 45 +
+ .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++
+ .../devicetree/bindings/sound/omap-mcbsp.txt | 37 +
+ .../devicetree/bindings/sound/omap-twl4030.txt | 17 +
+ .../devicetree/bindings/sound/tlv320aic3x.txt | 20 +
+ arch/arm/mach-davinci/asp.h | 49 +
+ arch/arm/mach-davinci/davinci.h | 3 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 8 +-
+ arch/arm/mach-davinci/devices.c | 11 -
+ arch/arm/mach-davinci/dm355.c | 2 +-
+ arch/arm/mach-davinci/dm365.c | 2 +-
+ arch/arm/mach-davinci/dm644x.c | 2 +-
+ arch/arm/mach-davinci/dm646x.c | 2 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 2 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 13 +
+ arch/arm/mach-omap2/board-cm-t35.c | 1 +
+ arch/arm/mach-omap2/board-devkit8000.c | 1 +
+ arch/arm/mach-omap2/board-igep0020.c | 1 +
+ arch/arm/mach-omap2/board-omap3beagle.c | 1 +
+ arch/arm/mach-omap2/board-omap3evm.c | 1 +
+ arch/arm/mach-omap2/board-overo.c | 1 +
+ arch/arm/mach-omap2/mcbsp.c | 126 +--
+ arch/arm/mach-omap2/twl-common.c | 27 +
+ arch/arm/mach-omap2/twl-common.h | 2 +
+ arch/arm/plat-omap/include/plat/mcbsp.h | 2 -
+ arch/blackfin/mach-bf527/boards/ezkit.c | 20 +
+ arch/blackfin/mach-bf533/boards/stamp.c | 20 +
+ arch/blackfin/mach-bf537/boards/stamp.c | 20 +
+ arch/blackfin/mach-bf561/boards/ezkit.c | 20 +
+ arch/blackfin/mach-bf609/boards/ezkit.c | 19 +
+ include/linux/atmel-ssc.h | 1 +
+ include/linux/mfd/wm8994/pdata.h | 4 +
+ .../linux/platform_data/davinci_asp.h | 74 +-
+ include/linux/platform_data/omap-twl4030.h | 32 +
+ include/sound/compress_driver.h | 1 +
+ include/sound/soc-dai.h | 3 +
+ include/sound/soc-dapm.h | 2 +-
+ include/sound/soc.h | 16 +-
+ .../sound/tegra_wm8903.h | 7 +-
+ include/sound/wm0010.h | 27 +
+ include/sound/wm8993.h | 4 +
+ sound/soc/Kconfig | 3 +-
+ sound/soc/Makefile | 4 +-
+ sound/soc/blackfin/bf5xx-ad1836.c | 73 +-
+ sound/soc/{ep93xx => cirrus}/Kconfig | 0
+ sound/soc/{ep93xx => cirrus}/Makefile | 0
+ sound/soc/{ep93xx => cirrus}/edb93xx.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c | 0
+ sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h | 0
+ sound/soc/{ep93xx => cirrus}/simone.c | 0
+ sound/soc/{ep93xx => cirrus}/snappercl15.c | 0
+ sound/soc/codecs/Kconfig | 4 +
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/ab8500-codec.c | 6 +-
+ sound/soc/codecs/ad1836.c | 12 +-
+ sound/soc/codecs/adau1373.c | 12 +-
+ sound/soc/codecs/adau1701.c | 12 +-
+ sound/soc/codecs/ak4671.c | 12 +-
+ sound/soc/codecs/arizona.c | 68 +-
+ sound/soc/codecs/arizona.h | 6 +-
+ sound/soc/codecs/cs4270.c | 40 +-
+ sound/soc/codecs/cs42l51.c | 19 +-
+ sound/soc/codecs/cs42l52.c | 1 -
+ sound/soc/codecs/isabelle.c | 1 -
+ sound/soc/codecs/lm4857.c | 12 +-
+ sound/soc/codecs/max98088.c | 18 +-
+ sound/soc/codecs/max98095.c | 18 +-
+ sound/soc/codecs/max9850.c | 12 +-
+ sound/soc/codecs/max9877.c | 12 +-
+ sound/soc/codecs/sta32x.c | 12 +-
+ sound/soc/codecs/sta529.c | 2 +-
+ sound/soc/codecs/tlv320aic26.c | 12 +-
+ sound/soc/codecs/tlv320aic32x4.c | 19 +-
+ sound/soc/codecs/tlv320aic3x.c | 49 +-
+ sound/soc/codecs/tlv320dac33.c | 19 +-
+ sound/soc/codecs/tpa6130a2.c | 13 +-
+ sound/soc/codecs/wm0010.c | 944 ++++++++++++++++++++
+ sound/soc/codecs/wm2000.c | 12 +-
+ sound/soc/codecs/wm2200.c | 12 +-
+ sound/soc/codecs/wm5102.c | 38 +
+ sound/soc/codecs/wm5110.c | 4 +
+ sound/soc/codecs/wm8770.c | 19 +-
+ sound/soc/codecs/wm8903.c | 18 +-
+ sound/soc/codecs/wm8940.c | 18 +-
+ sound/soc/codecs/wm8955.c | 18 +-
+ sound/soc/codecs/wm8958-dsp2.c | 28 +-
+ sound/soc/codecs/wm8960.c | 18 +-
+ sound/soc/codecs/wm8961.c | 18 +-
+ sound/soc/codecs/wm8971.c | 18 +-
+ sound/soc/codecs/wm8974.c | 18 +-
+ sound/soc/codecs/wm8978.c | 18 +-
+ sound/soc/codecs/wm8991.c | 18 +-
+ sound/soc/codecs/wm8993.c | 2 +
+ sound/soc/codecs/wm8994.c | 132 ++-
+ sound/soc/codecs/wm8994.h | 12 +-
+ sound/soc/codecs/wm9090.c | 12 +-
+ sound/soc/codecs/wm9712.c | 11 +-
+ sound/soc/codecs/wm_hubs.c | 114 ++-
+ sound/soc/codecs/wm_hubs.h | 6 +
+ sound/soc/davinci/davinci-evm.c | 19 +-
+ sound/soc/davinci/davinci-i2s.c | 13 +-
+ sound/soc/davinci/davinci-mcasp.c | 260 +++++-
+ sound/soc/davinci/davinci-mcasp.h | 6 +-
+ sound/soc/davinci/davinci-pcm.c | 24 +-
+ sound/soc/davinci/davinci-pcm.h | 6 +-
+ sound/soc/davinci/davinci-sffsdr.c | 2 +-
+ sound/soc/davinci/davinci-vcif.c | 8 +
+ sound/soc/fsl/imx-sgtl5000.c | 2 +-
+ sound/soc/fsl/imx-ssi.c | 25 +-
+ sound/soc/mid-x86/mfld_machine.c | 9 +
+ sound/soc/mid-x86/sst_dsp.h | 134 +++
+ sound/soc/mid-x86/sst_platform.c | 204 ++++-
+ sound/soc/mid-x86/sst_platform.h | 26 +-
+ sound/soc/mxs/mxs-saif.c | 20 +-
+ sound/soc/omap/Kconfig | 48 +-
+ sound/soc/omap/Makefile | 10 +-
+ sound/soc/omap/am3517evm.c | 20 +-
+ sound/soc/omap/igep0020.c | 120 ---
+ sound/soc/omap/mcbsp.c | 54 +-
+ sound/soc/omap/mcbsp.h | 3 -
+ sound/soc/omap/omap-abe-twl6040.c | 145 ++-
+ sound/soc/omap/omap-mcbsp.c | 170 ++--
+ sound/soc/omap/omap-mcbsp.h | 20 -
+ sound/soc/omap/omap-mcpdm.c | 52 +-
+ sound/soc/omap/omap-twl4030.c | 188 ++++
+ sound/soc/omap/omap3beagle.c | 150 ----
+ sound/soc/omap/omap3evm.c | 118 ---
+ sound/soc/omap/overo.c | 122 ---
+ sound/soc/samsung/Kconfig | 11 +-
+ sound/soc/samsung/Makefile | 2 +
+ sound/soc/samsung/bells.c | 346 +++++++
+ sound/soc/samsung/speyside.c | 42 +-
+ sound/soc/soc-compress.c | 294 ++++++
+ sound/soc/soc-core.c | 80 +-
+ sound/soc/soc-dapm.c | 27 +-
+ sound/soc/soc-jack.c | 6 -
+ sound/soc/spear/spear_pcm.c | 2 +-
+ sound/soc/tegra/tegra_alc5632.c | 1 -
+ sound/soc/tegra/tegra_wm8903.c | 3 +-
+ sound/soc/ux500/ux500_msp_dai.c | 3 +
+ sound/soc/ux500/ux500_msp_i2s.c | 27 +-
+ 144 files changed, 3857 insertions(+), 1704 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/omap-mcbsp.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/omap-twl4030.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+ create mode 100644 arch/arm/mach-davinci/asp.h
+ rename arch/arm/mach-davinci/include/mach/asp.h => include/linux/platform_data/davinci_asp.h (56%)
+ create mode 100644 include/linux/platform_data/omap-twl4030.h
+ rename arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h => include/sound/tegra_wm8903.h (89%)
+ create mode 100644 include/sound/wm0010.h
+ rename sound/soc/{ep93xx => cirrus}/Kconfig (100%)
+ rename sound/soc/{ep93xx => cirrus}/Makefile (100%)
+ rename sound/soc/{ep93xx => cirrus}/edb93xx.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-ac97.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-i2s.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/ep93xx-pcm.h (100%)
+ rename sound/soc/{ep93xx => cirrus}/simone.c (100%)
+ rename sound/soc/{ep93xx => cirrus}/snappercl15.c (100%)
+ create mode 100644 sound/soc/codecs/wm0010.c
+ create mode 100644 sound/soc/mid-x86/sst_dsp.h
+ delete mode 100644 sound/soc/omap/igep0020.c
+ create mode 100644 sound/soc/omap/omap-twl4030.c
+ delete mode 100644 sound/soc/omap/omap3beagle.c
+ delete mode 100644 sound/soc/omap/omap3evm.c
+ delete mode 100644 sound/soc/omap/overo.c
+ create mode 100644 sound/soc/samsung/bells.c
+ create mode 100644 sound/soc/soc-compress.c
+Merging quilt/rr (7421bb4 virtio: support reserved vqs)
+$ git merge quilt/rr
+Resolved 'arch/alpha/Kconfig' using previous resolution.
+Resolved 'arch/mips/kernel/module.c' using previous resolution.
+Resolved 'arch/s390/Kconfig' using previous resolution.
+Resolved 'arch/xtensa/Kconfig' using previous resolution.
+Auto-merging arch/xtensa/Kconfig
+CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
+Auto-merging arch/unicore32/Kconfig
+Removing arch/sparc/include/asm/module.h
+Auto-merging arch/s390/Kconfig
+CONFLICT (content): Merge conflict in arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/kernel/module.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/module.c
+Auto-merging arch/mips/kernel/Makefile
+Auto-merging arch/mips/include/asm/module.h
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/m68k/Kconfig
+Removing arch/m32r/include/asm/module.h
+Removing arch/h8300/include/asm/module.h
+Removing arch/cris/include/asm/module.h
+Auto-merging arch/cris/Kconfig
+Auto-merging arch/c6x/Kconfig
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/alpha/Kconfig
+CONFLICT (content): Merge conflict in arch/alpha/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 08d6dd9] Merge branch 'quilt/rr'
+$ git diff -M --stat --summary HEAD^..
+ arch/Kconfig | 19 ++
+ arch/alpha/Kconfig | 2 +
+ arch/alpha/include/asm/module.h | 10 +-
+ arch/arm/Kconfig | 2 +
+ arch/arm/include/asm/module.h | 8 +-
+ arch/avr32/Kconfig | 2 +
+ arch/avr32/include/asm/module.h | 6 +-
+ arch/blackfin/Kconfig | 2 +
+ arch/blackfin/include/asm/module.h | 4 +-
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/module.h | 12 +-
+ arch/cris/Kconfig | 1 +
+ arch/cris/include/asm/Kbuild | 2 +
+ arch/cris/include/asm/module.h | 9 -
+ arch/frv/include/asm/module.h | 8 +-
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/Kbuild | 2 +
+ arch/h8300/include/asm/module.h | 11 -
+ arch/hexagon/Kconfig | 1 +
+ arch/ia64/Kconfig | 2 +
+ arch/ia64/include/asm/module.h | 6 +-
+ arch/m32r/Kconfig | 1 +
+ arch/m32r/include/asm/Kbuild | 2 +
+ arch/m32r/include/asm/module.h | 10 -
+ arch/m32r/kernel/module.c | 15 --
+ arch/m68k/Kconfig | 3 +
+ arch/m68k/include/asm/module.h | 6 +-
+ arch/microblaze/Kconfig | 1 +
+ arch/mips/Kconfig | 3 +
+ arch/mips/include/asm/module.h | 10 +-
+ arch/mips/kernel/Makefile | 1 +
+ arch/mips/kernel/module-rela.c | 145 +++++++++++++
+ arch/mips/kernel/module.c | 121 +----------
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/module.h | 7 +-
+ arch/openrisc/Kconfig | 1 +
+ arch/parisc/Kconfig | 2 +
+ arch/parisc/include/asm/module.h | 16 +-
+ arch/powerpc/Kconfig | 2 +
+ arch/powerpc/include/asm/module.h | 7 +-
+ arch/s390/Kconfig | 2 +
+ arch/s390/include/asm/module.h | 18 +-
+ arch/score/Kconfig | 2 +
+ arch/score/include/asm/module.h | 6 +-
+ arch/score/kernel/module.c | 10 -
+ arch/sh/Kconfig | 2 +
+ arch/sh/include/asm/module.h | 14 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/module.h | 24 ---
+ arch/tile/Kconfig | 1 +
+ arch/unicore32/Kconfig | 1 +
+ arch/x86/Kconfig | 2 +
+ arch/x86/um/Kconfig | 2 +
+ arch/xtensa/Kconfig | 1 +
+ arch/xtensa/include/asm/module.h | 9 +-
+ drivers/block/virtio_blk.c | 303 +++++++++++++++++++++++----
+ drivers/char/virtio_console.c | 198 +++++++++++++++--
+ drivers/lguest/lguest_device.c | 5 +-
+ drivers/remoteproc/remoteproc_virtio.c | 5 +-
+ drivers/s390/kvm/kvm_virtio.c | 5 +-
+ drivers/virtio/Kconfig | 5 +-
+ drivers/virtio/virtio_mmio.c | 15 +-
+ drivers/virtio/virtio_pci.c | 64 +++++-
+ drivers/virtio/virtio_ring.c | 14 +-
+ include/asm-generic/module.h | 40 +++-
+ include/linux/moduleloader.h | 36 +++-
+ include/linux/virtio.h | 2 +
+ include/linux/virtio_config.h | 23 ++
+ include/linux/virtio_ring.h | 3 +-
+ kernel/module.c | 24 +--
+ kernel/trace/trace.c | 8 +-
+ tools/virtio/virtio-trace/Makefile | 13 ++
+ tools/virtio/virtio-trace/README | 118 +++++++++++
+ tools/virtio/virtio-trace/trace-agent-ctl.c | 137 ++++++++++++
+ tools/virtio/virtio-trace/trace-agent-rw.c | 192 +++++++++++++++++
+ tools/virtio/virtio-trace/trace-agent.c | 270 ++++++++++++++++++++++++
+ tools/virtio/virtio-trace/trace-agent.h | 75 +++++++
+ 78 files changed, 1684 insertions(+), 432 deletions(-)
+ delete mode 100644 arch/cris/include/asm/module.h
+ delete mode 100644 arch/h8300/include/asm/module.h
+ delete mode 100644 arch/m32r/include/asm/module.h
+ create mode 100644 arch/mips/kernel/module-rela.c
+ delete mode 100644 arch/sparc/include/asm/module.h
+ create mode 100644 tools/virtio/virtio-trace/Makefile
+ create mode 100644 tools/virtio/virtio-trace/README
+ create mode 100644 tools/virtio/virtio-trace/trace-agent-ctl.c
+ create mode 100644 tools/virtio/virtio-trace/trace-agent-rw.c
+ create mode 100644 tools/virtio/virtio-trace/trace-agent.c
+ create mode 100644 tools/virtio/virtio-trace/trace-agent.h
+Merging input/next (caaa357 Input: Add KD[GS]KBDIACRUC ioctls to the compatible list)
+$ git merge input/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/input/gpio-keys-polled.txt | 38 ++++
+ .../devicetree/bindings/input/rotary-encoder.txt | 36 ++++
+ drivers/input/apm-power.c | 2 +-
+ drivers/input/ff-core.c | 4 +-
+ drivers/input/ff-memless.c | 14 +-
+ drivers/input/input.c | 43 +++--
+ drivers/input/joydev.c | 2 +-
+ drivers/input/keyboard/gpio_keys.c | 169 +++++++++--------
+ drivers/input/keyboard/gpio_keys_polled.c | 146 +++++++++++++--
+ drivers/input/keyboard/omap-keypad.c | 8 +-
+ drivers/input/keyboard/samsung-keypad.c | 10 +-
+ drivers/input/keyboard/tegra-kbc.c | 2 +-
+ drivers/input/misc/rotary_encoder.c | 140 +++++++++-----
+ drivers/input/misc/twl4030-pwrbutton.c | 1 +
+ drivers/input/misc/uinput.c | 197 ++++++++++++--------
+ drivers/input/mousedev.c | 9 +-
+ drivers/input/sparse-keymap.c | 4 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 2 +-
+ fs/compat_ioctl.c | 2 +
+ .../mach/kbc.h => include/linux/input/tegra_kbc.h | 0
+ include/linux/uinput.h | 27 +--
+ 21 files changed, 583 insertions(+), 273 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/gpio-keys-polled.txt
+ create mode 100644 Documentation/devicetree/bindings/input/rotary-encoder.txt
+ rename arch/arm/mach-tegra/include/mach/kbc.h => include/linux/input/tegra_kbc.h (100%)
+Merging input-mt/for-next (4cbe5a5 Linux 3.6-rc4)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next)
+$ git merge cgroup/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging block/for-next (79df9b4 Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus)
+$ git merge block/for-next
+Already up-to-date.
+Merging quilt/device-mapper (057d040 Overflow checking in dm-verity was not sufficient. It would check overflow if sector_t was smaller than long long but not if sector_t and long long have the same size. This patch implements proper overflow checking.)
+$ git merge quilt/device-mapper
+Merge made by the 'recursive' strategy.
+ drivers/md/dm-verity.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (0d4de8f mmc: via-sdmmc: Use module_pci_driver)
+$ git merge mmc/mmc-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/atmel-hsmci.txt | 68 +++++++
+ Documentation/devicetree/bindings/mmc/mmc.txt | 9 +-
+ Documentation/devicetree/bindings/mmc/pxa-mmc.txt | 25 +++
+ .../devicetree/bindings/mmc/sdhci-dove.txt | 14 ++
+ MAINTAINERS | 6 +-
+ drivers/mmc/core/core.c | 8 +-
+ drivers/mmc/core/debugfs.c | 2 +-
+ drivers/mmc/host/atmel-mci.c | 85 +++++++-
+ drivers/mmc/host/bfin_sdh.c | 210 +++++++++++++-------
+ drivers/mmc/host/dw_mmc-pci.c | 13 +-
+ drivers/mmc/host/dw_mmc-pltfm.c | 4 +-
+ drivers/mmc/host/dw_mmc.c | 2 +-
+ drivers/mmc/host/mmc_spi.c | 15 +-
+ drivers/mmc/host/omap.c | 39 ++--
+ drivers/mmc/host/omap_hsmmc.c | 122 +++---------
+ drivers/mmc/host/pxamci.c | 52 +++++
+ drivers/mmc/host/sdhci-dove.c | 8 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 36 +++-
+ drivers/mmc/host/sdhci-pci.c | 19 +-
+ drivers/mmc/host/sdhci-pxav2.c | 6 +-
+ drivers/mmc/host/sdhci-pxav3.c | 8 +-
+ drivers/mmc/host/sdhci-s3c.c | 14 +-
+ drivers/mmc/host/sdhci-tegra.c | 7 +-
+ drivers/mmc/host/sdhci.c | 188 +++++++++++-------
+ drivers/mmc/host/via-sdmmc.c | 16 +-
+ drivers/mmc/host/vub300.c | 4 +-
+ include/linux/mmc/host.h | 1 +
+ include/linux/mmc/sdhci.h | 3 +-
+ 28 files changed, 642 insertions(+), 342 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
+Merging kgdb/kgdb-next (15d7ea0 kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+ arch/mips/kernel/kgdb.c | 9 +++++++++
+ arch/x86/kernel/kgdb.c | 2 ++
+ drivers/tty/serial/kgdboc.c | 3 ++-
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+Merging slab/for-next (da9f26d Merge branch 'slab/common-for-cgroups' into for-next)
+$ git merge slab/for-next
+Auto-merging mm/slab.c
+Merge made by the 'recursive' strategy.
+ include/linux/slab_def.h | 1 -
+ mm/slab.c | 258 ++++++++++++++++++----------------------------
+ mm/slab.h | 19 +++-
+ mm/slab_common.c | 159 ++++++++++++++++++++--------
+ mm/slob.c | 60 +++++------
+ mm/slub.c | 176 ++++++++++++++-----------------
+ mm/util.c | 35 ++++---
+ 7 files changed, 357 insertions(+), 351 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 35dac33 Merge remote-tracking branch 'kgdb/kgdb-next'
+Merging refs/next/20120905/slab
+$ git merge refs/next/20120905/slab
+Auto-merging mm/slab.c
+Merge made by the 'recursive' strategy.
+ include/linux/slab_def.h | 1 -
+ mm/slab.c | 7 ----
+ mm/slab_common.c | 97 +++++++++++++++++++++++-----------------------
+ mm/slub.c | 33 +++++++++-------
+ mm/util.c | 35 ++++++++++-------
+ 5 files changed, 89 insertions(+), 84 deletions(-)
+Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (eef0978 md: avoid taking the mutex on some ioctls.)
+$ git merge md/for-next
+Auto-merging fs/bio.c
+Merge made by the 'recursive' strategy.
+ drivers/md/linear.c | 25 ++-
+ drivers/md/md.c | 94 +++++++----
+ drivers/md/md.h | 15 +-
+ drivers/md/multipath.c | 3 +-
+ drivers/md/raid0.c | 19 ++-
+ drivers/md/raid1.c | 23 ++-
+ drivers/md/raid10.c | 30 +++-
+ drivers/md/raid5.c | 411 +++++++++++++++++++++++++++++++++++++++++++++---
+ drivers/md/raid5.h | 19 +++
+ fs/bio.c | 22 +--
+ 10 files changed, 585 insertions(+), 76 deletions(-)
+Merging mfd/for-next (092369e mfd: lpc_ich: Fix a 3.5 kernel regression for iTCO_wdt driver)
+$ git merge mfd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/mfd/lpc_ich.c | 20 +----
+ drivers/mfd/tps65217.c | 130 +++++++++++---------------------
+ drivers/regulator/tps65217-regulator.c | 124 ++++++++++++++++++++++++++----
+ include/linux/mfd/tps65217.h | 12 ++-
+ 4 files changed, 162 insertions(+), 124 deletions(-)
+Merging battery/master (2815b78 power_supply: Add new power supply properties CHARGE_CURRENT/VOLTAGE_MAX)
+$ git merge battery/master
+Merge made by the 'recursive' strategy.
+ Documentation/power/power_supply_class.txt | 7 +++++++
+ drivers/power/Kconfig | 1 -
+ drivers/power/ab8500_btemp.c | 1 +
+ drivers/power/ab8500_charger.c | 1 +
+ drivers/power/ab8500_fg.c | 1 +
+ drivers/power/bq27x00_battery.c | 3 ++-
+ drivers/power/charger-manager.c | 21 ++++++++++++++++++---
+ drivers/power/da9030_battery.c | 4 ++--
+ drivers/power/da9052-battery.c | 9 ++++++++-
+ drivers/power/ds2781_battery.c | 28 +++++-----------------------
+ drivers/power/lp8727_charger.c | 16 +++++++++-------
+ drivers/power/power_supply_sysfs.c | 3 +++
+ drivers/power/twl4030_charger.c | 20 ++++++++++----------
+ drivers/power/wm97xx_battery.c | 4 +++-
+ include/linux/power/charger-manager.h | 5 +----
+ include/linux/power_supply.h | 5 +++++
+ 16 files changed, 76 insertions(+), 53 deletions(-)
+Merging fbdev/fbdev-next (75435c7 video: exynos_dp: move setting analog parameter and interrupt to after sw reset)
+$ git merge fbdev/fbdev-next
+Merge made by the 'recursive' strategy.
+ drivers/video/amifb.c | 2 -
+ drivers/video/bf537-lq035.c | 12 +-
+ drivers/video/bf54x-lq043fb.c | 8 +-
+ drivers/video/cobalt_lcdfb.c | 5 +-
+ drivers/video/da8xx-fb.c | 128 +++++++++----
+ drivers/video/ep93xx-fb.c | 17 +-
+ drivers/video/epson1355fb.c | 16 +-
+ drivers/video/exynos/exynos_dp_core.c | 312 +++++++++++++++----------------
+ drivers/video/exynos/exynos_dp_core.h | 6 +-
+ drivers/video/exynos/exynos_dp_reg.c | 40 ++--
+ drivers/video/exynos/exynos_mipi_dsi.c | 6 +-
+ drivers/video/fsl-diu-fb.c | 10 +-
+ drivers/video/gbefb.c | 15 +-
+ drivers/video/jz4740_fb.c | 22 +--
+ drivers/video/mbx/mbxfb.c | 22 +--
+ drivers/video/msm/mddi_client_nt35399.c | 6 +-
+ drivers/video/s3c-fb.c | 24 +--
+ drivers/video/sunxvr2500.c | 4 +-
+ drivers/video/uvesafb.c | 2 +
+ 19 files changed, 338 insertions(+), 319 deletions(-)
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (c50e86c Merge tag 'v3.6-rc4')
+$ git merge omap_dss2/for-next
+Recorded preimage for 'drivers/video/omap2/dss/sdi.c'
+Auto-merging drivers/video/omap2/dss/sdi.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/dss/sdi.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/video/omap2/dss/sdi.c'.
+[master 8539e73] Merge remote-tracking branch 'omap_dss2/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-omap2/display.c | 1 -
+ drivers/video/omap2/displays/panel-acx565akm.c | 14 +-
+ drivers/video/omap2/displays/panel-generic-dpi.c | 76 +++-
+ .../omap2/displays/panel-lgphilips-lb035q02.c | 3 +
+ drivers/video/omap2/displays/panel-n8x0.c | 30 +-
+ .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 +
+ drivers/video/omap2/displays/panel-picodlp.c | 4 +
+ .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 3 +
+ drivers/video/omap2/displays/panel-taal.c | 16 +
+ drivers/video/omap2/displays/panel-tfp410.c | 6 +-
+ .../video/omap2/displays/panel-tpo-td043mtea1.c | 7 +-
+ drivers/video/omap2/dss/Makefile | 2 +-
+ drivers/video/omap2/dss/apply.c | 4 +-
+ drivers/video/omap2/dss/dispc.c | 438 +++++++++++++-------
+ drivers/video/omap2/dss/dpi.c | 63 ++-
+ drivers/video/omap2/dss/dsi.c | 212 +++++++---
+ drivers/video/omap2/dss/dss.c | 183 ++++----
+ drivers/video/omap2/dss/dss.h | 23 +-
+ drivers/video/omap2/dss/dss_features.c | 1 +
+ drivers/video/omap2/dss/dss_features.h | 1 +
+ drivers/video/omap2/dss/hdmi.c | 42 +-
+ drivers/video/omap2/dss/hdmi_panel.c | 31 +-
+ drivers/video/omap2/dss/rfbi.c | 126 +++---
+ drivers/video/omap2/dss/sdi.c | 34 +-
+ drivers/video/omap2/dss/venc.c | 247 ++++-------
+ drivers/video/omap2/dss/venc_panel.c | 251 +++++++++++
+ include/video/omapdss.h | 44 +-
+ 27 files changed, 1228 insertions(+), 637 deletions(-)
+ create mode 100644 drivers/video/omap2/dss/venc_panel.c
+Merging regulator/for-next (6250ed8 Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/drivers' and 'regulator/topic/tol' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-regulator | 21 ++
+ drivers/regulator/Kconfig | 27 +-
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/ab3100.c | 6 -
+ drivers/regulator/ab8500.c | 36 +-
+ drivers/regulator/arizona-ldo1.c | 4 +
+ drivers/regulator/arizona-micsupp.c | 5 +
+ drivers/regulator/core.c | 142 +++++++-
+ drivers/regulator/da9052-regulator.c | 4 +-
+ drivers/regulator/dummy.c | 2 +-
+ drivers/regulator/isl6271a-regulator.c | 6 -
+ drivers/regulator/lp872x.c | 18 +-
+ drivers/regulator/lp8788-buck.c | 80 +----
+ drivers/regulator/lp8788-ldo.c | 8 +
+ drivers/regulator/max77686.c | 30 +-
+ drivers/regulator/max8907-regulator.c | 408 +++++++++++++++++++++++
+ drivers/regulator/mc13783-regulator.c | 89 ++++-
+ drivers/regulator/mc13892-regulator.c | 77 ++---
+ drivers/regulator/mc13xxx-regulator-core.c | 17 +-
+ drivers/regulator/mc13xxx.h | 1 -
+ drivers/regulator/palmas-regulator.c | 45 +--
+ drivers/regulator/s2mps11.c | 27 +-
+ drivers/regulator/tps6524x-regulator.c | 10 +-
+ drivers/regulator/tps6586x-regulator.c | 76 +----
+ drivers/regulator/twl-regulator.c | 103 +++---
+ drivers/regulator/wm831x-dcdc.c | 11 +-
+ drivers/regulator/wm831x-ldo.c | 12 +
+ drivers/regulator/wm8400-regulator.c | 7 +-
+ include/linux/mfd/max77686.h | 1 +
+ include/linux/regulator/consumer.h | 15 +
+ include/linux/regulator/driver.h | 15 +
+ include/linux/regulator/machine.h | 2 +
+ 32 files changed, 884 insertions(+), 422 deletions(-)
+ create mode 100644 drivers/regulator/max8907-regulator.c
+Merging security/next (c6993e4 security: allow Yama to be unconditionally stacked)
+$ git merge security/next
+Auto-merging security/yama/yama_lsm.c
+Auto-merging drivers/char/tpm/tpm_eventlog.c
+Auto-merging arch/powerpc/kernel/prom_init.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-ppi | 70 +++
+ arch/powerpc/kernel/prom_init.c | 62 ++
+ drivers/char/hw_random/Kconfig | 13 +
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/tpm-rng.c | 50 ++
+ drivers/char/tpm/Kconfig | 19 +
+ drivers/char/tpm/Makefile | 8 +
+ drivers/char/tpm/tpm.c | 74 ++-
+ drivers/char/tpm/tpm.h | 35 +-
+ drivers/char/tpm/tpm_acpi.c | 109 ++++
+ drivers/char/tpm/{tpm_bios.c => tpm_eventlog.c} | 147 +----
+ drivers/char/tpm/tpm_eventlog.h | 86 +++
+ drivers/char/tpm/tpm_i2c_infineon.c | 695 +++++++++++++++++++++
+ drivers/char/tpm/tpm_ibmvtpm.c | 749 +++++++++++++++++++++++
+ drivers/char/tpm/tpm_ibmvtpm.h | 77 +++
+ drivers/char/tpm/tpm_of.c | 73 +++
+ drivers/char/tpm/tpm_ppi.c | 461 ++++++++++++++
+ drivers/char/tpm/tpm_tis.c | 3 +-
+ include/linux/ptrace.h | 2 -
+ include/linux/security.h | 31 +
+ include/linux/tpm.h | 4 +
+ kernel/ptrace.c | 3 +-
+ samples/seccomp/bpf-helper.h | 15 +-
+ security/integrity/ima/Kconfig | 1 +
+ security/keys/trusted.c | 54 +-
+ security/security.c | 21 +
+ security/yama/Kconfig | 8 +
+ security/yama/yama_lsm.c | 14 +-
+ 28 files changed, 2671 insertions(+), 214 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-ppi
+ create mode 100644 drivers/char/hw_random/tpm-rng.c
+ create mode 100644 drivers/char/tpm/tpm_acpi.c
+ rename drivers/char/tpm/{tpm_bios.c => tpm_eventlog.c} (75%)
+ create mode 100644 drivers/char/tpm/tpm_eventlog.h
+ create mode 100644 drivers/char/tpm/tpm_i2c_infineon.c
+ create mode 100644 drivers/char/tpm/tpm_ibmvtpm.c
+ create mode 100644 drivers/char/tpm/tpm_ibmvtpm.h
+ create mode 100644 drivers/char/tpm/tpm_of.c
+ create mode 100644 drivers/char/tpm/tpm_ppi.c
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (318e151 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge watchdog/master
+Already up-to-date.
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (6f286cc Merge branches 'iommu/fixes' and 'arm/tegra' into next)
+$ git merge iommu/next
+Merge made by the 'recursive' strategy.
+ drivers/iommu/tegra-smmu.c | 202 +++++++++++++++++++++++++++++++++++++++++---
+ 1 file changed, 190 insertions(+), 12 deletions(-)
+Merging vfio/next (d987569 Linux 3.6-rc2)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store())
+$ git merge osd/linux-next
+Merge made by the 'recursive' strategy.
+ fs/exofs/sys.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging jc_docs/docs-next (5c050fb docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (527a136 btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID)
+$ git merge trivial/for-next
+Resolved 'drivers/scsi/ipr.c' using previous resolution.
+Auto-merging tools/perf/util/python-ext-sources
+Auto-merging tools/perf/util/parse-events-test.c
+Auto-merging include/linux/irqdesc.h
+Auto-merging fs/nfs/super.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext3/inode.c
+Auto-merging fs/ext3/balloc.c
+Auto-merging fs/ext2/balloc.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/ctree.h
+Auto-merging drivers/w1/masters/ds1wm.c
+Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
+Auto-merging drivers/scsi/qla4xxx/ql4_os.c
+Auto-merging drivers/scsi/megaraid.c
+Auto-merging drivers/scsi/lpfc/lpfc_sli.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/isci/init.c
+Auto-merging drivers/scsi/isci/host.c
+Auto-merging drivers/scsi/ipr.c
+CONFLICT (content): Merge conflict in drivers/scsi/ipr.c
+Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+Auto-merging drivers/scsi/bfa/bfa_ioc.c
+Removing drivers/pci/.gitignore
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+Auto-merging drivers/mmc/host/vub300.c
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/mmc/host/atmel-mci.c
+Auto-merging drivers/mfd/ab8500-gpadc.c
+Auto-merging drivers/dma/imx-dma.c
+Auto-merging drivers/dma/at_hdmac.c
+Auto-merging Documentation/dontdiff
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f8fb443] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/accounting/getdelays.c | 5 +-
+ Documentation/dontdiff | 1 -
+ Documentation/ia64/aliasing-test.c | 1 +
+ Documentation/power/swsusp.txt | 2 +-
+ arch/powerpc/boot/.gitignore | 4 --
+ arch/x86/include/asm/hpet.h | 2 -
+ drivers/dma/at_hdmac.c | 8 +--
+ drivers/dma/ep93xx_dma.c | 2 +-
+ drivers/dma/fsldma.c | 2 +-
+ drivers/dma/imx-dma.c | 4 +-
+ drivers/dma/intel_mid_dma.c | 2 +-
+ drivers/dma/intel_mid_dma_regs.h | 6 +-
+ drivers/dma/ioat/hw.h | 4 --
+ drivers/dma/pl330.c | 2 +-
+ drivers/dma/ppc4xx/adma.c | 2 +-
+ drivers/dma/ste_dma40_ll.h | 2 +-
+ drivers/mfd/ab8500-gpadc.c | 2 +-
+ drivers/mfd/rc5t583.c | 2 +-
+ drivers/mfd/rdc321x-southbridge.c | 2 +-
+ drivers/mfd/tps65911-comparator.c | 2 +-
+ drivers/mmc/core/sdio.c | 2 +-
+ drivers/mmc/host/at91_mci.c | 2 +-
+ drivers/mmc/host/atmel-mci.c | 2 +-
+ drivers/mmc/host/omap_hsmmc.c | 2 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
+ drivers/mmc/host/vub300.c | 2 +-
+ drivers/net/ethernet/3com/typhoon.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 2 +-
+ drivers/net/wireless/b43/Kconfig | 4 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 6 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 6 +-
+ drivers/pci/.gitignore | 4 --
+ drivers/platform/x86/asus-laptop.c | 2 +-
+ drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
+ drivers/scsi/bfa/bfa_ioc.c | 2 +-
+ drivers/scsi/bfa/bfa_ioc.h | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +-
+ drivers/scsi/gdth.h | 9 ---
+ drivers/scsi/ipr.c | 66 ++++++++++----------
+ drivers/scsi/isci/host.c | 2 +-
+ drivers/scsi/isci/init.c | 2 +-
+ drivers/scsi/isci/port.c | 2 +-
+ drivers/scsi/isci/request.c | 2 +-
+ drivers/scsi/isci/task.c | 2 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 4 +-
+ drivers/scsi/megaraid.c | 5 +-
+ drivers/scsi/megaraid.h | 35 -----------
+ drivers/scsi/mvumi.c | 6 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 6 +-
+ drivers/scsi/vmw_pvscsi.c | 4 +-
+ drivers/spi/spi-au1550.c | 2 +-
+ drivers/spi/spi-bfin-sport.c | 2 +-
+ drivers/spi/spi-oc-tiny.c | 2 +-
+ drivers/spi/spi-ppc4xx.c | 4 +-
+ drivers/spi/spi-topcliff-pch.c | 2 +-
+ drivers/target/iscsi/iscsi_target_parameters.c | 4 +-
+ drivers/video/backlight/88pm860x_bl.c | 1 -
+ drivers/video/exynos/exynos_mipi_dsi.c | 2 +-
+ drivers/video/tmiofb.c | 4 ++
+ drivers/w1/masters/ds1wm.c | 2 +-
+ fs/btrfs/ctree.h | 2 +-
+ fs/btrfs/inode.c | 4 +-
+ fs/ext2/balloc.c | 2 +-
+ fs/ext3/balloc.c | 2 +-
+ fs/ext3/inode.c | 2 +-
+ fs/ext4/inode.c | 14 ++---
+ fs/ext4/mballoc.c | 2 +-
+ fs/libfs.c | 2 +-
+ fs/nfs/super.c | 2 +-
+ include/linux/irqdesc.h | 2 -
+ include/linux/mfd/max8998.h | 2 +-
+ include/trace/define_trace.h | 2 +-
+ mm/bootmem.c | 2 +-
+ net/8021q/vlanproc.c | 2 +-
+ scripts/coccinelle/api/memdup_user.cocci | 4 +-
+ security/apparmor/.gitignore | 1 -
+ sound/oss/.gitignore | 1 -
+ tools/perf/util/callchain.h | 2 +-
+ tools/perf/util/parse-events-test.c | 2 +-
+ tools/perf/util/python-ext-sources | 2 +-
+ tools/testing/ktest/examples/include/defaults.conf | 2 +-
+ tools/testing/ktest/examples/include/tests.conf | 2 +-
+ tools/testing/selftests/vm/run_vmtests | 6 +-
+ 85 files changed, 141 insertions(+), 202 deletions(-)
+ delete mode 100644 drivers/pci/.gitignore
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (1661f9a Merge branch 'pm-cpufreq-next' into linux-next)
+$ git merge pm/linux-next
+Removing arch/arm/mach-shmobile/common.c
+Auto-merging arch/arm/mach-shmobile/board-mackerel.c
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 11 +
+ Documentation/cpu-freq/boost.txt | 93 +++++
+ Documentation/cpuidle/sysfs.txt | 10 +-
+ Documentation/devicetree/bindings/power/opp.txt | 25 ++
+ arch/arm/kernel/smp.c | 54 +++
+ arch/arm/mach-shmobile/Makefile | 2 +-
+ arch/arm/mach-shmobile/board-ap4evb.c | 21 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 6 +-
+ arch/arm/mach-shmobile/board-mackerel.c | 34 +-
+ arch/arm/mach-shmobile/common.c | 24 --
+ arch/arm/mach-shmobile/cpuidle.c | 39 +-
+ arch/arm/mach-shmobile/include/mach/common.h | 14 +-
+ arch/arm/mach-shmobile/include/mach/pm-rmobile.h | 35 +-
+ arch/arm/mach-shmobile/include/mach/r8a7740.h | 6 +-
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 12 +-
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 20 +-
+ arch/arm/mach-shmobile/pm-r8a7740.c | 42 +-
+ arch/arm/mach-shmobile/pm-r8a7779.c | 71 ++--
+ arch/arm/mach-shmobile/pm-rmobile.c | 33 +-
+ arch/arm/mach-shmobile/pm-sh7372.c | 283 +++++++++-----
+ arch/arm/mach-shmobile/setup-r8a7740.c | 27 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 5 +-
+ arch/arm/mach-shmobile/setup-sh7372.c | 69 ++--
+ arch/x86/include/asm/msr-index.h | 3 +
+ drivers/acpi/bus.c | 3 +-
+ drivers/acpi/processor_idle.c | 2 -
+ drivers/acpi/processor_perflib.c | 30 ++
+ drivers/base/platform.c | 2 +
+ drivers/base/power/domain.c | 244 ++++++++++--
+ drivers/base/power/main.c | 35 +-
+ drivers/base/power/opp.c | 47 +++
+ drivers/base/power/power.h | 36 +-
+ drivers/base/power/wakeup.c | 46 ++-
+ drivers/clocksource/sh_cmt.c | 71 +++-
+ drivers/clocksource/sh_mtu2.c | 41 +-
+ drivers/clocksource/sh_tmu.c | 112 +++++-
+ drivers/cpufreq/Kconfig.x86 | 18 +-
+ drivers/cpufreq/Makefile | 2 +-
+ drivers/cpufreq/acpi-cpufreq.c | 272 ++++++++++++-
+ drivers/cpufreq/cpufreq_conservative.c | 1 +
+ drivers/cpufreq/powernow-k8.c | 406 ++------------------
+ drivers/cpufreq/powernow-k8.h | 32 --
+ drivers/cpuidle/governors/ladder.c | 6 +-
+ drivers/xen/xen-acpi-processor.c | 1 -
+ include/acpi/processor.h | 1 -
+ include/linux/clockchips.h | 8 +
+ include/linux/device.h | 7 +
+ include/linux/opp.h | 8 +
+ include/linux/pm.h | 2 +
+ include/linux/pm_domain.h | 92 ++++-
+ kernel/power/Kconfig | 4 +
+ kernel/power/process.c | 2 +-
+ kernel/time/clockevents.c | 24 ++
+ kernel/time/timekeeping.c | 2 +
+ 54 files changed, 1645 insertions(+), 851 deletions(-)
+ create mode 100644 Documentation/cpu-freq/boost.txt
+ create mode 100644 Documentation/devicetree/bindings/power/opp.txt
+ delete mode 100644 arch/arm/mach-shmobile/common.c
+Merging apm/for-next (f07bb36 x86, apm: Make on_cpu0() use workqueue instead of work_on_cpu())
+$ git merge apm/for-next
+Auto-merging arch/x86/kernel/apm_32.c
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/apm_32.c | 31 +++++++++++++++++++++++--------
+ 1 file changed, 23 insertions(+), 8 deletions(-)
+Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Resolved 'kernel/audit_tree.c' using previous resolution.
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+CONFLICT (content): Merge conflict in kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5b8f66a] Merge remote-tracking branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/notify/fanotify/fanotify.c | 6 +++
+ fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
+ fs/notify/group.c | 47 ++++++++++--------
+ fs/notify/inode_mark.c | 14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c | 4 +-
+ fs/notify/inotify/inotify_user.c | 34 ++++++-------
+ fs/notify/mark.c | 91 +++++++++++++++++++---------------
+ fs/notify/notification.c | 1 +
+ fs/notify/vfsmount_mark.c | 14 ++++--
+ include/linux/fsnotify_backend.h | 31 ++++++++----
+ kernel/audit_tree.c | 10 ++--
+ kernel/audit_watch.c | 4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
+$ git merge edac/linux_next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
+$ git merge edac-amd/for-next
+Resolved 'Documentation/edac.txt' using previous resolution.
+Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
+Auto-merging drivers/edac/amd64_edac.c
+CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
+Auto-merging Documentation/edac.txt
+CONFLICT (content): Merge conflict in Documentation/edac.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 703be94] Merge remote-tracking branch 'edac-amd/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (a4f8bf2 DT: export of_irq_to_resource_table())
+$ git merge dt-rh/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/pwm/mxs-pwm.txt | 2 +-
+ .../devicetree/bindings/serial/fsl-imx-uart.txt | 35 ++++++++++++++++++++
+ drivers/of/address.c | 27 ++++++++++++---
+ drivers/of/irq.c | 1 +
+ drivers/of/platform.c | 16 +++++++--
+ include/linux/of_address.h | 1 +
+ 6 files changed, 74 insertions(+), 8 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/fsl-imx-uart.txt
+Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (58a798e Merge branches 'spi-drivers' and 'spi-mxs' into spi-next)
+$ git merge spi-mb/spi-next
+Resolved 'drivers/mmc/host/mxs-mmc.c' using previous resolution.
+Auto-merging drivers/spi/spi-topcliff-pch.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/Makefile
+Auto-merging drivers/spi/Kconfig
+Auto-merging drivers/mmc/host/mxs-mmc.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/mxs-mmc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 355622d] Merge remote-tracking branch 'spi-mb/spi-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/spi/mxs-spi.txt | 22 +
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 3 +
+ Documentation/devicetree/bindings/spi/spi-gpio.txt | 29 +
+ .../devicetree/bindings/spi/spi-sc18is602.txt | 23 +
+ .../devicetree/bindings/spi/spi_pl022.txt | 15 +
+ Documentation/spi/spi-sc18is602 | 36 ++
+ drivers/clk/mxs/Makefile | 2 +-
+ drivers/clk/mxs/clk-ssp.c | 62 ++
+ drivers/mmc/host/mxs-mmc.c | 325 ++++------
+ drivers/spi/Kconfig | 13 +
+ drivers/spi/Makefile | 2 +
+ drivers/spi/spi-altera.c | 4 +-
+ drivers/spi/spi-gpio.c | 131 +++-
+ drivers/spi/spi-mpc512x-psc.c | 3 +-
+ drivers/spi/spi-mpc52xx-psc.c | 3 +-
+ drivers/spi/spi-mpc52xx.c | 9 +-
+ drivers/spi/spi-mxs.c | 674 ++++++++++++++++++++
+ drivers/spi/spi-omap2-mcspi.c | 57 +-
+ drivers/spi/spi-orion.c | 209 ++----
+ drivers/spi/spi-pl022.c | 117 +++-
+ drivers/spi/spi-s3c24xx.c | 1 +
+ drivers/spi/spi-s3c64xx.c | 8 +-
+ drivers/spi/spi-sc18is602.c | 364 +++++++++++
+ drivers/spi/spi-sh-hspi.c | 5 +-
+ drivers/spi/spi-stmp.c | 6 +-
+ drivers/spi/spi-tegra.c | 4 +-
+ drivers/spi/spi-tle62x0.c | 13 +-
+ drivers/spi/spi-topcliff-pch.c | 2 -
+ include/linux/amba/pl022.h | 2 +
+ include/linux/platform_data/sc18is602.h | 19 +
+ include/linux/spi/mxs-spi.h | 150 +++++
+ 31 files changed, 1845 insertions(+), 468 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/mxs-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sc18is602.txt
+ create mode 100644 Documentation/spi/spi-sc18is602
+ create mode 100644 drivers/clk/mxs/clk-ssp.c
+ create mode 100644 drivers/spi/spi-mxs.c
+ create mode 100644 drivers/spi/spi-sc18is602.c
+ create mode 100644 include/linux/platform_data/sc18is602.h
+ create mode 100644 include/linux/spi/mxs-spi.h
+$ git reset --hard HEAD^
+HEAD is now at cd85ccc Merge remote-tracking branch 'dt-rh/for-next'
+Merging refs/next/20120905/spi-mb
+$ git merge refs/next/20120905/spi-mb
+Resolved 'drivers/mmc/host/mxs-mmc.c' using previous resolution.
+Auto-merging drivers/spi/spi-topcliff-pch.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/Makefile
+Auto-merging drivers/spi/Kconfig
+Auto-merging drivers/mmc/host/mxs-mmc.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/mxs-mmc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7e47161] Merge commit 'refs/next/20120905/spi-mb'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/spi/mxs-spi.txt | 18 +
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 3 +
+ .../devicetree/bindings/spi/spi-sc18is602.txt | 23 +
+ .../devicetree/bindings/spi/spi_pl022.txt | 15 +
+ Documentation/spi/spi-sc18is602 | 36 ++
+ drivers/clk/mxs/Makefile | 2 +-
+ drivers/clk/mxs/clk-ssp.c | 62 ++
+ drivers/mmc/host/mxs-mmc.c | 325 ++++------
+ drivers/spi/Kconfig | 13 +
+ drivers/spi/Makefile | 2 +
+ drivers/spi/spi-altera.c | 4 +-
+ drivers/spi/spi-mpc512x-psc.c | 3 +-
+ drivers/spi/spi-mpc52xx-psc.c | 3 +-
+ drivers/spi/spi-mpc52xx.c | 9 +-
+ drivers/spi/spi-mxs.c | 632 ++++++++++++++++++++
+ drivers/spi/spi-omap2-mcspi.c | 57 +-
+ drivers/spi/spi-orion.c | 209 ++-----
+ drivers/spi/spi-pl022.c | 120 +++-
+ drivers/spi/spi-s3c24xx.c | 1 +
+ drivers/spi/spi-s3c64xx.c | 8 +-
+ drivers/spi/spi-sc18is602.c | 364 +++++++++++
+ drivers/spi/spi-stmp.c | 6 +-
+ drivers/spi/spi-tegra.c | 4 +-
+ drivers/spi/spi-topcliff-pch.c | 2 -
+ include/linux/amba/pl022.h | 2 +
+ include/linux/platform_data/sc18is602.h | 19 +
+ include/linux/spi/mxs-spi.h | 150 +++++
+ 27 files changed, 1651 insertions(+), 441 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/mxs-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-sc18is602.txt
+ create mode 100644 Documentation/spi/spi-sc18is602
+ create mode 100644 drivers/clk/mxs/clk-ssp.c
+ create mode 100644 drivers/spi/spi-mxs.c
+ create mode 100644 drivers/spi/spi-sc18is602.c
+ create mode 100644 include/linux/platform_data/sc18is602.h
+ create mode 100644 include/linux/spi/mxs-spi.h
+Merging tip/auto-latest (7702c72 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Resolved 'arch/Kconfig' using previous resolution.
+Auto-merging tools/perf/util/parse-events-test.c
+Auto-merging tools/perf/perf.h
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/events/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/perf_event.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/vtime.c
+Auto-merging arch/s390/include/asm/switch_to.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/kernel/time.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/ia64/Kconfig
+Auto-merging arch/Kconfig
+CONFLICT (content): Merge conflict in arch/Kconfig
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4c7e922] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 3 -
+ MAINTAINERS | 8 +
+ Makefile | 6 +-
+ arch/Kconfig | 16 +
+ arch/ia64/Kconfig | 12 +-
+ arch/ia64/include/asm/switch_to.h | 8 -
+ arch/ia64/kernel/time.c | 4 +-
+ arch/powerpc/include/asm/time.h | 6 -
+ arch/powerpc/kernel/process.c | 3 -
+ arch/powerpc/kernel/time.c | 6 +
+ arch/powerpc/platforms/Kconfig.cputype | 16 +-
+ arch/s390/Kconfig | 5 +-
+ arch/s390/include/asm/switch_to.h | 4 -
+ arch/s390/kernel/vtime.c | 4 +-
+ arch/s390/oprofile/init.c | 10 +-
+ arch/tile/include/asm/topology.h | 1 -
+ arch/x86/Kconfig | 62 +-
+ arch/x86/boot/header.S | 4 -
+ arch/x86/configs/i386_defconfig | 23 +-
+ arch/x86/configs/x86_64_defconfig | 23 +-
+ arch/x86/ia32/ia32_signal.c | 11 +-
+ arch/x86/ia32/sys_ia32.c | 2 +-
+ arch/x86/include/asm/alternative.h | 4 +-
+ arch/x86/include/asm/ftrace.h | 56 +-
+ arch/x86/include/asm/iommu_table.h | 6 +-
+ arch/x86/include/asm/kprobes.h | 1 +
+ arch/x86/include/asm/microcode.h | 10 +-
+ arch/x86/include/asm/perf_event.h | 2 +
+ arch/x86/include/asm/perf_regs.h | 33 +
+ arch/x86/include/asm/sys_ia32.h | 2 +-
+ arch/x86/include/asm/vdso.h | 3 +-
+ arch/x86/kernel/Makefile | 2 +
+ arch/x86/kernel/alternative.c | 107 +-
+ arch/x86/kernel/cpu/amd.c | 67 +
+ arch/x86/kernel/cpu/common.c | 5 +-
+ arch/x86/kernel/cpu/intel.c | 4 +
+ arch/x86/kernel/cpu/mcheck/mce-inject.c | 8 +
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 12 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 84 +-
+ arch/x86/kernel/cpu/mcheck/mce_intel.c | 133 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 1 +
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c | 3 +-
+ arch/x86/kernel/devicetree.c | 51 +-
+ arch/x86/kernel/entry_32.S | 75 +-
+ arch/x86/kernel/entry_64.S | 126 +-
+ arch/x86/kernel/ftrace.c | 73 +-
+ arch/x86/kernel/i8259.c | 2 +-
+ arch/x86/kernel/kprobes.c | 48 +
+ arch/x86/kernel/microcode_amd.c | 357 +++--
+ arch/x86/kernel/microcode_core.c | 70 +-
+ arch/x86/kernel/microcode_intel.c | 3 +-
+ arch/x86/kernel/perf_regs.c | 105 ++
+ arch/x86/kernel/probe_roms.c | 2 +-
+ arch/x86/kernel/smpboot.c | 20 +-
+ arch/x86/kernel/x8664_ksyms_64.c | 6 +-
+ arch/x86/kernel/xsave.c | 6 +-
+ arch/x86/xen/smp.c | 6 +-
+ drivers/infiniband/hw/ehca/ehca_irq.c | 250 ++--
+ drivers/infiniband/hw/ehca/ehca_irq.h | 6 +-
+ drivers/oprofile/cpu_buffer.c | 11 +-
+ include/linux/ftrace.h | 158 +-
+ include/linux/kernel_stat.h | 6 +
+ include/linux/kprobes.h | 27 +
+ include/linux/kthread.h | 11 +-
+ include/linux/perf_event.h | 62 +-
+ include/linux/perf_regs.h | 25 +
+ include/linux/sched.h | 3 +-
+ include/linux/smpboot.h | 43 +
+ include/linux/timer.h | 165 +--
+ include/linux/topology.h | 2 -
+ include/linux/uprobes.h | 13 +-
+ init/Kconfig | 13 +
+ kernel/Makefile | 3 +-
+ kernel/cpu.c | 21 +-
+ kernel/events/callchain.c | 38 +-
+ kernel/events/core.c | 216 ++-
+ kernel/events/hw_breakpoint.c | 11 +-
+ kernel/events/internal.h | 82 +-
+ kernel/events/ring_buffer.c | 10 +-
+ kernel/events/uprobes.c | 159 +-
+ kernel/fork.c | 6 +-
+ kernel/irq/chip.c | 1 +
+ kernel/irq/dummychip.c | 2 +
+ kernel/kprobes.c | 250 +++-
+ kernel/kthread.c | 185 ++-
+ kernel/rcutree.c | 12 +-
+ kernel/rcutree.h | 15 +-
+ kernel/rcutree_plugin.h | 403 +-----
+ kernel/rcutree_trace.c | 3 +-
+ kernel/sched/Makefile | 2 +-
+ kernel/sched/core.c | 669 +--------
+ kernel/sched/cputime.c | 504 +++++++
+ kernel/sched/fair.c | 54 +-
+ kernel/sched/features.h | 8 -
+ kernel/sched/rt.c | 1 +
+ kernel/sched/sched.h | 64 +-
+ kernel/smpboot.c | 233 +++
+ kernel/smpboot.h | 4 +
+ kernel/softirq.c | 111 +-
+ kernel/sysctl.c | 6 +-
+ kernel/time/tick-sched.c | 1 +
+ kernel/timer.c | 108 +-
+ kernel/trace/Kconfig | 5 +
+ kernel/trace/Makefile | 2 +
+ kernel/trace/ftrace.c | 322 ++++-
+ kernel/trace/ring_buffer.c | 4 +-
+ kernel/trace/trace.c | 6 +-
+ kernel/trace/trace.h | 2 +-
+ kernel/trace/trace_event_perf.c | 3 +-
+ kernel/trace/trace_events.c | 4 +-
+ kernel/trace/trace_events_filter.c | 2 +-
+ kernel/trace/trace_functions.c | 14 +-
+ kernel/trace/trace_functions_graph.c | 5 +-
+ kernel/trace/trace_irqsoff.c | 5 +-
+ kernel/trace/trace_sched_wakeup.c | 5 +-
+ kernel/trace/trace_selftest.c | 304 +++-
+ kernel/trace/trace_stack.c | 4 +-
+ kernel/watchdog.c | 263 ++--
+ mm/memblock.c | 2 +-
+ scripts/kconfig/Makefile | 7 +-
+ scripts/recordmcount.h | 4 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 +
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 440 ++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/builtin-balloon.c | 80 +
+ tools/kvm/builtin-debug.c | 110 ++
+ tools/kvm/builtin-help.c | 63 +
+ tools/kvm/builtin-list.c | 149 ++
+ tools/kvm/builtin-pause.c | 88 ++
+ tools/kvm/builtin-resume.c | 88 ++
+ tools/kvm/builtin-run.c | 1426 ++++++++++++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 262 ++++
+ tools/kvm/builtin-stat.c | 127 ++
+ tools/kvm/builtin-stop.c | 70 +
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 +++
+ tools/kvm/config/utilities.mak | 196 +++
+ tools/kvm/disk/blk.c | 76 +
+ tools/kvm/disk/core.c | 289 ++++
+ tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 ++
+ tools/kvm/framebuffer.c | 75 +
+ tools/kvm/guest/init.c | 72 +
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 348 +++++
+ tools/kvm/hw/pci-shmem.c | 268 ++++
+ tools/kvm/hw/rtc.c | 137 ++
+ tools/kvm/hw/serial.c | 446 ++++++
+ tools/kvm/hw/vesa.c | 85 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 20 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/disk-image.h | 95 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 35 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 69 +
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-cpu.h | 24 +
+ tools/kvm/include/kvm/kvm-ipc.h | 24 +
+ tools/kvm/include/kvm/kvm.h | 93 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 214 +++
+ tools/kvm/include/kvm/pci-shmem.h | 28 +
+ tools/kvm/include/kvm/pci.h | 95 ++
+ tools/kvm/include/kvm/qcow.h | 133 ++
+ tools/kvm/include/kvm/rbtree-interval.h | 28 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 22 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 20 +
+ tools/kvm/include/kvm/threadpool.h | 37 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 +++++
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 73 +
+ tools/kvm/include/kvm/virtio-balloon.h | 8 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 9 +
+ tools/kvm/include/kvm/virtio-mmio.h | 58 +
+ tools/kvm/include/kvm/virtio-net.h | 26 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 49 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 102 ++
+ tools/kvm/include/kvm/vnc.h | 20 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ tools/kvm/include/linux/kernel.h | 39 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 16 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 214 +++
+ tools/kvm/ioport.c | 195 +++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 175 +++
+ tools/kvm/kvm-ipc.c | 231 +++
+ tools/kvm/kvm.c | 593 ++++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 140 ++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 +++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 202 +++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 345 +++++
+ tools/kvm/net/uip/udp.c | 236 +++
+ tools/kvm/pci.c | 213 +++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 195 +++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 90 ++
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 +
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 75 +
+ tools/kvm/powerpc/kvm-cpu.c | 293 ++++
+ tools/kvm/powerpc/kvm.c | 529 +++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 ++
+ tools/kvm/powerpc/spapr_hvcons.c | 102 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 423 ++++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 229 +++
+ tools/kvm/powerpc/xics.c | 514 +++++++
+ tools/kvm/powerpc/xics.h | 23 +
+ tools/kvm/symbol.c | 131 ++
+ tools/kvm/term.c | 166 +++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 109 ++
+ tools/kvm/ui/sdl.c | 303 ++++
+ tools/kvm/ui/vnc.c | 230 +++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++++
+ tools/kvm/util/rbtree-interval.c | 89 ++
+ tools/kvm/util/read-write.c | 354 +++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 +
+ tools/kvm/util/threadpool.c | 145 ++
+ tools/kvm/util/util.c | 133 ++
+ tools/kvm/virtio/9p-pdu.c | 287 ++++
+ tools/kvm/virtio/9p.c | 1379 ++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 259 ++++
+ tools/kvm/virtio/blk.c | 313 ++++
+ tools/kvm/virtio/console.c | 185 +++
+ tools/kvm/virtio/core.c | 233 +++
+ tools/kvm/virtio/mmio.c | 264 ++++
+ tools/kvm/virtio/net.c | 546 +++++++
+ tools/kvm/virtio/pci.c | 398 +++++
+ tools/kvm/virtio/rng.c | 188 +++
+ tools/kvm/virtio/scsi.c | 307 ++++
+ tools/kvm/x86/bios.c | 174 +++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 +
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 67 +
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 77 +
+ tools/kvm/x86/irq.c | 222 +++
+ tools/kvm/x86/kvm-cpu.c | 425 ++++++
+ tools/kvm/x86/kvm.c | 372 +++++
+ tools/kvm/x86/mptable.c | 287 ++++
+ tools/lib/traceevent/event-parse.c | 107 +-
+ tools/lib/traceevent/event-parse.h | 34 +-
+ tools/lib/traceevent/event-utils.h | 6 +
+ tools/perf/Documentation/Makefile | 6 +-
+ tools/perf/Documentation/jit-interface.txt | 15 +
+ tools/perf/Documentation/perf-list.txt | 48 +-
+ tools/perf/Documentation/perf-script-perl.txt | 4 +-
+ tools/perf/Documentation/perf-script-python.txt | 10 +-
+ tools/perf/Makefile | 133 +-
+ tools/perf/arch/x86/Makefile | 3 +
+ tools/perf/arch/x86/include/perf_regs.h | 80 +
+ tools/perf/arch/x86/util/unwind.c | 111 ++
+ tools/perf/bash_completion | 26 +
+ tools/perf/builtin-buildid-list.c | 4 +-
+ tools/perf/builtin-inject.c | 5 +-
+ tools/perf/builtin-kmem.c | 76 +-
+ tools/perf/builtin-list.c | 14 +-
+ tools/perf/builtin-lock.c | 154 +-
+ tools/perf/builtin-record.c | 131 +-
+ tools/perf/builtin-report.c | 18 +-
+ tools/perf/builtin-sched.c | 150 +-
+ tools/perf/builtin-script.c | 82 +-
+ tools/perf/builtin-stat.c | 15 +-
+ tools/perf/builtin-test.c | 10 +-
+ tools/perf/builtin-top.c | 24 +-
+ tools/perf/command-list.txt | 2 +-
+ tools/perf/config/feature-tests.mak | 25 +
+ tools/perf/perf.c | 71 +-
+ tools/perf/perf.h | 9 +-
+ .../Perf-Trace-Util/lib/Perf/Trace/EventClass.py | 94 ++
+ .../perf/scripts/python/event_analyzing_sample.py | 189 +++
+ tools/perf/ui/browsers/hists.c | 41 +-
+ tools/perf/ui/gtk/browser.c | 5 +-
+ tools/perf/ui/gtk/gtk.h | 2 +
+ tools/perf/ui/gtk/helpline.c | 56 +
+ tools/perf/ui/gtk/setup.c | 3 +
+ tools/perf/ui/gtk/util.c | 5 -
+ tools/perf/ui/helpline.c | 56 +-
+ tools/perf/ui/helpline.h | 33 +-
+ tools/perf/ui/setup.c | 4 +
+ tools/perf/ui/stdio/hist.c | 653 +++++++++
+ tools/perf/ui/tui/helpline.c | 57 +
+ tools/perf/ui/tui/setup.c | 2 -
+ tools/perf/util/debug.c | 4 +-
+ tools/perf/util/debug.h | 8 +-
+ tools/perf/util/event.c | 2 +-
+ tools/perf/util/event.h | 12 +
+ tools/perf/util/evlist.c | 73 +-
+ tools/perf/util/evlist.h | 27 +-
+ tools/perf/util/evsel.c | 93 +-
+ tools/perf/util/evsel.h | 21 +-
+ tools/perf/util/generate-cmdlist.sh | 15 +
+ tools/perf/util/header.c | 366 +++--
+ tools/perf/util/header.h | 3 +-
+ tools/perf/util/hist.c | 677 +--------
+ tools/perf/util/hist.h | 6 +-
+ tools/perf/util/include/linux/compiler.h | 1 +
+ tools/perf/util/map.c | 30 +-
+ tools/perf/util/map.h | 7 +-
+ tools/perf/util/parse-events-test.c | 424 +++++-
+ tools/perf/util/parse-events.c | 181 ++-
+ tools/perf/util/parse-events.h | 18 +-
+ tools/perf/util/parse-events.l | 54 +-
+ tools/perf/util/parse-events.y | 121 +-
+ tools/perf/util/perf_regs.h | 14 +
+ tools/perf/util/pmu.c | 50 +-
+ tools/perf/util/pmu.h | 2 +
+ tools/perf/util/python.c | 7 +-
+ .../perf/util/scripting-engines/trace-event-perl.c | 36 +-
+ .../util/scripting-engines/trace-event-python.c | 109 +-
+ tools/perf/util/session.c | 107 +-
+ tools/perf/util/session.h | 6 +-
+ tools/perf/util/symbol-elf.c | 841 +++++++++++
+ tools/perf/util/symbol-minimal.c | 303 ++++
+ tools/perf/util/symbol.c | 938 ++----------
+ tools/perf/util/symbol.h | 57 +-
+ tools/perf/util/top.c | 3 +-
+ tools/perf/util/trace-event-parse.c | 32 +-
+ tools/perf/util/trace-event-scripting.c | 3 +-
+ tools/perf/util/trace-event.h | 12 +-
+ tools/perf/util/unwind.c | 567 ++++++++
+ tools/perf/util/unwind.h | 34 +
+ tools/perf/util/util.c | 19 +
+ tools/perf/util/util.h | 2 +
+ tools/scripts/Makefile.include | 6 +-
+ 424 files changed, 34847 insertions(+), 4969 deletions(-)
+ create mode 100644 arch/x86/include/asm/perf_regs.h
+ create mode 100644 arch/x86/kernel/perf_regs.c
+ create mode 100644 include/linux/perf_regs.h
+ create mode 100644 include/linux/smpboot.h
+ create mode 100644 kernel/sched/cputime.c
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/virtio/scsi.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+ create mode 100644 tools/perf/Documentation/jit-interface.txt
+ create mode 100644 tools/perf/arch/x86/include/perf_regs.h
+ create mode 100644 tools/perf/arch/x86/util/unwind.c
+ create mode 100644 tools/perf/bash_completion
+ create mode 100755 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py
+ create mode 100644 tools/perf/scripts/python/event_analyzing_sample.py
+ create mode 100644 tools/perf/ui/gtk/helpline.c
+ create mode 100644 tools/perf/ui/stdio/hist.c
+ create mode 100644 tools/perf/ui/tui/helpline.c
+ create mode 100644 tools/perf/util/perf_regs.h
+ create mode 100644 tools/perf/util/symbol-elf.c
+ create mode 100644 tools/perf/util/symbol-minimal.c
+ create mode 100644 tools/perf/util/unwind.c
+ create mode 100644 tools/perf/util/unwind.h
+Merging rcu/rcu/next (5e9c338 rcu: Shrink RCU based on number of CPUs)
+$ git merge rcu/rcu/next
+Resolved 'arch/Kconfig' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'kernel/rcutree.h' using previous resolution.
+Resolved 'kernel/rcutree_plugin.h' using previous resolution.
+Resolved 'kernel/sched/core.c' using previous resolution.
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/time/tick-sched.c
+Auto-merging kernel/sched/core.c
+CONFLICT (content): Merge conflict in kernel/sched/core.c
+Auto-merging kernel/rcutree_trace.c
+Auto-merging kernel/rcutree_plugin.h
+CONFLICT (content): Merge conflict in kernel/rcutree_plugin.h
+Auto-merging kernel/rcutree.h
+CONFLICT (content): Merge conflict in kernel/rcutree.h
+Auto-merging kernel/rcutree.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/parisc/kernel/process.c
+Auto-merging arch/alpha/kernel/process.c
+Auto-merging arch/Kconfig
+CONFLICT (content): Merge conflict in arch/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master aef4b62] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/checklist.txt | 6 +
+ Documentation/RCU/trace.txt | 43 +-
+ Documentation/RCU/whatisRCU.txt | 9 +-
+ Documentation/kernel-parameters.txt | 11 +
+ arch/Kconfig | 10 +
+ arch/alpha/kernel/process.c | 6 +-
+ arch/alpha/kernel/smp.c | 1 +
+ arch/cris/kernel/process.c | 3 +
+ arch/frv/kernel/process.c | 3 +
+ arch/h8300/kernel/process.c | 3 +
+ arch/ia64/kernel/process.c | 3 +
+ arch/m32r/kernel/process.c | 3 +
+ arch/mn10300/kernel/process.c | 3 +
+ arch/parisc/kernel/process.c | 3 +
+ arch/score/kernel/process.c | 4 +-
+ arch/um/drivers/mconsole_kern.c | 1 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/rcu.h | 20 +
+ arch/x86/include/asm/thread_info.h | 10 +-
+ arch/x86/kernel/cpuid.c | 5 +
+ arch/x86/kernel/entry_64.S | 8 +-
+ arch/x86/kernel/msr.c | 5 +
+ arch/x86/kernel/ptrace.c | 5 +
+ arch/x86/kernel/signal.c | 4 +
+ arch/x86/kernel/traps.c | 30 +-
+ arch/x86/mm/fault.c | 13 +-
+ arch/xtensa/kernel/process.c | 3 +
+ include/linux/interrupt.h | 2 +
+ include/linux/rcupdate.h | 20 +-
+ include/linux/sched.h | 8 +
+ init/Kconfig | 18 +
+ kernel/rcupdate.c | 4 +
+ kernel/rcutiny.c | 33 +-
+ kernel/rcutiny_plugin.h | 10 +-
+ kernel/rcutorture.c | 159 ++++---
+ kernel/rcutree.c | 881 ++++++++++++++++++++---------------
+ kernel/rcutree.h | 35 +-
+ kernel/rcutree_plugin.h | 180 +++++--
+ kernel/rcutree_trace.c | 19 +-
+ kernel/sched/core.c | 21 +-
+ kernel/time/tick-sched.c | 3 +-
+ lib/Kconfig.debug | 14 +
+ mm/kmemleak.c | 6 +-
+ 43 files changed, 1064 insertions(+), 565 deletions(-)
+ create mode 100644 arch/x86/include/asm/rcu.h
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
+$ git merge kmemleak/kmemleak
+Auto-merging mm/kmemleak.c
+Merge made by the 'recursive' strategy.
+ mm/kmemleak.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging kvm/linux-next (9a78197 KVM: x86: remove unused variable from kvm_task_switch())
+$ git merge kvm/linux-next
+Resolved 'arch/s390/include/asm/processor.h' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging arch/x86/kvm/x86.c
+Removing arch/x86/kvm/timer.c
+Removing arch/x86/kvm/kvm_timer.h
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kvm/Kconfig
+Auto-merging arch/s390/kernel/dis.c
+Auto-merging arch/s390/include/asm/processor.h
+CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c63605c] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 10 +-
+ Documentation/virtual/kvm/hypercalls.txt | 66 ++++
+ Documentation/virtual/kvm/ppc-pv.txt | 22 ++
+ arch/ia64/kvm/kvm-ia64.c | 33 +-
+ arch/powerpc/include/asm/kvm_host.h | 3 +
+ arch/powerpc/kvm/44x_tlb.c | 1 -
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 51 ++-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 6 +-
+ arch/powerpc/kvm/book3s_pr.c | 4 +-
+ arch/powerpc/kvm/e500_tlb.c | 3 +-
+ arch/powerpc/kvm/powerpc.c | 8 +
+ arch/s390/include/asm/processor.h | 1 +
+ arch/s390/kernel/dis.c | 27 ++
+ arch/s390/kvm/Kconfig | 1 +
+ arch/s390/kvm/diag.c | 4 +
+ arch/s390/kvm/intercept.c | 11 +
+ arch/s390/kvm/interrupt.c | 23 ++
+ arch/s390/kvm/kvm-s390.c | 10 +
+ arch/s390/kvm/priv.c | 9 +-
+ arch/s390/kvm/sigp.c | 2 +
+ arch/s390/kvm/trace-s390.h | 210 ++++++++++++
+ arch/s390/kvm/trace.h | 341 ++++++++++++++++++++
+ arch/x86/Kconfig | 21 +-
+ arch/x86/include/asm/kvm.h | 1 +
+ arch/x86/include/asm/kvm_emulate.h | 20 +-
+ arch/x86/include/asm/kvm_host.h | 5 +-
+ arch/x86/include/asm/kvm_para.h | 6 +-
+ arch/x86/kernel/Makefile | 3 +-
+ arch/x86/kernel/kvm.c | 3 +-
+ arch/x86/kernel/setup.c | 2 +-
+ arch/x86/kvm/Kconfig | 1 +
+ arch/x86/kvm/Makefile | 2 +-
+ arch/x86/kvm/cpuid.c | 2 +-
+ arch/x86/kvm/emulate.c | 366 ++++++++++++---------
+ arch/x86/kvm/i8254.c | 64 ++--
+ arch/x86/kvm/i8254.h | 6 +-
+ arch/x86/kvm/i8259.c | 18 +-
+ arch/x86/kvm/irq.h | 2 +-
+ arch/x86/kvm/kvm_timer.h | 18 --
+ arch/x86/kvm/lapic.c | 264 ++++++++-------
+ arch/x86/kvm/lapic.h | 58 +++-
+ arch/x86/kvm/mmu.c | 144 ++++++---
+ arch/x86/kvm/mmu_audit.c | 8 +-
+ arch/x86/kvm/paging_tmpl.h | 8 +-
+ arch/x86/kvm/pmu.c | 2 +-
+ arch/x86/kvm/svm.c | 5 +-
+ arch/x86/kvm/timer.c | 47 ---
+ arch/x86/kvm/vmx.c | 119 +++----
+ arch/x86/kvm/x86.c | 204 ++++++------
+ arch/x86/kvm/x86.h | 1 +
+ include/linux/kvm.h | 13 +-
+ include/linux/kvm_host.h | 132 ++++++--
+ kernel/jump_label.c | 1 +
+ virt/kvm/Kconfig | 3 +
+ virt/kvm/async_pf.c | 11 +-
+ virt/kvm/ioapic.c | 37 +--
+ virt/kvm/iommu.c | 16 +-
+ virt/kvm/irq_comm.c | 4 +-
+ virt/kvm/kvm_main.c | 512 ++++++++++++++++++------------
+ 59 files changed, 2026 insertions(+), 949 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/hypercalls.txt
+ create mode 100644 arch/s390/kvm/trace-s390.h
+ create mode 100644 arch/s390/kvm/trace.h
+ delete mode 100644 arch/x86/kvm/kvm_timer.h
+ delete mode 100644 arch/x86/kvm/timer.c
+Merging kvm-ppc/kvm-ppc-next (e9908a4 KVM: PPC: BookE: Support FPU on non-hv systems)
+$ git merge kvm-ppc/kvm-ppc-next
+Resolved 'arch/powerpc/include/asm/kvm_ppc.h' using previous resolution.
+Resolved 'arch/powerpc/kvm/e500_tlb.c' using previous resolution.
+Resolved 'include/linux/kvm.h' using previous resolution.
+Auto-merging include/linux/kvm_host.h
+Auto-merging include/linux/kvm.h
+CONFLICT (content): Merge conflict in include/linux/kvm.h
+Auto-merging arch/powerpc/kvm/e500_tlb.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/e500_tlb.c
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
+Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
+Auto-merging arch/powerpc/include/asm/kvm_ppc.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_ppc.h
+Auto-merging arch/powerpc/include/asm/kvm_host.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c448a9f] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 16 +-
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 36 ++--
+ arch/powerpc/include/asm/fsl_hcalls.h | 36 ++--
+ arch/powerpc/include/asm/kvm.h | 12 ++
+ arch/powerpc/include/asm/kvm_host.h | 29 +++-
+ arch/powerpc/include/asm/kvm_para.h | 21 +--
+ arch/powerpc/include/asm/kvm_ppc.h | 16 ++
+ arch/powerpc/include/asm/reg_booke.h | 7 +
+ arch/powerpc/kernel/epapr_hcalls.S | 28 +++
+ arch/powerpc/kernel/epapr_paravirt.c | 11 +-
+ arch/powerpc/kernel/kvm.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 5 +
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/44x_emulate.c | 110 +++++++-----
+ arch/powerpc/kvm/Kconfig | 3 +
+ arch/powerpc/kvm/book3s.c | 9 +
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
+ arch/powerpc/kvm/book3s_pr.c | 109 ++++++++----
+ arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
+ arch/powerpc/kvm/booke.c | 290 ++++++++++++++++++++++++++-----
+ arch/powerpc/kvm/booke_emulate.c | 22 ++-
+ arch/powerpc/kvm/e500.h | 3 +-
+ arch/powerpc/kvm/e500_tlb.c | 69 +++++++-
+ arch/powerpc/kvm/powerpc.c | 128 ++++++++++++--
+ arch/powerpc/kvm/trace.h | 200 ++++++++++++++++++---
+ arch/powerpc/platforms/Kconfig | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 9 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +
+ drivers/tty/Kconfig | 1 +
+ drivers/virt/Kconfig | 1 +
+ include/linux/kvm.h | 4 +
+ include/linux/kvm_host.h | 1 +
+ 36 files changed, 961 insertions(+), 248 deletions(-)
+Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (e09f4b3 Merge branch 'stable/for-linus-3.7' into linux-next)
+$ git merge xen-two/linux-next
+Merge made by the 'recursive' strategy.
+ arch/ia64/include/asm/xen/interface.h | 7 +-
+ arch/x86/include/asm/xen/interface.h | 7 ++
+ arch/x86/xen/apic.c | 3 +-
+ arch/x86/xen/enlighten.c | 2 +
+ arch/x86/xen/mmu.c | 9 +-
+ arch/x86/xen/p2m.c | 2 +-
+ arch/x86/xen/pci-swiotlb-xen.c | 5 +-
+ arch/x86/xen/platform-pci-unplug.c | 1 +
+ arch/x86/xen/xen-head.S | 56 +++++++++++-
+ drivers/pci/xen-pcifront.c | 2 +-
+ drivers/tty/hvc/hvc_xen.c | 2 +
+ drivers/xen/events.c | 18 +++-
+ drivers/xen/gntdev.c | 2 +-
+ drivers/xen/grant-table.c | 14 +--
+ drivers/xen/privcmd.c | 134 +++++++++++++++++++++-------
+ drivers/xen/swiotlb-xen.c | 20 +----
+ drivers/xen/sys-hypervisor.c | 13 ++-
+ drivers/xen/tmem.c | 1 +
+ drivers/xen/xen-pciback/pci_stub.c | 8 +-
+ drivers/xen/xenbus/xenbus_dev_backend.c | 2 +-
+ drivers/xen/xenbus/xenbus_probe.c | 4 +-
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 1 +
+ include/xen/interface/grant_table.h | 4 +-
+ include/xen/interface/memory.h | 9 +-
+ include/xen/interface/platform.h | 4 +-
+ include/xen/interface/version.h | 3 +
+ include/xen/interface/xen.h | 7 +-
+ include/xen/privcmd.h | 27 +++++-
+ include/xen/swiotlb-xen.h | 9 --
+ 29 files changed, 271 insertions(+), 105 deletions(-)
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (f3b5704 workqueue: move gcwq_associate() under CPU hotplug section)
+$ git merge workqueues/for-next
+Auto-merging sound/soc/soc-core.c
+Auto-merging sound/pci/oxygen/oxygen_lib.c
+Auto-merging net/core/link_watch.c
+Auto-merging net/core/dst.c
+Auto-merging net/9p/trans_fd.c
+Auto-merging mm/slab.c
+Auto-merging fs/gfs2/super.c
+Auto-merging drivers/video/omap2/dss/dsi.c
+Auto-merging drivers/video/omap2/displays/panel-taal.c
+Auto-merging drivers/usb/gadget/u_ether.c
+Auto-merging drivers/tty/serial/kgdboc.c
+Auto-merging drivers/thermal/thermal_sys.c
+Auto-merging drivers/scsi/ipr.c
+Auto-merging drivers/regulator/core.c
+Auto-merging drivers/power/wm97xx_battery.c
+Auto-merging drivers/power/charger-manager.c
+Auto-merging drivers/power/ab8500_fg.c
+Auto-merging drivers/power/ab8500_charger.c
+Auto-merging drivers/power/ab8500_btemp.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/net/ethernet/sun/niu.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/sense.c
+Auto-merging drivers/mtd/mtdoops.c
+Auto-merging drivers/media/usb/tm6000/tm6000-cards.c
+Auto-merging drivers/media/usb/em28xx/em28xx-cards.c
+Auto-merging drivers/media/usb/cx231xx/cx231xx-cards.c
+Auto-merging drivers/media/platform/omap24xxcam.c
+Auto-merging drivers/media/pci/saa7134/saa7134-empress.c
+Auto-merging drivers/media/pci/saa7134/saa7134-core.c
+Auto-merging drivers/media/pci/mantis/mantis_uart.c
+Auto-merging drivers/media/pci/mantis/mantis_evm.c
+Auto-merging drivers/media/pci/cx88/cx88-mpeg.c
+Auto-merging drivers/media/pci/cx23885/cx23885-input.c
+Auto-merging drivers/media/pci/cx18/cx18-driver.c
+Auto-merging drivers/media/pci/bt8xx/bttv-driver.c
+Auto-merging drivers/media/dvb-core/dvb_net.c
+Auto-merging drivers/leds/leds-lp8788.c
+CONFLICT (modify/delete): drivers/hid/hid-picolcd.c deleted in HEAD and modified in workqueues/for-next. Version workqueues/for-next of drivers/hid/hid-picolcd.c left in tree.
+Auto-merging drivers/cpufreq/cpufreq_conservative.c
+Auto-merging drivers/char/tpm/tpm.c
+Auto-merging block/genhd.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/hid/hid-picolcd.c
+drivers/hid/hid-picolcd.c: needs merge
+rm 'drivers/hid/hid-picolcd.c'
+$ git commit -v -a
+[master ae6b0b5] Merge remote-tracking branch 'workqueues/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-pxa/sharpsl_pm.c | 4 +-
+ arch/arm/plat-omap/mailbox.c | 2 +-
+ arch/powerpc/platforms/cell/cpufreq_spudemand.c | 2 +-
+ arch/sh/drivers/push-switch.c | 2 +-
+ block/blk-core.c | 8 +-
+ block/blk-throttle.c | 14 +-
+ block/genhd.c | 14 +-
+ drivers/block/floppy.c | 5 +-
+ drivers/block/xen-blkfront.c | 4 +-
+ drivers/cdrom/gdrom.c | 2 +-
+ drivers/char/sonypi.c | 2 +-
+ drivers/char/tpm/tpm.c | 4 +-
+ drivers/cpufreq/cpufreq_conservative.c | 2 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 2 +-
+ drivers/devfreq/devfreq.c | 2 +-
+ drivers/edac/edac_mc.c | 17 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 6 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_gpio.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
+ drivers/hid/hid-wiimote-ext.c | 2 +-
+ drivers/infiniband/core/addr.c | 4 +-
+ drivers/infiniband/core/mad.c | 16 +-
+ drivers/infiniband/hw/nes/nes_hw.c | 6 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 5 +-
+ drivers/input/keyboard/qt2160.c | 3 +-
+ drivers/input/mouse/synaptics_i2c.c | 7 +-
+ drivers/input/touchscreen/wm831x-ts.c | 2 +-
+ drivers/isdn/mISDN/hwchannel.c | 4 +-
+ drivers/leds/leds-lm3533.c | 6 +-
+ drivers/leds/leds-lp8788.c | 2 +-
+ drivers/leds/leds-wm8350.c | 2 +-
+ drivers/macintosh/ams/ams-core.c | 2 +-
+ drivers/md/dm-mpath.c | 2 +-
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-stripe.c | 2 +-
+ drivers/media/dvb-core/dvb_net.c | 4 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 2 +-
+ drivers/media/pci/cx18/cx18-driver.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-input.c | 6 +-
+ drivers/media/pci/cx88/cx88-mpeg.c | 2 +-
+ drivers/media/pci/mantis/mantis_evm.c | 2 +-
+ drivers/media/pci/mantis/mantis_uart.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
+ drivers/media/platform/omap24xxcam.c | 6 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-cards.c | 2 +-
+ drivers/mfd/menelaus.c | 4 +-
+ drivers/misc/ioc4.c | 2 +-
+ drivers/mmc/core/host.c | 4 +-
+ drivers/mtd/mtdoops.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/sense.c | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 +-
+ drivers/net/ethernet/sun/cassini.c | 2 +-
+ drivers/net/ethernet/sun/niu.c | 2 +-
+ drivers/net/virtio_net.c | 12 +-
+ drivers/net/wireless/hostap/hostap_ap.c | 4 +-
+ drivers/net/wireless/hostap/hostap_hw.c | 10 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 8 +-
+ drivers/net/wireless/zd1211rw/zd_usb.c | 3 +-
+ drivers/platform/x86/thinkpad_acpi.c | 20 +-
+ drivers/power/ab8500_btemp.c | 2 +-
+ drivers/power/ab8500_charger.c | 8 +-
+ drivers/power/ab8500_fg.c | 8 +-
+ drivers/power/abx500_chargalg.c | 4 +-
+ drivers/power/charger-manager.c | 9 +-
+ drivers/power/collie_battery.c | 2 +-
+ drivers/power/ds2760_battery.c | 9 +-
+ drivers/power/jz4740-battery.c | 6 +-
+ drivers/power/max17040_battery.c | 2 +-
+ drivers/power/tosa_battery.c | 2 +-
+ drivers/power/wm97xx_battery.c | 2 +-
+ drivers/power/z2_battery.c | 2 +-
+ drivers/regulator/core.c | 2 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 4 +-
+ drivers/scsi/ipr.c | 2 +-
+ drivers/scsi/pmcraid.c | 2 +-
+ drivers/scsi/qla2xxx/qla_target.c | 2 +-
+ drivers/thermal/thermal_sys.c | 15 +-
+ drivers/tty/hvc/hvsi.c | 2 +-
+ drivers/tty/ipwireless/hardware.c | 2 +-
+ drivers/tty/ipwireless/network.c | 4 +-
+ drivers/tty/serial/kgdboc.c | 2 +-
+ drivers/tty/serial/omap-serial.c | 2 +-
+ drivers/tty/tty_ldisc.c | 6 +-
+ drivers/usb/atm/speedtch.c | 2 +-
+ drivers/usb/atm/ueagle-atm.c | 2 +-
+ drivers/usb/gadget/u_ether.c | 2 +-
+ drivers/usb/host/ohci-hcd.c | 2 +-
+ drivers/usb/otg/isp1301_omap.c | 2 +-
+ drivers/video/omap2/displays/panel-taal.c | 6 +-
+ drivers/video/omap2/dss/dsi.c | 6 +-
+ fs/affs/super.c | 2 +-
+ fs/afs/callback.c | 4 +-
+ fs/afs/server.c | 10 +-
+ fs/afs/vlocation.c | 14 +-
+ fs/gfs2/lock_dlm.c | 2 +-
+ fs/gfs2/super.c | 2 +-
+ fs/hfs/inode.c | 2 +-
+ fs/ncpfs/inode.c | 6 +-
+ fs/nfs/nfs4renewd.c | 3 +-
+ fs/ocfs2/cluster/quorum.c | 2 +-
+ fs/xfs/xfs_super.c | 2 +-
+ fs/xfs/xfs_sync.c | 2 +-
+ include/linux/workqueue.h | 220 ++--
+ kernel/srcu.c | 4 +-
+ kernel/workqueue.c | 1262 +++++++++++++----------
+ mm/slab.c | 2 +-
+ mm/vmstat.c | 2 +-
+ net/9p/trans_fd.c | 2 +-
+ net/core/dst.c | 4 +-
+ net/core/link_watch.c | 21 +-
+ net/core/neighbour.c | 2 +-
+ net/dsa/dsa.c | 2 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/rfkill/input.c | 3 +-
+ net/sunrpc/cache.c | 2 +-
+ security/keys/gc.c | 8 +-
+ security/keys/key.c | 2 +-
+ sound/i2c/other/ak4113.c | 2 +-
+ sound/i2c/other/ak4114.c | 2 +-
+ sound/pci/oxygen/oxygen_lib.c | 8 +-
+ sound/soc/codecs/wm8350.c | 2 +-
+ sound/soc/codecs/wm8753.c | 2 +-
+ sound/soc/soc-core.c | 6 +-
+ virt/kvm/eventfd.c | 2 +-
+ 130 files changed, 1052 insertions(+), 968 deletions(-)
+Merging drivers-x86/linux-next (973713e classmate-laptop: always call input_sync() after input_report_switch())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (c7700f9 Merge tag 'topic/domain' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regmap-irq.c | 103 +++++++++++++++++++++++++++++++-------
+ drivers/base/regmap/regmap.c | 13 ++---
+ drivers/mfd/wm8994-irq.c | 1 +
+ include/linux/regmap.h | 4 ++
+ 4 files changed, 95 insertions(+), 26 deletions(-)
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (d13c608 leds: Add new LED driver for lm355x chips)
+$ git merge leds/for-next
+Removing include/linux/platform_data/leds-lm3556.h
+Auto-merging drivers/leds/leds-wm8350.c
+Removing drivers/leds/leds-lm3556.c
+Merge made by the 'recursive' strategy.
+ Documentation/leds/leds-lp5523.txt | 21 +-
+ drivers/leds/Kconfig | 15 +-
+ drivers/leds/Makefile | 2 +-
+ drivers/leds/led-class.c | 15 +
+ drivers/leds/led-core.c | 16 +-
+ drivers/leds/led-triggers.c | 17 +-
+ drivers/leds/leds-clevo-mail.c | 10 +-
+ drivers/leds/leds-gpio.c | 12 +-
+ drivers/leds/leds-lm3556.c | 512 --------------------------
+ drivers/leds/leds-lm355x.c | 572 +++++++++++++++++++++++++++++
+ drivers/leds/leds-lp5523.c | 71 ++--
+ drivers/leds/leds-wm8350.c | 29 +-
+ drivers/leds/leds.h | 2 +
+ include/linux/leds-lp5523.h | 1 +
+ include/linux/leds.h | 4 +
+ include/linux/platform_data/leds-lm3556.h | 50 ---
+ include/linux/platform_data/leds-lm355x.h | 66 ++++
+ 17 files changed, 775 insertions(+), 640 deletions(-)
+ delete mode 100644 drivers/leds/leds-lm3556.c
+ create mode 100644 drivers/leds/leds-lm355x.c
+ delete mode 100644 include/linux/platform_data/leds-lm3556.h
+ create mode 100644 include/linux/platform_data/leds-lm355x.h
+Merging driver-core/driver-core-next (ef4158c Document:add Chinese translation of basic_profiling.txt)
+$ git merge driver-core/driver-core-next
+Auto-merging init/Kconfig
+Auto-merging include/linux/pm.h
+Auto-merging include/linux/device.h
+Auto-merging drivers/extcon/extcon-class.c
+Auto-merging drivers/base/power/main.c
+Auto-merging drivers/base/platform.c
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/tile/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-extcon | 22 +-
+ Documentation/filesystems/debugfs.txt | 4 +-
+ Documentation/kobject.txt | 6 +-
+ Documentation/zh_CN/arm/Booting | 175 ++++
+ Documentation/zh_CN/basic_profiling.txt | 71 ++
+ Documentation/zh_CN/filesystems/sysfs.txt | 372 ++++++++
+ Documentation/zh_CN/gpio.txt | 662 +++++++++++++
+ Documentation/zh_CN/video4linux/v4l2-framework.txt | 983 ++++++++++++++++++++
+ MAINTAINERS | 4 +-
+ arch/tile/Kconfig | 8 -
+ arch/xtensa/Kconfig | 18 -
+ drivers/base/core.c | 18 +-
+ drivers/base/devres.c | 42 +
+ drivers/base/firmware_class.c | 827 +++++++++++++---
+ drivers/base/platform.c | 41 +-
+ drivers/base/power/main.c | 22 +
+ drivers/extcon/Kconfig | 8 +-
+ drivers/extcon/Makefile | 5 +-
+ drivers/extcon/extcon-adc-jack.c | 198 ++++
+ drivers/extcon/extcon-arizona.c | 78 +-
+ drivers/extcon/{extcon_class.c => extcon-class.c} | 12 +-
+ drivers/extcon/{extcon_gpio.c => extcon-gpio.c} | 0
+ drivers/extcon/extcon-max77693.c | 8 +-
+ drivers/hv/hv.c | 34 +-
+ drivers/hv/hv_kvp.c | 253 ++++-
+ drivers/hv/hv_util.c | 4 +-
+ drivers/hv/hyperv_vmbus.h | 47 +-
+ drivers/hv/vmbus_drv.c | 42 +-
+ drivers/memory/Makefile | 3 +
+ drivers/memory/emif.c | 182 +++-
+ drivers/memory/of_memory.c | 153 +++
+ drivers/memory/of_memory.h | 36 +
+ drivers/vme/bridges/vme_ca91cx42.c | 20 +-
+ drivers/vme/bridges/vme_tsi148.c | 10 +-
+ fs/debugfs/inode.c | 8 +-
+ fs/sysfs/symlink.c | 2 +-
+ include/linux/device.h | 4 +
+ include/linux/extcon.h | 18 +-
+ include/linux/extcon/extcon-adc-jack.h | 71 ++
+ include/linux/firmware.h | 15 +
+ include/linux/hyperv.h | 99 +-
+ include/linux/platform_device.h | 4 +
+ include/linux/pm.h | 5 +
+ init/Kconfig | 8 +-
+ tools/hv/hv_get_dns_info.sh | 13 +
+ tools/hv/hv_kvp_daemon.c | 371 ++++++--
+ 46 files changed, 4571 insertions(+), 415 deletions(-)
+ create mode 100644 Documentation/zh_CN/arm/Booting
+ create mode 100644 Documentation/zh_CN/basic_profiling.txt
+ create mode 100644 Documentation/zh_CN/filesystems/sysfs.txt
+ create mode 100644 Documentation/zh_CN/gpio.txt
+ create mode 100644 Documentation/zh_CN/video4linux/v4l2-framework.txt
+ create mode 100644 drivers/extcon/extcon-adc-jack.c
+ rename drivers/extcon/{extcon_class.c => extcon-class.c} (98%)
+ rename drivers/extcon/{extcon_gpio.c => extcon-gpio.c} (100%)
+ create mode 100644 drivers/memory/of_memory.c
+ create mode 100644 drivers/memory/of_memory.h
+ create mode 100644 include/linux/extcon/extcon-adc-jack.h
+ create mode 100755 tools/hv/hv_get_dns_info.sh
+$ git am -3 ../patches/0001-extcon-adc_jack-update-for-INIT_DELAYED_WORK_DEFERRA.patch
+Applying: extcon: adc_jack: update for INIT_DELAYED_WORK_DEFERRABLE name change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/extcon/extcon-adc-jack.c
+$ git add .
+$ git commit -v -a --amend
+[master 4ee698c] Merge remote-tracking branch 'driver-core/driver-core-next'
+Merging tty/tty-next (b1b7991 tty_register_device_attr updated for tty-next)
+$ git merge tty/tty-next
+Removing include/linux/stallion.h
+Removing include/linux/serial167.h
+Removing include/linux/sc26198.h
+Removing include/linux/istallion.h
+Removing include/linux/generic_serial.h
+Removing include/linux/comstats.h
+Removing include/linux/cdk.h
+Removing include/linux/cd1400.h
+Auto-merging include/linux/Kbuild
+Removing firmware/intelliport2.bin.ihex
+Auto-merging firmware/Makefile
+Auto-merging drivers/usb/serial/ftdi_sio.c
+Auto-merging drivers/tty/tty_ldisc.c
+Auto-merging drivers/tty/serial/omap-serial.c
+Removing drivers/tty/serial/max3107.h
+Removing drivers/tty/serial/max3107.c
+Auto-merging drivers/tty/serial/imx.c
+Auto-merging drivers/tty/hvc/hvsi.c
+Auto-merging drivers/tty/hvc/hvc_console.c
+Auto-merging arch/xtensa/platforms/iss/console.c
+Removing Documentation/serial/computone.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-tty | 9 +
+ .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt | 14 +
+ .../devicetree/bindings/tty/serial/of-serial.txt | 2 +
+ Documentation/serial/00-INDEX | 2 -
+ Documentation/serial/computone.txt | 520 -----
+ arch/alpha/kernel/srmcons.c | 1 +
+ arch/arm/mach-omap2/serial.c | 18 +-
+ arch/arm/plat-omap/include/plat/omap-serial.h | 52 +-
+ arch/ia64/hp/sim/simserial.c | 3 +-
+ arch/m68k/emu/nfcon.c | 4 +
+ arch/mips/cavium-octeon/serial.c | 30 +-
+ arch/mips/sni/a20r.c | 32 +
+ arch/parisc/kernel/pdc_cons.c | 1 +
+ arch/um/drivers/line.c | 3 +-
+ arch/xtensa/platforms/iss/console.c | 1 +
+ drivers/bluetooth/hci_ath.c | 2 +-
+ drivers/char/mwave/mwavedd.c | 16 +-
+ drivers/char/pcmcia/synclink_cs.c | 131 +-
+ drivers/char/ttyprintk.c | 33 +-
+ drivers/isdn/capi/capi.c | 3 +-
+ drivers/isdn/gigaset/interface.c | 7 +-
+ drivers/isdn/i4l/isdn_tty.c | 41 +-
+ drivers/misc/ibmasm/uart.c | 16 +-
+ drivers/misc/pti.c | 128 +-
+ drivers/mmc/card/sdio_uart.c | 24 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 22 +-
+ drivers/net/irda/irtty-sir.c | 10 +-
+ drivers/net/usb/hso.c | 19 +-
+ drivers/parport/parport_gsc.c | 1 +
+ drivers/parport/parport_serial.c | 11 +-
+ drivers/s390/char/con3215.c | 28 +-
+ drivers/s390/char/sclp_tty.c | 1 +
+ drivers/s390/char/sclp_vt220.c | 1 +
+ drivers/s390/char/tty3270.c | 34 +-
+ drivers/staging/ipack/devices/ipoctal.c | 14 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 18 +-
+ drivers/staging/speakup/serialio.h | 3 +-
+ drivers/tty/amiserial.c | 45 +-
+ drivers/tty/bfin_jtag_comm.c | 1 +
+ drivers/tty/cyclades.c | 102 +-
+ drivers/tty/ehv_bytechan.c | 9 +-
+ drivers/tty/hvc/hvc_console.c | 31 +-
+ drivers/tty/hvc/hvcs.c | 82 +-
+ drivers/tty/hvc/hvsi.c | 2 +
+ drivers/tty/hvc/hvsi_lib.c | 2 +-
+ drivers/tty/ipwireless/tty.c | 2 +-
+ drivers/tty/isicom.c | 13 +-
+ drivers/tty/moxa.c | 39 +-
+ drivers/tty/mxser.c | 63 +-
+ drivers/tty/n_gsm.c | 142 +-
+ drivers/tty/n_r3964.c | 10 +-
+ drivers/tty/n_tty.c | 29 +-
+ drivers/tty/nozomi.c | 4 +-
+ drivers/tty/pty.c | 234 ++-
+ drivers/tty/rocket.c | 22 +-
+ drivers/tty/serial/68328serial.c | 23 +-
+ drivers/tty/serial/8250/8250.c | 80 +-
+ drivers/tty/serial/8250/8250.h | 34 +-
+ drivers/tty/serial/8250/8250_acorn.c | 22 +-
+ drivers/tty/serial/8250/8250_dw.c | 38 +-
+ drivers/tty/serial/8250/8250_gsc.c | 26 +-
+ drivers/tty/serial/8250/8250_hp300.c | 26 +-
+ drivers/tty/serial/8250/8250_pci.c | 205 +-
+ drivers/tty/serial/8250/8250_pnp.c | 28 +-
+ drivers/tty/serial/8250/serial_cs.c | 30 +-
+ drivers/tty/serial/Kconfig | 50 +-
+ drivers/tty/serial/Makefile | 4 +-
+ drivers/tty/serial/altera_uart.c | 6 +-
+ drivers/tty/serial/amba-pl010.c | 15 +-
+ drivers/tty/serial/amba-pl011.c | 85 +-
+ drivers/tty/serial/bfin_uart.c | 2 +-
+ drivers/tty/serial/crisv10.c | 45 +-
+ drivers/tty/serial/ifx6x60.c | 4 +-
+ drivers/tty/serial/imx.c | 5 +-
+ drivers/tty/serial/ioc4_serial.c | 2 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 8 +-
+ drivers/tty/serial/lpc32xx_hs.c | 823 ++++++++
+ drivers/tty/serial/m32r_sio.c | 36 +-
+ drivers/tty/serial/max3100.c | 12 +-
+ drivers/tty/serial/max3107.c | 1215 -----------
+ drivers/tty/serial/max3107.h | 441 ----
+ drivers/tty/serial/max310x.c | 1260 ++++++++++++
+ drivers/tty/serial/mpc52xx_uart.c | 8 +-
+ drivers/tty/serial/msm_smd_tty.c | 8 +-
+ drivers/tty/serial/mxs-auart.c | 7 +-
+ drivers/tty/serial/of_serial.c | 13 +-
+ drivers/tty/serial/omap-serial.c | 841 ++++----
+ drivers/tty/serial/pch_uart.c | 4 +
+ drivers/tty/serial/pxa.c | 14 +
+ drivers/tty/serial/samsung.c | 46 +-
+ drivers/tty/serial/sc26xx.c | 4 +
+ drivers/tty/serial/sccnxp.c | 985 +++++++++
+ drivers/tty/serial/serial_core.c | 223 +-
+ drivers/tty/serial/sirfsoc_uart.c | 8 +-
+ drivers/tty/serial/sunsu.c | 8 +-
+ drivers/tty/synclink.c | 86 +-
+ drivers/tty/synclink_gt.c | 37 +-
+ drivers/tty/synclinkmp.c | 58 +-
+ drivers/tty/tty_io.c | 375 ++--
+ drivers/tty/tty_ioctl.c | 100 +-
+ drivers/tty/tty_ldisc.c | 78 +-
+ drivers/tty/tty_mutex.c | 71 +-
+ drivers/tty/tty_port.c | 94 +-
+ drivers/tty/vt/keyboard.c | 50 +-
+ drivers/tty/vt/vt.c | 63 +-
+ drivers/usb/class/cdc-acm.c | 5 +-
+ drivers/usb/gadget/u_serial.c | 3 +-
+ drivers/usb/serial/ark3116.c | 4 +-
+ drivers/usb/serial/belkin_sa.c | 2 +-
+ drivers/usb/serial/console.c | 4 +-
+ drivers/usb/serial/cp210x.c | 8 +-
+ drivers/usb/serial/cypress_m8.c | 40 +-
+ drivers/usb/serial/digi_acceleport.c | 14 +-
+ drivers/usb/serial/empeg.c | 2 +-
+ drivers/usb/serial/f81232.c | 3 +-
+ drivers/usb/serial/ftdi_sio.c | 2 +-
+ drivers/usb/serial/io_edgeport.c | 12 +-
+ drivers/usb/serial/io_ti.c | 12 +-
+ drivers/usb/serial/ir-usb.c | 2 +-
+ drivers/usb/serial/iuu_phoenix.c | 28 +-
+ drivers/usb/serial/keyspan.c | 6 +-
+ drivers/usb/serial/keyspan_pda.c | 4 +-
+ drivers/usb/serial/kl5kusb105.c | 18 +-
+ drivers/usb/serial/kobil_sct.c | 14 +-
+ drivers/usb/serial/mct_u232.c | 4 +-
+ drivers/usb/serial/metro-usb.c | 6 -
+ drivers/usb/serial/mos7720.c | 14 +-
+ drivers/usb/serial/mos7840.c | 12 +-
+ drivers/usb/serial/oti6858.c | 10 +-
+ drivers/usb/serial/pl2303.c | 6 +-
+ drivers/usb/serial/quatech2.c | 4 +-
+ drivers/usb/serial/sierra.c | 2 +-
+ drivers/usb/serial/spcp8x5.c | 12 +-
+ drivers/usb/serial/ssu100.c | 4 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 10 +-
+ drivers/usb/serial/usb-serial.c | 7 +-
+ drivers/usb/serial/usb_wwan.c | 2 +-
+ drivers/usb/serial/whiteheat.c | 2 +-
+ firmware/Makefile | 1 -
+ firmware/intelliport2.bin.ihex | 2147 --------------------
+ include/linux/Kbuild | 4 +-
+ include/linux/cd1400.h | 292 ---
+ include/linux/cdk.h | 486 -----
+ include/linux/comstats.h | 119 --
+ include/linux/generic_serial.h | 35 -
+ include/linux/istallion.h | 123 --
+ include/linux/kbd_kern.h | 13 -
+ include/linux/platform_data/max310x.h | 67 +
+ include/linux/platform_data/sccnxp.h | 93 +
+ include/linux/sc26198.h | 533 -----
+ include/linux/serial.h | 81 +-
+ include/linux/serial167.h | 157 --
+ include/linux/serial_8250.h | 33 +-
+ include/linux/serial_core.h | 4 +-
+ include/linux/serial_reg.h | 4 +
+ include/linux/stallion.h | 147 --
+ include/linux/tty.h | 92 +-
+ include/linux/tty_driver.h | 47 +-
+ include/linux/tty_flags.h | 78 +
+ include/net/irda/ircomm_tty.h | 17 +-
+ net/bluetooth/rfcomm/tty.c | 10 +-
+ net/irda/ircomm/ircomm_param.c | 5 -
+ net/irda/ircomm/ircomm_tty.c | 320 ++-
+ net/irda/ircomm/ircomm_tty_attach.c | 40 +-
+ net/irda/ircomm/ircomm_tty_ioctl.c | 33 +-
+ 165 files changed, 6307 insertions(+), 8745 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt
+ delete mode 100644 Documentation/serial/computone.txt
+ create mode 100644 drivers/tty/serial/lpc32xx_hs.c
+ delete mode 100644 drivers/tty/serial/max3107.c
+ delete mode 100644 drivers/tty/serial/max3107.h
+ create mode 100644 drivers/tty/serial/max310x.c
+ create mode 100644 drivers/tty/serial/sccnxp.c
+ delete mode 100644 firmware/intelliport2.bin.ihex
+ delete mode 100644 include/linux/cd1400.h
+ delete mode 100644 include/linux/cdk.h
+ delete mode 100644 include/linux/comstats.h
+ delete mode 100644 include/linux/generic_serial.h
+ delete mode 100644 include/linux/istallion.h
+ create mode 100644 include/linux/platform_data/max310x.h
+ create mode 100644 include/linux/platform_data/sccnxp.h
+ delete mode 100644 include/linux/sc26198.h
+ delete mode 100644 include/linux/serial167.h
+ delete mode 100644 include/linux/stallion.h
+ create mode 100644 include/linux/tty_flags.h
+Merging usb/usb-next (f61870e usb: remove libusual)
+$ git merge usb/usb-next
+Removing drivers/usb/storage/libusual.c
+Auto-merging drivers/usb/serial/mos7720.c
+Auto-merging drivers/usb/serial/ftdi_sio.c
+Auto-merging drivers/usb/serial/cp210x.c
+Auto-merging drivers/usb/core/quirks.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging drivers/usb/atm/ueagle-atm.c
+Removing drivers/block/ub.c
+Auto-merging Documentation/feature-removal-schedule.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/platform-uhci.txt | 12 +
+ Documentation/devicetree/bindings/usb/pxa-usb.txt | 31 +
+ .../devicetree/bindings/usb/vt8500-ehci.txt | 12 +
+ Documentation/feature-removal-schedule.txt | 11 -
+ Documentation/usb/persist.txt | 3 +
+ arch/arm/mach-vt8500/bv07.c | 1 +
+ arch/arm/mach-vt8500/devices-vt8500.c | 5 +
+ arch/arm/mach-vt8500/devices-wm8505.c | 4 +
+ arch/arm/mach-vt8500/devices.c | 11 +
+ arch/arm/mach-vt8500/devices.h | 1 +
+ arch/arm/mach-vt8500/wm8505_7in.c | 1 +
+ drivers/block/Kconfig | 12 -
+ drivers/block/Makefile | 1 -
+ drivers/block/ub.c | 2474 --------------------
+ drivers/staging/keucr/usb.c | 2 +-
+ drivers/usb/atm/ueagle-atm.c | 79 +-
+ drivers/usb/class/cdc-acm.c | 1 -
+ drivers/usb/core/endpoint.c | 10 +-
+ drivers/usb/core/quirks.c | 2 +-
+ drivers/usb/core/sysfs.c | 12 +-
+ drivers/usb/gadget/lpc32xx_udc.c | 2 +-
+ drivers/usb/gadget/s3c-hsotg.c | 3 +
+ drivers/usb/host/Kconfig | 18 +-
+ drivers/usb/host/ehci-atmel.c | 30 +-
+ drivers/usb/host/ehci-au1xxx.c | 20 +-
+ drivers/usb/host/ehci-cns3xxx.c | 16 +-
+ drivers/usb/host/ehci-fsl.c | 58 +-
+ drivers/usb/host/ehci-fsl.h | 1 +
+ drivers/usb/host/ehci-grlib.c | 18 +-
+ drivers/usb/host/ehci-ixp4xx.c | 19 +-
+ drivers/usb/host/ehci-ls1x.c | 18 +-
+ drivers/usb/host/ehci-msm.c | 13 +-
+ drivers/usb/host/ehci-mv.c | 51 +-
+ drivers/usb/host/ehci-mxc.c | 45 +-
+ drivers/usb/host/ehci-platform.c | 50 +-
+ drivers/usb/host/ehci-ppc-of.c | 28 +-
+ drivers/usb/host/ehci-s5p.c | 7 +-
+ drivers/usb/host/ehci-sead3.c | 15 +-
+ drivers/usb/host/ehci-sh.c | 35 +-
+ drivers/usb/host/ehci-tegra.c | 40 +-
+ drivers/usb/host/ehci-vt8500.c | 24 +-
+ drivers/usb/host/ehci-xilinx-of.c | 20 +-
+ drivers/usb/host/fhci-sched.c | 3 +-
+ drivers/usb/host/ohci-nxp.c | 2 +-
+ drivers/usb/host/ohci-platform.c | 46 +-
+ drivers/usb/host/ohci-pxa27x.c | 68 +
+ drivers/usb/host/uhci-hcd.c | 5 +
+ drivers/usb/host/uhci-platform.c | 157 ++
+ drivers/usb/host/whci/hcd.c | 8 +-
+ drivers/usb/host/whci/qset.c | 11 +-
+ drivers/usb/misc/legousbtower.c | 3 -
+ drivers/usb/phy/isp1301.c | 6 -
+ drivers/usb/renesas_usbhs/fifo.c | 4 +-
+ drivers/usb/renesas_usbhs/mod.c | 25 +-
+ drivers/usb/serial/cp210x.c | 1 -
+ drivers/usb/serial/ftdi_sio.c | 2 +-
+ drivers/usb/serial/mos7720.c | 4 +-
+ drivers/usb/storage/Kconfig | 14 -
+ drivers/usb/storage/Makefile | 9 +-
+ drivers/usb/storage/alauda.c | 2 +-
+ drivers/usb/storage/cypress_atacb.c | 2 +-
+ drivers/usb/storage/datafab.c | 2 +-
+ drivers/usb/storage/ene_ub6250.c | 30 +-
+ drivers/usb/storage/freecom.c | 2 +-
+ drivers/usb/storage/isd200.c | 5 +-
+ drivers/usb/storage/jumpshot.c | 2 +-
+ drivers/usb/storage/karma.c | 2 +-
+ drivers/usb/storage/libusual.c | 243 --
+ drivers/usb/storage/onetouch.c | 2 +-
+ drivers/usb/storage/realtek_cr.c | 2 +-
+ drivers/usb/storage/sddr09.c | 2 +-
+ drivers/usb/storage/sddr55.c | 2 +-
+ drivers/usb/storage/shuttle_usbat.c | 2 +-
+ drivers/usb/storage/transport.c | 2 +-
+ drivers/usb/storage/unusual_devs.h | 36 +-
+ drivers/usb/storage/usb.c | 17 +-
+ drivers/usb/storage/usual-tables.c | 18 +-
+ drivers/usb/wusbcore/security.c | 7 +-
+ drivers/usb/wusbcore/wa-hc.c | 4 +-
+ include/linux/fsl_devices.h | 1 +
+ include/linux/usb/ehci_pdriver.h | 8 +
+ include/linux/usb/hcd.h | 4 +-
+ include/linux/usb/ohci_pdriver.h | 8 +
+ include/linux/usb/quirks.h | 4 +-
+ include/linux/usb_usual.h | 24 -
+ 85 files changed, 761 insertions(+), 3256 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/usb/platform-uhci.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/pxa-usb.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
+ delete mode 100644 drivers/block/ub.c
+ create mode 100644 drivers/usb/host/uhci-platform.c
+ delete mode 100644 drivers/usb/storage/libusual.c
+Merging staging/staging-next (7953e44 staging: ipack: only build on platforms that provide ioread/iowrite.)
+$ git merge staging/staging-next
+Removing drivers/staging/zsmalloc/zsmalloc_int.h
+Auto-merging drivers/staging/vt6656/rxtx.c
+Auto-merging drivers/staging/vt6656/dpc.c
+Removing drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
+Auto-merging drivers/staging/serqt_usb2/serqt_usb2.c
+Removing drivers/staging/rtl8712/usb_vendor_req.h
+Removing drivers/staging/ramster/xvmalloc_int.h
+Removing drivers/staging/ramster/xvmalloc.h
+Removing drivers/staging/ramster/xvmalloc.c
+Auto-merging drivers/staging/ramster/ramster/tcp.c
+Auto-merging drivers/staging/ramster/ramster/r2net.c
+Auto-merging drivers/staging/ramster/ramster/nodemanager.c
+Auto-merging drivers/staging/ramster/ramster/heartbeat.c
+Removing drivers/staging/ramster/cluster/Makefile
+Removing drivers/staging/ramster/TODO
+Auto-merging drivers/staging/ipack/devices/ipoctal.c
+Auto-merging drivers/staging/iio/meter/ade7759.c
+Auto-merging drivers/staging/iio/meter/ade7754.c
+Auto-merging drivers/staging/iio/meter/ade7753.c
+Auto-merging drivers/staging/iio/imu/adis16400_core.c
+Auto-merging drivers/staging/iio/gyro/adis16260_core.c
+Auto-merging drivers/staging/iio/adc/ad7192.c
+Auto-merging drivers/staging/iio/accel/lis3l02dq_ring.c
+Auto-merging drivers/staging/et131x/et131x.c
+Removing drivers/staging/csr/csr_formatted_io.h
+Removing drivers/staging/csr/csr_formatted_io.c
+Removing drivers/staging/comedi/drivers/adl_pci7432.c
+Removing drivers/staging/comedi/drivers/adl_pci7230.c
+Removing drivers/staging/comedi/drivers/addi_apci_all.c
+Removing drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h
+Removing drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h
+Removing drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
+Auto-merging drivers/staging/android/binder.c
+Removing drivers/iio/dac/ad5446.h
+Auto-merging drivers/iio/adc/at91_adc.c
+Merge made by the 'recursive' strategy.
+ .../bindings/staging/iio/adc/mxs-lradc.txt | 15 +
+ drivers/iio/Kconfig | 2 +-
+ drivers/iio/adc/Kconfig | 5 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad_sigma_delta.c | 558 +++
+ drivers/iio/adc/at91_adc.c | 75 +-
+ drivers/iio/dac/Kconfig | 9 +-
+ drivers/iio/dac/ad5446.c | 429 ++-
+ drivers/iio/dac/ad5446.h | 91 -
+ drivers/iio/industrialio-buffer.c | 10 +-
+ drivers/iio/industrialio-core.c | 6 +-
+ drivers/iio/inkern.c | 6 +-
+ drivers/iio/kfifo_buf.c | 28 +-
+ drivers/staging/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/android/alarm-dev.c | 17 +-
+ drivers/staging/android/ashmem.c | 32 +-
+ drivers/staging/android/binder.c | 6 +-
+ drivers/staging/android/logger.c | 40 +-
+ drivers/staging/android/logger.h | 24 +-
+ drivers/staging/android/timed_gpio.c | 13 +-
+ drivers/staging/asus_oled/asus_oled.c | 56 +-
+ drivers/staging/bcm/Bcmchar.c | 2 +
+ drivers/staging/bcm/CmHost.c | 78 +-
+ drivers/staging/bcm/InterfaceInit.c | 16 +-
+ drivers/staging/bcm/InterfaceInit.h | 32 +-
+ drivers/staging/bcm/Misc.c | 5 +-
+ drivers/staging/bcm/PHSModule.c | 4 +-
+ drivers/staging/bcm/cntrl_SignalingInterface.h | 2 +-
+ drivers/staging/bcm/nvm.c | 2 +-
+ drivers/staging/bcm/target_params.h | 2 +-
+ drivers/staging/ccg/ccg.c | 2 +-
+ drivers/staging/comedi/Kconfig | 25 +-
+ drivers/staging/comedi/comedi_fops.c | 65 +-
+ drivers/staging/comedi/comedidev.h | 2 +-
+ drivers/staging/comedi/drivers.c | 75 +-
+ drivers/staging/comedi/drivers/8255.c | 4 +-
+ drivers/staging/comedi/drivers/Makefile | 3 +-
+ drivers/staging/comedi/drivers/acl7225b.c | 6 +-
+ .../comedi/drivers/addi-data/addi_amcc_S5920.c | 195 --
+ .../comedi/drivers/addi-data/addi_amcc_S5920.h | 27 -
+ .../staging/comedi/drivers/addi-data/addi_common.c | 14 +-
+ .../comedi/drivers/addi-data/amcc_s5933_58.h | 453 ---
+ .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 18 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 6 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 14 +-
+ drivers/staging/comedi/drivers/addi_apci_all.c | 18 -
+ drivers/staging/comedi/drivers/adl_pci6208.c | 183 +-
+ drivers/staging/comedi/drivers/adl_pci7230.c | 190 --
+ drivers/staging/comedi/drivers/adl_pci7296.c | 212 +-
+ drivers/staging/comedi/drivers/adl_pci7432.c | 200 --
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 332 ++
+ drivers/staging/comedi/drivers/adl_pci8164.c | 73 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 116 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 10 +-
+ drivers/staging/comedi/drivers/adq12b.c | 6 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 604 ++--
+ drivers/staging/comedi/drivers/adv_pci1723.c | 222 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 473 ++-
+ drivers/staging/comedi/drivers/aio_aio12_8.c | 218 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 63 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 72 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 54 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 4 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 8 +-
+ drivers/staging/comedi/drivers/c6xdigio.c | 6 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 6 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 100 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 22 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 382 +--
+ drivers/staging/comedi/drivers/cb_pcidio.c | 104 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 279 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 393 +--
+ drivers/staging/comedi/drivers/comedi_bond.c | 110 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 49 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 65 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 146 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 8 +-
+ drivers/staging/comedi/drivers/das08.c | 482 +--
+ drivers/staging/comedi/drivers/das08.h | 15 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 26 +
+ drivers/staging/comedi/drivers/das16.c | 12 +-
+ drivers/staging/comedi/drivers/das16m1.c | 10 +-
+ drivers/staging/comedi/drivers/das1800.c | 10 +-
+ drivers/staging/comedi/drivers/das6402.c | 4 +-
+ drivers/staging/comedi/drivers/das800.c | 8 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 6 +-
+ drivers/staging/comedi/drivers/dt2801.c | 12 +-
+ drivers/staging/comedi/drivers/dt2811.c | 8 +-
+ drivers/staging/comedi/drivers/dt2814.c | 4 +-
+ drivers/staging/comedi/drivers/dt2815.c | 2 +-
+ drivers/staging/comedi/drivers/dt2817.c | 2 +-
+ drivers/staging/comedi/drivers/dt282x.c | 14 +-
+ drivers/staging/comedi/drivers/dt3000.c | 12 +-
+ drivers/staging/comedi/drivers/dt9812.c | 8 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 161 +-
+ drivers/staging/comedi/drivers/fl512.c | 4 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 2 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 10 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 4 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 103 +-
+ drivers/staging/comedi/drivers/me4000.c | 10 +-
+ drivers/staging/comedi/drivers/me_daq.c | 70 +-
+ drivers/staging/comedi/drivers/mpc624.c | 2 +-
+ drivers/staging/comedi/drivers/mpc8260cpm.c | 2 +-
+ drivers/staging/comedi/drivers/multiq3.c | 14 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 8 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 17 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 8 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 6 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 2 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 8 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 19 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 2 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 10 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 18 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 69 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 15 +-
+ drivers/staging/comedi/drivers/pcl711.c | 10 +-
+ drivers/staging/comedi/drivers/pcl724.c | 15 +-
+ drivers/staging/comedi/drivers/pcl725.c | 4 +-
+ drivers/staging/comedi/drivers/pcl726.c | 6 +-
+ drivers/staging/comedi/drivers/pcl730.c | 8 +-
+ drivers/staging/comedi/drivers/pcl812.c | 12 +-
+ drivers/staging/comedi/drivers/pcl816.c | 6 +-
+ drivers/staging/comedi/drivers/pcl818.c | 18 +-
+ drivers/staging/comedi/drivers/pcm3724.c | 26 +-
+ drivers/staging/comedi/drivers/pcm3730.c | 12 +-
+ drivers/staging/comedi/drivers/pcmad.c | 2 +-
+ drivers/staging/comedi/drivers/pcmda12.c | 2 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 23 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 10 +-
+ drivers/staging/comedi/drivers/poc.c | 2 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 8 +-
+ drivers/staging/comedi/drivers/rtd520.c | 10 +-
+ drivers/staging/comedi/drivers/rti800.c | 10 +-
+ drivers/staging/comedi/drivers/rti802.c | 2 +-
+ drivers/staging/comedi/drivers/s526.c | 8 +-
+ drivers/staging/comedi/drivers/serial2002.c | 14 +-
+ drivers/staging/comedi/drivers/skel.c | 6 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 7 +-
+ drivers/staging/comedi/drivers/usbdux.c | 16 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 4 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 14 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 14 +-
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 9 +-
+ drivers/staging/comedi/range.c | 18 +-
+ drivers/staging/cptm1217/clearpad_tm1217.c | 13 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 6 +-
+ drivers/staging/csr/Makefile | 1 -
+ drivers/staging/csr/bh.c | 173 +-
+ drivers/staging/csr/csr_formatted_io.c | 27 -
+ drivers/staging/csr/csr_formatted_io.h | 25 -
+ drivers/staging/csr/csr_framework_ext.c | 13 +-
+ drivers/staging/csr/csr_panic.c | 1 -
+ drivers/staging/csr/csr_time.c | 27 +-
+ drivers/staging/csr/csr_wifi_hip_card_sdio.c | 8 +-
+ drivers/staging/csr/csr_wifi_hip_download.c | 2 +
+ drivers/staging/csr/csr_wifi_hip_send.c | 9 +-
+ drivers/staging/csr/csr_wifi_hip_udi.c | 94 +-
+ drivers/staging/csr/csr_wifi_hip_unifi.h | 1 -
+ drivers/staging/csr/drv.c | 46 +-
+ drivers/staging/csr/firmware.c | 4 +-
+ drivers/staging/csr/io.c | 53 +-
+ drivers/staging/csr/monitor.c | 7 +-
+ drivers/staging/csr/netdev.c | 630 +---
+ drivers/staging/csr/sdio_events.c | 4 +-
+ drivers/staging/csr/sdio_mmc.c | 65 +-
+ drivers/staging/csr/sme_native.c | 6 +-
+ drivers/staging/csr/sme_sys.c | 22 +-
+ drivers/staging/csr/sme_wext.c | 8 +-
+ drivers/staging/csr/ul_int.c | 5 +-
+ drivers/staging/csr/unifi_pdu_processing.c | 5 +-
+ drivers/staging/csr/unifi_priv.h | 40 -
+ drivers/staging/csr/unifi_wext.h | 27 +-
+ drivers/staging/csr/wext_events.c | 8 +-
+ drivers/staging/cxt1e1/linux.c | 12 +-
+ drivers/staging/cxt1e1/musycc.c | 10 +-
+ drivers/staging/et131x/et131x.c | 7 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 14 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 -
+ drivers/staging/gdm72xx/gdm_sdio.c | 6 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 10 +-
+ drivers/staging/gdm72xx/gdm_wimax.c | 16 +-
+ drivers/staging/iio/Documentation/generic_buffer.c | 10 +
+ drivers/staging/iio/Kconfig | 2 +-
+ drivers/staging/iio/TODO | 2 +-
+ drivers/staging/iio/accel/adis16201_core.c | 4 +-
+ drivers/staging/iio/accel/adis16203_core.c | 4 +-
+ drivers/staging/iio/accel/adis16204_core.c | 4 +-
+ drivers/staging/iio/accel/adis16209_core.c | 4 +-
+ drivers/staging/iio/accel/adis16220_core.c | 11 +-
+ drivers/staging/iio/accel/adis16240_core.c | 4 +-
+ drivers/staging/iio/accel/kxsd9.c | 6 +-
+ drivers/staging/iio/accel/lis3l02dq.h | 14 +-
+ drivers/staging/iio/accel/lis3l02dq_core.c | 12 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 28 +-
+ drivers/staging/iio/accel/sca3000.h | 2 +-
+ drivers/staging/iio/accel/sca3000_core.c | 8 +-
+ drivers/staging/iio/accel/sca3000_ring.c | 2 +-
+ drivers/staging/iio/adc/Kconfig | 25 +-
+ drivers/staging/iio/adc/Makefile | 1 +
+ drivers/staging/iio/adc/ad7192.c | 523 +--
+ drivers/staging/iio/adc/ad7298_core.c | 2 +-
+ drivers/staging/iio/adc/ad7476_core.c | 2 +-
+ drivers/staging/iio/adc/ad7606.h | 2 +-
+ drivers/staging/iio/adc/ad7606_core.c | 6 +-
+ drivers/staging/iio/adc/ad7780.c | 188 +-
+ drivers/staging/iio/adc/ad7793.c | 688 +---
+ drivers/staging/iio/adc/ad7793.h | 10 +-
+ drivers/staging/iio/adc/ad7887_core.c | 2 +-
+ drivers/staging/iio/adc/lpc32xx_adc.c | 2 +-
+ drivers/staging/iio/adc/max1363.h | 2 +-
+ drivers/staging/iio/adc/max1363_core.c | 32 +-
+ drivers/staging/iio/adc/mxs-lradc.c | 590 ++++
+ drivers/staging/iio/adc/spear_adc.c | 27 +-
+ drivers/staging/iio/gyro/adis16060_core.c | 4 +-
+ drivers/staging/iio/gyro/adis16080_core.c | 2 +-
+ drivers/staging/iio/gyro/adis16130_core.c | 2 +-
+ drivers/staging/iio/gyro/adis16260_core.c | 2 +-
+ drivers/staging/iio/gyro/adxrs450_core.c | 2 +-
+ drivers/staging/iio/iio_dummy_evgen.c | 2 +-
+ drivers/staging/iio/iio_hwmon.c | 14 +-
+ drivers/staging/iio/iio_simple_dummy.c | 4 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 2 +-
+ drivers/staging/iio/imu/adis16400.h | 2 +-
+ drivers/staging/iio/imu/adis16400_core.c | 10 +-
+ drivers/staging/iio/light/tsl2563.c | 2 +-
+ drivers/staging/iio/magnetometer/hmc5843.c | 2 +-
+ drivers/staging/iio/meter/ade7753.c | 2 +-
+ drivers/staging/iio/meter/ade7754.c | 2 +-
+ drivers/staging/iio/meter/ade7758.h | 2 +-
+ drivers/staging/iio/meter/ade7758_core.c | 4 +-
+ drivers/staging/iio/meter/ade7759.c | 2 +-
+ drivers/staging/iio/meter/ade7854-spi.c | 2 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 2 +-
+ drivers/staging/iio/ring_hw.h | 2 +-
+ drivers/staging/iio/trigger/iio-trig-gpio.c | 8 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 8 +-
+ drivers/staging/ipack/Kconfig | 1 +
+ drivers/staging/ipack/bridges/tpci200.c | 324 +-
+ drivers/staging/ipack/bridges/tpci200.h | 9 +
+ drivers/staging/ipack/devices/ipoctal.c | 188 +-
+ drivers/staging/ipack/devices/scc2698.h | 114 +-
+ drivers/staging/ipack/ipack.c | 272 +-
+ drivers/staging/ipack/ipack.h | 49 +-
+ drivers/staging/ipack/ipack_ids.h | 32 +
+ drivers/staging/line6/pcm.c | 8 +-
+ drivers/staging/line6/variax.c | 8 +-
+ drivers/staging/nvec/Kconfig | 2 +-
+ drivers/staging/nvec/nvec.c | 25 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 53 +-
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 15 +-
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 6 +-
+ drivers/staging/omapdrm/omap_crtc.c | 17 +
+ drivers/staging/omapdrm/omap_dmm_tiler.c | 51 +-
+ drivers/staging/omapdrm/omap_dmm_tiler.h | 17 +-
+ drivers/staging/omapdrm/omap_drv.c | 21 +-
+ drivers/staging/omapdrm/omap_drv.h | 33 +-
+ drivers/staging/omapdrm/omap_fb.c | 99 +-
+ drivers/staging/omapdrm/omap_gem.c | 60 +-
+ drivers/staging/omapdrm/omap_plane.c | 111 +-
+ drivers/staging/ozwpan/ozevent.c | 6 +-
+ drivers/staging/ozwpan/ozhcd.c | 104 +-
+ drivers/staging/ozwpan/ozmain.c | 2 +-
+ drivers/staging/ozwpan/ozpd.c | 11 +-
+ drivers/staging/ozwpan/ozpd.h | 1 +
+ drivers/staging/ozwpan/ozproto.c | 13 +
+ drivers/staging/ozwpan/ozproto.h | 8 +-
+ drivers/staging/ozwpan/ozprotocol.h | 6 +-
+ drivers/staging/panel/panel.c | 4 +-
+ drivers/staging/ramster/Kconfig | 25 +-
+ drivers/staging/ramster/Makefile | 7 +-
+ drivers/staging/ramster/TODO | 13 -
+ drivers/staging/ramster/cluster/Makefile | 3 -
+ drivers/staging/ramster/ramster.h | 113 +-
+ .../ramster/{cluster => ramster}/heartbeat.c | 6 +-
+ .../ramster/{cluster => ramster}/heartbeat.h | 0
+ .../staging/ramster/{cluster => ramster}/masklog.c | 0
+ .../staging/ramster/{cluster => ramster}/masklog.h | 0
+ .../ramster/{cluster => ramster}/nodemanager.c | 15 +-
+ .../ramster/{cluster => ramster}/nodemanager.h | 0
+ drivers/staging/ramster/{ => }/ramster/r2net.c | 79 +-
+ drivers/staging/ramster/ramster/ramster.c | 985 ++++++
+ drivers/staging/ramster/ramster/ramster.h | 161 +
+ .../{cluster => ramster}/ramster_nodemanager.h | 0
+ drivers/staging/ramster/{cluster => ramster}/tcp.c | 53 +-
+ drivers/staging/ramster/{cluster => ramster}/tcp.h | 0
+ .../ramster/{cluster => ramster}/tcp_internal.h | 0
+ drivers/staging/ramster/tmem.c | 313 +-
+ drivers/staging/ramster/tmem.h | 109 +-
+ drivers/staging/ramster/xvmalloc.c | 509 ---
+ drivers/staging/ramster/xvmalloc.h | 30 -
+ drivers/staging/ramster/xvmalloc_int.h | 95 -
+ drivers/staging/ramster/zbud.c | 1060 ++++++
+ drivers/staging/ramster/zbud.h | 33 +
+ drivers/staging/ramster/zcache-main.c | 3564 ++++++--------------
+ drivers/staging/ramster/zcache.h | 55 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211.h | 2 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 13 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 5 +-
+ drivers/staging/rtl8187se/r8180_core.c | 4 +-
+ drivers/staging/rtl8187se/r8180_hw.h | 9 +-
+ drivers/staging/rtl8187se/r8185b_init.c | 2 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 9 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 4 +
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +-
+ drivers/staging/rtl8192e/rtllib.h | 8 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 22 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 7 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 4 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 18 +-
+ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 5 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 4 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 4 +-
+ drivers/staging/rtl8192u/r819xU_HTType.h | 2 +-
+ drivers/staging/rtl8192u/r819xU_phyreg.h | 2 +-
+ drivers/staging/rtl8712/drv_types.h | 9 -
+ drivers/staging/rtl8712/ethernet.h | 8 -
+ drivers/staging/rtl8712/rtl8712_recv.c | 4 +
+ drivers/staging/rtl8712/rtl8712_recv.h | 2 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_set.c | 5 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 5 +-
+ drivers/staging/rtl8712/rtl871x_pwrctrl.h | 20 -
+ drivers/staging/rtl8712/rtl871x_recv.c | 9 +-
+ drivers/staging/rtl8712/usb_intf.c | 1 -
+ drivers/staging/rtl8712/usb_osintf.h | 3 -
+ drivers/staging/rtl8712/usb_vendor_req.h | 58 -
+ drivers/staging/rts5139/trace.h | 32 +-
+ drivers/staging/rts_pstor/rtsx_card.c | 186 +-
+ drivers/staging/rts_pstor/rtsx_chip.c | 563 ++--
+ drivers/staging/rts_pstor/rtsx_scsi.c | 2 +-
+ drivers/staging/rts_pstor/rtsx_transport.c | 100 +-
+ drivers/staging/rts_pstor/trace.h | 30 +-
+ drivers/staging/sbe-2t3e3/netdev.c | 8 +-
+ drivers/staging/sep/sep_main.c | 2 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 11 +-
+ drivers/staging/slicoss/slicoss.c | 40 +-
+ drivers/staging/sm7xxfb/sm7xxfb.c | 3 +-
+ drivers/staging/speakup/i18n.c | 1 +
+ drivers/staging/speakup/speakup_soft.c | 2 +-
+ .../staging/tidspbridge/Documentation/error-codes | 2 +-
+ drivers/staging/tidspbridge/core/_tiomap.h | 2 +-
+ drivers/staging/tidspbridge/core/chnl_sm.c | 6 +-
+ drivers/staging/tidspbridge/core/io_sm.c | 10 +-
+ drivers/staging/tidspbridge/core/sync.c | 2 +-
+ drivers/staging/tidspbridge/core/tiomap3430.c | 4 +-
+ drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 2 +-
+ drivers/staging/tidspbridge/dynload/tramp.c | 8 +-
+ drivers/staging/tidspbridge/gen/uuidutil.c | 21 -
+ drivers/staging/tidspbridge/hw/hw_mmu.c | 6 +-
+ .../tidspbridge/include/dspbridge/dspioctl.h | 2 +-
+ .../staging/tidspbridge/include/dspbridge/mbx_sh.h | 2 +-
+ .../staging/tidspbridge/include/dspbridge/node.h | 2 +-
+ .../staging/tidspbridge/include/dspbridge/ntfy.h | 2 +-
+ .../staging/tidspbridge/include/dspbridge/proc.h | 2 +-
+ .../staging/tidspbridge/include/dspbridge/strm.h | 2 +-
+ .../staging/tidspbridge/include/dspbridge/sync.h | 4 +-
+ .../tidspbridge/include/dspbridge/uuidutil.h | 20 -
+ drivers/staging/tidspbridge/rmgr/dbdcd.c | 29 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 14 +-
+ drivers/staging/tidspbridge/rmgr/dspdrv.c | 4 +-
+ drivers/staging/tidspbridge/rmgr/mgr.c | 4 +-
+ drivers/staging/tidspbridge/rmgr/nldr.c | 2 +-
+ drivers/staging/tidspbridge/rmgr/node.c | 5 +-
+ drivers/staging/tidspbridge/rmgr/proc.c | 2 +-
+ drivers/staging/usbip/stub_rx.c | 2 +-
+ drivers/staging/usbip/usbip_common.c | 4 +
+ drivers/staging/usbip/userspace/configure.ac | 12 +-
+ drivers/staging/usbip/userspace/doc/usbip.8 | 66 +-
+ .../usbip/userspace/doc/usbip_bind_driver.8 | 42 -
+ drivers/staging/usbip/userspace/doc/usbipd.8 | 16 +-
+ drivers/staging/usbip/vhci_hcd.c | 22 +-
+ drivers/staging/vme/devices/vme_pio2_core.c | 10 +-
+ drivers/staging/vme/devices/vme_user.c | 10 +-
+ drivers/staging/vt6655/80211mgr.h | 2 +-
+ drivers/staging/vt6655/baseband.c | 172 +-
+ drivers/staging/vt6655/baseband.h | 10 +-
+ drivers/staging/vt6655/bssdb.c | 4 +-
+ drivers/staging/vt6655/card.c | 101 +-
+ drivers/staging/vt6655/datarate.c | 2 +-
+ drivers/staging/vt6655/device.h | 4 +-
+ drivers/staging/vt6655/device_main.c | 8 +-
+ drivers/staging/vt6655/dpc.c | 2 +-
+ drivers/staging/vt6655/hostap.c | 8 +-
+ drivers/staging/vt6655/ioctl.c | 9 +-
+ drivers/staging/vt6655/iwctl.c | 6 +-
+ drivers/staging/vt6655/key.c | 2 +-
+ drivers/staging/vt6655/mac.c | 12 +-
+ drivers/staging/vt6655/mac.h | 2 +-
+ drivers/staging/vt6655/mib.c | 2 +-
+ drivers/staging/vt6655/power.c | 2 +-
+ drivers/staging/vt6655/rf.c | 82 +-
+ drivers/staging/vt6655/rf.h | 2 +-
+ drivers/staging/vt6655/rxtx.c | 42 +-
+ drivers/staging/vt6655/tcrc.c | 2 +-
+ drivers/staging/vt6655/tcrc.h | 2 +-
+ drivers/staging/vt6655/tether.c | 4 +-
+ drivers/staging/vt6655/tkip.c | 2 +-
+ drivers/staging/vt6655/vntwifi.c | 2 +-
+ drivers/staging/vt6655/wcmd.c | 6 +-
+ drivers/staging/vt6655/wmgr.c | 56 +-
+ drivers/staging/vt6655/wmgr.h | 4 +-
+ drivers/staging/vt6655/wpa.c | 2 +-
+ drivers/staging/vt6655/wpa2.c | 8 +-
+ drivers/staging/vt6655/wpactl.c | 6 +-
+ drivers/staging/vt6655/wroute.c | 2 +-
+ drivers/staging/vt6656/80211mgr.h | 4 +-
+ drivers/staging/vt6656/baseband.c | 6 +-
+ drivers/staging/vt6656/baseband.h | 2 +-
+ drivers/staging/vt6656/bssdb.c | 18 +-
+ drivers/staging/vt6656/card.c | 38 +-
+ drivers/staging/vt6656/device.h | 2 +-
+ drivers/staging/vt6656/dpc.c | 2 +-
+ drivers/staging/vt6656/hostap.c | 30 +-
+ drivers/staging/vt6656/int.c | 2 +-
+ drivers/staging/vt6656/ioctl.c | 11 +-
+ drivers/staging/vt6656/iwctl.c | 2 +-
+ drivers/staging/vt6656/key.c | 4 +-
+ drivers/staging/vt6656/main_usb.c | 20 +-
+ drivers/staging/vt6656/power.c | 2 +-
+ drivers/staging/vt6656/rf.c | 58 +-
+ drivers/staging/vt6656/rf.h | 2 +-
+ drivers/staging/vt6656/rxtx.c | 52 +-
+ drivers/staging/vt6656/tcrc.c | 2 +-
+ drivers/staging/vt6656/tcrc.h | 2 +-
+ drivers/staging/vt6656/tether.c | 4 +-
+ drivers/staging/vt6656/tkip.c | 2 +-
+ drivers/staging/vt6656/wcmd.c | 8 +-
+ drivers/staging/vt6656/wctl.c | 2 +-
+ drivers/staging/vt6656/wmgr.c | 26 +-
+ drivers/staging/vt6656/wpa.c | 2 +-
+ drivers/staging/vt6656/wpa2.c | 6 +-
+ drivers/staging/vt6656/wpactl.c | 6 +-
+ drivers/staging/winbond/localpara.h | 4 +-
+ drivers/staging/winbond/mds.c | 2 +-
+ drivers/staging/winbond/mto.c | 2 +-
+ drivers/staging/winbond/phy_calibration.c | 14 +-
+ drivers/staging/winbond/reg.c | 2 +-
+ drivers/staging/winbond/sme_api.h | 2 +-
+ drivers/staging/winbond/wb35reg.c | 4 +-
+ drivers/staging/winbond/wb35tx.c | 8 +-
+ drivers/staging/winbond/wb35tx_s.h | 2 +-
+ drivers/staging/wlags49_h2/README.ubuntu | 2 +-
+ drivers/staging/wlags49_h2/hcfcfg.h | 2 +-
+ drivers/staging/wlags49_h2/hcfdef.h | 6 +-
+ drivers/staging/wlags49_h2/mdd.h | 4 +-
+ drivers/staging/wlags49_h2/wl_if.h | 2 +-
+ drivers/staging/wlags49_h2/wl_internal.h | 2 +-
+ drivers/staging/wlags49_h2/wl_main.c | 4 +-
+ drivers/staging/wlags49_h2/wl_netdev.c | 49 +-
+ drivers/staging/wlags49_h2/wl_pci.c | 4 +-
+ drivers/staging/wlags49_h2/wl_priv.c | 2 +-
+ drivers/staging/wlags49_h2/wl_profile.c | 2 +-
+ drivers/staging/wlags49_h2/wl_version.h | 2 +-
+ drivers/staging/wlags49_h2/wl_wext.c | 5 +-
+ drivers/staging/wlan-ng/p80211wep.c | 18 +-
+ drivers/staging/xgifb/XGI_main_26.c | 13 +-
+ drivers/staging/xgifb/vb_init.c | 2 +-
+ drivers/staging/zcache/tmem.c | 2 +-
+ drivers/staging/zsmalloc/zsmalloc-main.c | 322 +-
+ drivers/staging/zsmalloc/zsmalloc_int.h | 155 -
+ include/linux/iio/adc/ad_sigma_delta.h | 173 +
+ include/linux/iio/consumer.h | 2 +-
+ include/linux/iio/iio.h | 43 +-
+ include/linux/iio/kfifo_buf.h | 3 +
+ include/linux/iio/machine.h | 5 +
+ include/linux/iio/trigger.h | 13 +-
+ include/linux/iio/trigger_consumer.h | 11 +
+ include/linux/mod_devicetable.h | 7 +
+ scripts/mod/file2alias.c | 15 +
+ 476 files changed, 11624 insertions(+), 13074 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
+ create mode 100644 drivers/iio/adc/ad_sigma_delta.c
+ delete mode 100644 drivers/iio/dac/ad5446.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.c
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_S5920.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi-data/amcc_s5933_58.h
+ delete mode 100644 drivers/staging/comedi/drivers/addi_apci_all.c
+ delete mode 100644 drivers/staging/comedi/drivers/adl_pci7230.c
+ delete mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c
+ create mode 100644 drivers/staging/comedi/drivers/adl_pci7x3x.c
+ delete mode 100644 drivers/staging/csr/csr_formatted_io.c
+ delete mode 100644 drivers/staging/csr/csr_formatted_io.h
+ create mode 100644 drivers/staging/iio/adc/mxs-lradc.c
+ create mode 100644 drivers/staging/ipack/ipack_ids.h
+ delete mode 100644 drivers/staging/ramster/TODO
+ delete mode 100644 drivers/staging/ramster/cluster/Makefile
+ rename drivers/staging/ramster/{cluster => ramster}/heartbeat.c (98%)
+ rename drivers/staging/ramster/{cluster => ramster}/heartbeat.h (100%)
+ rename drivers/staging/ramster/{cluster => ramster}/masklog.c (100%)
+ rename drivers/staging/ramster/{cluster => ramster}/masklog.h (100%)
+ rename drivers/staging/ramster/{cluster => ramster}/nodemanager.c (98%)
+ rename drivers/staging/ramster/{cluster => ramster}/nodemanager.h (100%)
+ rename drivers/staging/ramster/{ => }/ramster/r2net.c (86%)
+ create mode 100644 drivers/staging/ramster/ramster/ramster.c
+ create mode 100644 drivers/staging/ramster/ramster/ramster.h
+ rename drivers/staging/ramster/{cluster => ramster}/ramster_nodemanager.h (100%)
+ rename drivers/staging/ramster/{cluster => ramster}/tcp.c (97%)
+ rename drivers/staging/ramster/{cluster => ramster}/tcp.h (100%)
+ rename drivers/staging/ramster/{cluster => ramster}/tcp_internal.h (100%)
+ delete mode 100644 drivers/staging/ramster/xvmalloc.c
+ delete mode 100644 drivers/staging/ramster/xvmalloc.h
+ delete mode 100644 drivers/staging/ramster/xvmalloc_int.h
+ create mode 100644 drivers/staging/ramster/zbud.c
+ create mode 100644 drivers/staging/ramster/zbud.h
+ delete mode 100644 drivers/staging/rtl8712/usb_vendor_req.h
+ delete mode 100644 drivers/staging/usbip/userspace/doc/usbip_bind_driver.8
+ delete mode 100644 drivers/staging/zsmalloc/zsmalloc_int.h
+ create mode 100644 include/linux/iio/adc/ad_sigma_delta.h
+Merging char-misc/char-misc-next (9c8dc10 misc: use module_spi_driver)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/char/virtio_console.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/misc/at25.txt | 34 +++++--
+ Documentation/devicetree/bindings/w1/w1-gpio.txt | 22 +++++
+ Documentation/misc-devices/lis3lv02d | 3 +-
+ drivers/char/ppdev.c | 3 +-
+ drivers/char/tlclk.c | 4 +-
+ drivers/char/virtio_console.c | 12 ++-
+ drivers/misc/bmp085-i2c.c | 7 --
+ drivers/misc/bmp085-spi.c | 13 +--
+ drivers/misc/carma/carma-fpga-program.c | 1 -
+ drivers/misc/carma/carma-fpga.c | 2 +-
+ drivers/misc/eeprom/at25.c | 83 +++++++++++-----
+ drivers/misc/lis3lv02d/lis3lv02d.c | 42 ++++++++-
+ drivers/misc/lis3lv02d/lis3lv02d.h | 44 +++++++--
+ drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 7 +-
+ drivers/misc/mei/hw.h | 83 ++++++++--------
+ drivers/misc/mei/init.c | 93 ++++++++++--------
+ drivers/misc/mei/interface.h | 10 +-
+ drivers/misc/mei/interrupt.c | 35 ++++---
+ drivers/misc/mei/iorw.c | 59 ++++++------
+ drivers/misc/mei/main.c | 97 ++++++++-----------
+ drivers/misc/mei/mei_dev.h | 76 ++++++++-------
+ drivers/misc/mei/wd.c | 91 +++++++++---------
+ drivers/misc/pch_phub.c | 15 +--
+ drivers/misc/ti-st/st_core.c | 12 ++-
+ drivers/misc/ti-st/st_kim.c | 109 +++++++++-------------
+ drivers/misc/tifm_7xx1.c | 14 +--
+ drivers/w1/masters/Kconfig | 1 -
+ drivers/w1/masters/omap_hdq.c | 57 +++--------
+ drivers/w1/masters/w1-gpio.c | 66 ++++++++++++-
+ include/linux/ti_wilink_st.h | 3 +-
+ include/linux/w1-gpio.h | 1 +
+ 31 files changed, 622 insertions(+), 477 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt
+Merging tmem/linux-next (15773b6 Merge branch 'stable/for-linus-3.6' into linux-next)
+$ git merge tmem/linux-next
+Merge made by the 'recursive' strategy.
+ mm/frontswap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging writeback/writeback-for-next (7034ed1 backing-dev: use kstrto* in preference to simple_strtoul)
+$ git merge writeback/writeback-for-next
+Merge made by the 'recursive' strategy.
+ mm/backing-dev.c | 50 ++++++++++++++++++++++++++------------------------
+ 1 file changed, 26 insertions(+), 24 deletions(-)
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (5ee9093 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/Makefile
+Auto-merging drivers/pinctrl/Kconfig
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/fsl,imx35-pinctrl.txt | 984 ++++++++++++
+ arch/arm/Kconfig | 1 +
+ arch/arm/mach-nomadik/board-nhk8815.c | 36 +
+ arch/arm/mach-nomadik/cpu-8815.c | 13 +
+ drivers/pinctrl/Kconfig | 16 +
+ drivers/pinctrl/Makefile | 3 +
+ drivers/pinctrl/pinctrl-imx35.c | 1595 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-imx51.c | 490 +++---
+ drivers/pinctrl/pinctrl-imx53.c | 402 ++---
+ drivers/pinctrl/pinctrl-nomadik-db8540.c | 999 ++++++++++++
+ drivers/pinctrl/pinctrl-nomadik-stn8815.c | 357 +++++
+ drivers/pinctrl/pinctrl-nomadik.c | 6 +
+ drivers/pinctrl/pinctrl-nomadik.h | 27 +
+ include/linux/pinctrl/consumer.h | 2 +-
+ 14 files changed, 4484 insertions(+), 447 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.txt
+ create mode 100644 drivers/pinctrl/pinctrl-imx35.c
+ create mode 100644 drivers/pinctrl/pinctrl-nomadik-db8540.c
+ create mode 100644 drivers/pinctrl/pinctrl-nomadik-stn8815.c
+Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
+$ git merge vhost/linux-next
+Resolved 'drivers/net/tun.c' using previous resolution.
+Auto-merging drivers/net/tun.c
+CONFLICT (content): Merge conflict in drivers/net/tun.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2fd83e1] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (6bb697b MAINTAINERS: add remoteproc's git)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (6d22d1c Merge branch 'devel' into for-next)
+$ git merge gpio-lw/for-next
+Auto-merging drivers/gpio/gpio-bt8xx.c
+Merge made by the 'recursive' strategy.
+ drivers/gpio/Kconfig | 2 +-
+ drivers/gpio/gpio-adp5588.c | 14 +----
+ drivers/gpio/gpio-bt8xx.c | 2 +-
+ drivers/gpio/gpio-da9052.c | 15 +----
+ drivers/gpio/gpio-davinci.c | 2 +-
+ drivers/gpio/gpio-em.c | 12 +---
+ drivers/gpio/gpio-mc9s08dz60.c | 21 +------
+ drivers/gpio/gpio-ml-ioh.c | 20 +++----
+ drivers/gpio/gpio-pcf857x.c | 122 ++++++++++++++++++++++++++++++++++++++++
+ drivers/gpio/gpio-pch.c | 22 ++++----
+ drivers/gpio/gpio-pxa.c | 9 +--
+ drivers/gpio/gpio-sodaville.c | 2 +-
+ drivers/gpio/gpio-sx150x.c | 24 ++------
+ drivers/gpio/gpio-tps65912.c | 17 ++----
+ drivers/gpio/gpio-wm831x.c | 19 ++-----
+ drivers/gpio/gpio-wm8350.c | 19 ++-----
+ drivers/gpio/gpiolib.c | 102 ++++++++++++++++++++++++---------
+ include/linux/i2c/pcf857x.h | 3 +
+ 18 files changed, 254 insertions(+), 173 deletions(-)
+Merging arm-soc/for-next (77f8e31 Merge branch 'next/dt' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging include/linux/platform_data/pinctrl-coh901.h
+Auto-merging include/linux/mod_devicetable.h
+Auto-merging include/linux/leds.h
+Auto-merging drivers/usb/host/ohci-nxp.c
+Auto-merging drivers/usb/host/ohci-hcd.c
+Auto-merging drivers/usb/host/Kconfig
+CONFLICT (content): Merge conflict in drivers/usb/host/Kconfig
+Auto-merging drivers/tty/serial/mpc52xx_uart.c
+Auto-merging drivers/spi/spi-omap2-mcspi.c
+Auto-merging drivers/mtd/nand/pxa3xx_nand.c
+Auto-merging drivers/mtd/nand/bcm_umi_nand.c
+Auto-merging drivers/mtd/nand/Kconfig
+CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
+Auto-merging drivers/mmc/host/omap_hsmmc.c
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/gpio/gpio-pxa.c
+Auto-merging drivers/Makefile
+Auto-merging arch/powerpc/sysdev/fsl_msi.c
+Auto-merging arch/arm/mm/mmu.c
+Removing arch/arm/mach-versatile/include/mach/io.h
+Auto-merging arch/arm/mach-ux500/cpu-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
+Removing arch/arm/mach-u300/u300.c
+Removing arch/arm/mach-u300/include/mach/platform.h
+Removing arch/arm/mach-u300/include/mach/clkdev.h
+Auto-merging arch/arm/mach-u300/dma_channels.h
+Auto-merging arch/arm/mach-tegra/pcie.c
+Removing arch/arm/mach-tegra/include/mach/io.h
+Removing arch/arm/mach-shark/include/mach/io.h
+Removing arch/arm/mach-sa1100/leds.h
+Removing arch/arm/mach-sa1100/leds.c
+Removing arch/arm/mach-sa1100/leds-lart.c
+Removing arch/arm/mach-sa1100/leds-hackkit.c
+Removing arch/arm/mach-sa1100/leds-cerf.c
+Removing arch/arm/mach-sa1100/leds-badge4.c
+Removing arch/arm/mach-sa1100/leds-assabet.c
+Auto-merging arch/arm/mach-realview/realview_pbx.c
+Auto-merging arch/arm/mach-realview/realview_pba8.c
+Auto-merging arch/arm/mach-realview/realview_pb11mp.c
+Auto-merging arch/arm/mach-realview/realview_pb1176.c
+Auto-merging arch/arm/mach-realview/realview_eb.c
+Removing arch/arm/mach-pxa/leds.h
+Removing arch/arm/mach-pxa/leds.c
+Removing arch/arm/mach-pxa/leds-mainstone.c
+Removing arch/arm/mach-pxa/leds-lubbock.c
+Removing arch/arm/mach-pxa/leds-idp.c
+Auto-merging arch/arm/mach-prima2/common.c
+Removing arch/arm/mach-prima2/clock.c
+Removing arch/arm/mach-pnx4008/time.h
+Removing arch/arm/mach-pnx4008/time.c
+Removing arch/arm/mach-pnx4008/sleep.S
+Removing arch/arm/mach-pnx4008/serial.c
+Removing arch/arm/mach-pnx4008/pm.c
+Removing arch/arm/mach-pnx4008/irq.c
+Removing arch/arm/mach-pnx4008/include/mach/uncompress.h
+Removing arch/arm/mach-pnx4008/include/mach/timex.h
+Removing arch/arm/mach-pnx4008/include/mach/pm.h
+Removing arch/arm/mach-pnx4008/include/mach/platform.h
+Removing arch/arm/mach-pnx4008/include/mach/param.h
+Removing arch/arm/mach-pnx4008/include/mach/irqs.h
+Removing arch/arm/mach-pnx4008/include/mach/irq.h
+Removing arch/arm/mach-pnx4008/include/mach/hardware.h
+Removing arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
+Removing arch/arm/mach-pnx4008/include/mach/entry-macro.S
+Removing arch/arm/mach-pnx4008/include/mach/dma.h
+Removing arch/arm/mach-pnx4008/include/mach/debug-macro.S
+Removing arch/arm/mach-pnx4008/include/mach/clock.h
+Removing arch/arm/mach-pnx4008/i2c.c
+Removing arch/arm/mach-pnx4008/gpio.c
+Removing arch/arm/mach-pnx4008/dma.c
+Removing arch/arm/mach-pnx4008/core.c
+Removing arch/arm/mach-pnx4008/clock.h
+Removing arch/arm/mach-pnx4008/clock.c
+Removing arch/arm/mach-pnx4008/Makefile.boot
+Removing arch/arm/mach-pnx4008/Makefile
+Removing arch/arm/mach-orion5x/include/mach/io.h
+Removing arch/arm/mach-omap1/leds.h
+Removing arch/arm/mach-omap1/leds.c
+Removing arch/arm/mach-omap1/leds-osk.c
+Removing arch/arm/mach-omap1/leds-innovator.c
+Removing arch/arm/mach-omap1/leds-h2p2-debug.c
+Removing arch/arm/mach-mv78xx0/include/mach/io.h
+Removing arch/arm/mach-ks8695/leds.c
+Removing arch/arm/mach-ks8695/include/mach/regs-timer.h
+Removing arch/arm/mach-kirkwood/include/mach/io.h
+Removing arch/arm/mach-iop33x/include/mach/io.h
+Removing arch/arm/mach-iop32x/include/mach/io.h
+Removing arch/arm/mach-iop13xx/include/mach/io.h
+Removing arch/arm/mach-integrator/include/mach/io.h
+Removing Resolved 'arch/arm/mach-ux500/cpu-db8500.c' using previous resolution.
+Resolved 'drivers/mtd/nand/Kconfig' using previous resolution.
+Resolved 'drivers/usb/host/Kconfig' using previous resolution.
+arch/arm/mach-footbridge/netwinder-leds.c
+Removing arch/arm/mach-footbridge/ebsa285-leds.c
+Removing arch/arm/mach-dove/include/mach/io.h
+Removing arch/arm/mach-clps711x/p720t-leds.c
+Auto-merging arch/arm/mach-bcmring/include/mach/csp/tmrHw.h
+Auto-merging arch/arm/mach-bcmring/include/mach/csp/reg.h
+Auto-merging arch/arm/mach-bcmring/include/mach/csp/dmacHw.h
+Auto-merging arch/arm/mach-bcmring/include/mach/cfg_global.h
+Removing arch/arm/mach-bcmring/include/csp/string.h
+Removing arch/arm/mach-bcmring/include/csp/stdint.h
+Removing arch/arm/mach-bcmring/include/csp/secHw.h
+Removing arch/arm/mach-bcmring/include/csp/module.h
+Removing arch/arm/mach-bcmring/include/csp/intcHw.h
+Removing arch/arm/mach-bcmring/include/csp/errno.h
+Removing arch/arm/mach-bcmring/include/csp/delay.h
+Removing arch/arm/mach-bcmring/include/csp/cache.h
+Removing arch/arm/mach-bcmring/include/cfg_global.h
+Auto-merging arch/arm/mach-bcmring/arch.c
+Removing arch/arm/kernel/leds.c
+Auto-merging arch/arm/kernel/Makefile
+Removing arch/arm/include/asm/leds.h
+Auto-merging arch/arm/include/asm/io.h
+Removing arch/arm/configs/pnx4008_defconfig
+Removing arch/arm/boot/dts/prima2-cb.dts
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b7afcdc] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/Marvell/README | 232 ++++
+ Documentation/arm/memory.txt | 3 +
+ .../devicetree/bindings/arm/mrvl/tauros2.txt | 17 +
+ .../devicetree/bindings/bus/omap-ocp2scp.txt | 10 +
+ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 31 +
+ Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 +
+ arch/arm/Kconfig | 90 +-
+ arch/arm/Makefile | 1 -
+ arch/arm/arm-soc-for-next-contents.txt | 54 +
+ arch/arm/boot/dts/mmp2.dtsi | 5 +
+ arch/arm/boot/dts/omap4.dtsi | 8 +
+ arch/arm/boot/dts/prima2-cb.dts | 424 -------
+ arch/arm/boot/dts/prima2-evb.dts | 37 +
+ arch/arm/boot/dts/prima2.dtsi | 640 +++++++++++
+ arch/arm/boot/dts/pxa27x.dtsi | 14 +
+ arch/arm/boot/dts/pxa2xx.dtsi | 132 +++
+ arch/arm/boot/dts/pxa3xx.dtsi | 32 +
+ arch/arm/boot/dts/pxa910.dtsi | 5 +
+ arch/arm/configs/afeb9260_defconfig | 1 -
+ arch/arm/configs/at91rm9200_defconfig | 2 +-
+ arch/arm/configs/at91sam9261_defconfig | 2 +-
+ arch/arm/configs/at91sam9263_defconfig | 3 +-
+ arch/arm/configs/at91sam9g20_defconfig | 2 +-
+ arch/arm/configs/at91sam9rl_defconfig | 2 +-
+ arch/arm/configs/cpu9260_defconfig | 2 +-
+ arch/arm/configs/cpu9g20_defconfig | 2 +-
+ arch/arm/configs/pnx4008_defconfig | 472 --------
+ arch/arm/configs/prima2_defconfig | 7 +-
+ arch/arm/configs/qil-a9260_defconfig | 3 +-
+ arch/arm/configs/stamp9g20_defconfig | 1 -
+ arch/arm/configs/usb-a9260_defconfig | 1 -
+ arch/arm/include/asm/hardware/cache-tauros2.h | 5 +-
+ arch/arm/include/asm/hardware/iop3xx.h | 12 +-
+ arch/arm/include/asm/io.h | 8 +
+ arch/arm/include/asm/leds.h | 50 -
+ arch/arm/include/asm/mach/map.h | 8 +
+ arch/arm/include/asm/mach/pci.h | 13 +
+ arch/arm/kernel/Makefile | 1 -
+ arch/arm/kernel/bios32.c | 54 +-
+ arch/arm/kernel/leds.c | 121 --
+ arch/arm/kernel/process.c | 6 +-
+ arch/arm/kernel/time.c | 17 -
+ arch/arm/mach-at91/at91rm9200_devices.c | 92 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 84 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 60 +-
+ arch/arm/mach-at91/at91sam9263.c | 4 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 161 +--
+ arch/arm/mach-at91/at91sam9rl_devices.c | 60 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 14 +-
+ arch/arm/mach-at91/board-carmeva.c | 14 +-
+ arch/arm/mach-at91/board-cpu9krea.c | 17 +-
+ arch/arm/mach-at91/board-cpuat91.c | 13 +-
+ arch/arm/mach-at91/board-csb337.c | 16 +-
+ arch/arm/mach-at91/board-eb9200.c | 14 +-
+ arch/arm/mach-at91/board-ecbat91.c | 32 +-
+ arch/arm/mach-at91/board-eco920.c | 36 +-
+ arch/arm/mach-at91/board-flexibity.c | 14 +-
+ arch/arm/mach-at91/board-foxg20.c | 16 +-
+ arch/arm/mach-at91/board-kafa.c | 17 +-
+ arch/arm/mach-at91/board-kb9202.c | 37 +-
+ arch/arm/mach-at91/board-neocore926.c | 13 +-
+ arch/arm/mach-at91/board-picotux200.c | 14 +-
+ arch/arm/mach-at91/board-qil-a9260.c | 14 +-
+ arch/arm/mach-at91/board-rm9200dk.c | 17 +-
+ arch/arm/mach-at91/board-rm9200ek.c | 17 +-
+ arch/arm/mach-at91/board-rsi-ews.c | 16 +-
+ arch/arm/mach-at91/board-sam9-l9260.c | 39 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 16 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 16 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 13 +-
+ arch/arm/mach-at91/board-sam9g20ek.c | 16 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 13 +-
+ arch/arm/mach-at91/board-stamp9g20.c | 14 -
+ arch/arm/mach-at91/board-usb-a926x.c | 2 -
+ arch/arm/mach-at91/board-yl-9200.c | 16 +-
+ arch/arm/mach-at91/include/mach/board.h | 1 -
+ arch/arm/mach-at91/leds.c | 105 --
+ arch/arm/mach-bcmring/arch.c | 2 +-
+ arch/arm/mach-bcmring/core.c | 3 +-
+ arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 137 +--
+ arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c | 90 +-
+ arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c | 19 +-
+ arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 27 +-
+ arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 6 +-
+ arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 6 +-
+ arch/arm/mach-bcmring/include/cfg_global.h | 13 -
+ arch/arm/mach-bcmring/include/csp/cache.h | 35 -
+ arch/arm/mach-bcmring/include/csp/delay.h | 36 -
+ arch/arm/mach-bcmring/include/csp/errno.h | 32 -
+ arch/arm/mach-bcmring/include/csp/intcHw.h | 40 -
+ arch/arm/mach-bcmring/include/csp/module.h | 32 -
+ arch/arm/mach-bcmring/include/csp/secHw.h | 65 --
+ arch/arm/mach-bcmring/include/csp/stdint.h | 30 -
+ arch/arm/mach-bcmring/include/csp/string.h | 34 -
+ .../{cfg_global_defines.h => mach/cfg_global.h} | 11 +
+ .../arm/mach-bcmring/include/mach/csp/cap_inline.h | 2 +-
+ .../mach-bcmring/include/mach/csp/chipcHw_def.h | 6 +-
+ .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 119 +-
+ .../mach-bcmring/include/mach/csp/chipcHw_reg.h | 6 +-
+ arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h | 6 +-
+ .../mach-bcmring/include/{ => mach}/csp/dmacHw.h | 4 +-
+ .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +-
+ .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 106 +-
+ arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h | 2 +-
+ .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h | 18 +-
+ arch/arm/mach-bcmring/include/mach/csp/mm_addr.h | 2 +-
+ arch/arm/mach-bcmring/include/mach/csp/mm_io.h | 8 +-
+ arch/arm/mach-bcmring/include/{ => mach}/csp/reg.h | 25 +-
+ .../mach-bcmring/include/mach/csp/secHw_inline.h | 10 +-
+ .../mach-bcmring/include/{ => mach}/csp/tmrHw.h | 2 +-
+ arch/arm/mach-bcmring/include/mach/dma.h | 2 +-
+ arch/arm/mach-bcmring/include/mach/hardware.h | 2 +-
+ arch/arm/mach-bcmring/include/mach/reg_nand.h | 2 +-
+ arch/arm/mach-bcmring/include/mach/reg_umi.h | 4 +-
+ arch/arm/mach-bcmring/mm.c | 4 +-
+ arch/arm/mach-bcmring/timer.c | 2 +-
+ arch/arm/mach-clps711x/Makefile | 2 -
+ arch/arm/mach-clps711x/common.c | 1 -
+ arch/arm/mach-clps711x/p720t-leds.c | 63 --
+ arch/arm/mach-clps711x/p720t.c | 62 ++
+ arch/arm/mach-dove/common.c | 12 +-
+ arch/arm/mach-dove/include/mach/dove.h | 8 +-
+ arch/arm/mach-dove/include/mach/io.h | 19 -
+ arch/arm/mach-dove/pcie.c | 43 +-
+ arch/arm/mach-ebsa110/Makefile | 4 +-
+ arch/arm/mach-ebsa110/leds.c | 81 +-
+ arch/arm/mach-footbridge/Makefile | 4 -
+ arch/arm/mach-footbridge/common.c | 12 +-
+ arch/arm/mach-footbridge/dc21285.c | 16 +-
+ arch/arm/mach-footbridge/ebsa285-leds.c | 138 ---
+ arch/arm/mach-footbridge/ebsa285.c | 81 ++
+ .../arm/mach-footbridge/include/mach/debug-macro.S | 3 +-
+ arch/arm/mach-footbridge/include/mach/io.h | 12 +-
+ arch/arm/mach-footbridge/netwinder-hw.c | 112 +-
+ arch/arm/mach-footbridge/netwinder-leds.c | 138 ---
+ arch/arm/mach-integrator/Makefile | 3 +-
+ arch/arm/mach-integrator/core.c | 3 -
+ arch/arm/mach-integrator/include/mach/cm.h | 2 +
+ arch/arm/mach-integrator/include/mach/io.h | 33 -
+ arch/arm/mach-integrator/include/mach/platform.h | 4 +
+ arch/arm/mach-integrator/integrator_ap.c | 9 +-
+ arch/arm/mach-integrator/leds.c | 161 +--
+ arch/arm/mach-integrator/pci_v3.c | 50 +-
+ arch/arm/mach-iop13xx/include/mach/io.h | 28 -
+ arch/arm/mach-iop13xx/include/mach/iop13xx.h | 28 +-
+ arch/arm/mach-iop13xx/io.c | 27 -
+ arch/arm/mach-iop13xx/pci.c | 37 +-
+ arch/arm/mach-iop13xx/setup.c | 10 -
+ arch/arm/mach-iop32x/include/mach/io.h | 19 -
+ arch/arm/mach-iop33x/include/mach/io.h | 19 -
+ arch/arm/mach-kirkwood/common.c | 10 -
+ arch/arm/mach-kirkwood/include/mach/io.h | 24 -
+ arch/arm/mach-kirkwood/include/mach/kirkwood.h | 8 +-
+ arch/arm/mach-kirkwood/pcie.c | 44 +-
+ arch/arm/mach-ks8695/Makefile | 3 -
+ arch/arm/mach-ks8695/devices.c | 21 -
+ arch/arm/mach-ks8695/include/mach/devices.h | 5 -
+ arch/arm/mach-ks8695/include/mach/regs-timer.h | 40 -
+ arch/arm/mach-ks8695/leds.c | 92 --
+ arch/arm/mach-ks8695/time.c | 133 ++-
+ arch/arm/mach-mmp/mmp2.c | 2 +-
+ arch/arm/mach-mmp/pxa910.c | 4 +
+ arch/arm/mach-mmp/ttc_dkb.c | 10 +
+ arch/arm/mach-mv78xx0/addr-map.c | 3 +-
+ arch/arm/mach-mv78xx0/common.c | 5 -
+ arch/arm/mach-mv78xx0/include/mach/io.h | 24 -
+ arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 21 +-
+ arch/arm/mach-mv78xx0/pcie.c | 110 +-
+ arch/arm/mach-omap1/Makefile | 8 -
+ arch/arm/mach-omap1/board-h2.c | 32 +
+ arch/arm/mach-omap1/board-h3.c | 32 +
+ arch/arm/mach-omap1/board-osk.c | 33 +
+ arch/arm/mach-omap1/leds-h2p2-debug.c | 166 ---
+ arch/arm/mach-omap1/leds-innovator.c | 98 --
+ arch/arm/mach-omap1/leds-osk.c | 113 --
+ arch/arm/mach-omap1/leds.c | 69 --
+ arch/arm/mach-omap1/leds.h | 3 -
+ arch/arm/mach-omap1/time.c | 1 -
+ arch/arm/mach-omap1/timer32k.c | 1 -
+ arch/arm/mach-orion5x/common.c | 10 -
+ arch/arm/mach-orion5x/include/mach/io.h | 22 -
+ arch/arm/mach-orion5x/include/mach/orion5x.h | 20 +-
+ arch/arm/mach-orion5x/pci.c | 56 +-
+ arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 1 -
+ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 1 -
+ arch/arm/mach-orion5x/rd88f5182-setup.c | 72 +-
+ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 1 -
+ arch/arm/mach-pnx4008/Makefile | 12 -
+ arch/arm/mach-pnx4008/Makefile.boot | 4 -
+ arch/arm/mach-pnx4008/clock.c | 1001 -----------------
+ arch/arm/mach-pnx4008/clock.h | 43 -
+ arch/arm/mach-pnx4008/core.c | 290 -----
+ arch/arm/mach-pnx4008/dma.c | 1105 ------------------
+ arch/arm/mach-pnx4008/gpio.c | 328 ------
+ arch/arm/mach-pnx4008/i2c.c | 86 --
+ arch/arm/mach-pnx4008/include/mach/clock.h | 62 --
+ arch/arm/mach-pnx4008/include/mach/debug-macro.S | 21 -
+ arch/arm/mach-pnx4008/include/mach/dma.h | 160 ---
+ arch/arm/mach-pnx4008/include/mach/entry-macro.S | 116 --
+ arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h | 241 ----
+ arch/arm/mach-pnx4008/include/mach/hardware.h | 32 -
+ arch/arm/mach-pnx4008/include/mach/irq.h | 42 -
+ arch/arm/mach-pnx4008/include/mach/irqs.h | 215 ----
+ arch/arm/mach-pnx4008/include/mach/param.h | 21 -
+ arch/arm/mach-pnx4008/include/mach/platform.h | 69 --
+ arch/arm/mach-pnx4008/include/mach/pm.h | 33 -
+ arch/arm/mach-pnx4008/include/mach/timex.h | 19 -
+ arch/arm/mach-pnx4008/include/mach/uncompress.h | 46 -
+ arch/arm/mach-pnx4008/irq.c | 121 --
+ arch/arm/mach-pnx4008/pm.c | 153 ---
+ arch/arm/mach-pnx4008/serial.c | 67 --
+ arch/arm/mach-pnx4008/sleep.S | 195 ----
+ arch/arm/mach-pnx4008/time.c | 134 ---
+ arch/arm/mach-pnx4008/time.h | 70 --
+ arch/arm/mach-prima2/Kconfig | 19 +
+ arch/arm/mach-prima2/Makefile | 5 +-
+ arch/arm/mach-prima2/Makefile.boot | 2 +
+ arch/arm/mach-prima2/clock.c | 510 ---------
+ arch/arm/mach-prima2/{prima2.c => common.c} | 12 +-
+ arch/arm/mach-prima2/irq.c | 2 +-
+ arch/arm/mach-prima2/timer.c | 8 +-
+ arch/arm/mach-pxa/Kconfig | 12 +
+ arch/arm/mach-pxa/Makefile | 11 +-
+ arch/arm/mach-pxa/clock-pxa3xx.c | 8 +-
+ arch/arm/mach-pxa/idp.c | 81 ++
+ arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 1 +
+ arch/arm/mach-pxa/irq.c | 131 ++-
+ arch/arm/mach-pxa/leds-idp.c | 115 --
+ arch/arm/mach-pxa/leds-lubbock.c | 124 ---
+ arch/arm/mach-pxa/leds-mainstone.c | 119 --
+ arch/arm/mach-pxa/leds.c | 32 -
+ arch/arm/mach-pxa/leds.h | 13 -
+ arch/arm/mach-pxa/lubbock.c | 95 ++
+ arch/arm/mach-pxa/mainstone.c | 94 ++
+ arch/arm/mach-pxa/pxa-dt.c | 63 ++
+ arch/arm/mach-pxa/pxa3xx.c | 23 +-
+ arch/arm/mach-realview/core.c | 39 -
+ arch/arm/mach-realview/core.h | 2 -
+ arch/arm/mach-realview/realview_eb.c | 5 -
+ arch/arm/mach-realview/realview_pb1176.c | 5 -
+ arch/arm/mach-realview/realview_pb11mp.c | 5 -
+ arch/arm/mach-realview/realview_pba8.c | 5 -
+ arch/arm/mach-realview/realview_pbx.c | 5 -
+ arch/arm/mach-sa1100/Makefile | 9 -
+ arch/arm/mach-sa1100/assabet.c | 85 ++
+ arch/arm/mach-sa1100/badge4.c | 30 +
+ arch/arm/mach-sa1100/cerf.c | 42 +
+ arch/arm/mach-sa1100/hackkit.c | 32 +
+ arch/arm/mach-sa1100/lart.c | 26 +
+ arch/arm/mach-sa1100/leds-assabet.c | 113 --
+ arch/arm/mach-sa1100/leds-badge4.c | 110 --
+ arch/arm/mach-sa1100/leds-cerf.c | 110 --
+ arch/arm/mach-sa1100/leds-hackkit.c | 112 --
+ arch/arm/mach-sa1100/leds-lart.c | 101 --
+ arch/arm/mach-sa1100/leds.c | 50 -
+ arch/arm/mach-sa1100/leds.h | 13 -
+ arch/arm/mach-shark/Makefile | 4 +-
+ arch/arm/mach-shark/core.c | 19 -
+ arch/arm/mach-shark/include/mach/debug-macro.S | 7 +-
+ arch/arm/mach-shark/include/mach/entry-macro.S | 3 +-
+ arch/arm/mach-shark/include/mach/io.h | 18 -
+ arch/arm/mach-shark/leds.c | 220 ++--
+ arch/arm/mach-shark/pci.c | 5 +
+ arch/arm/mach-shmobile/Makefile.boot | 4 +
+ arch/arm/mach-shmobile/board-ag5evm.c | 1 -
+ arch/arm/mach-shmobile/board-kzm9g.c | 8 +
+ arch/arm/mach-tegra/include/mach/io.h | 46 -
+ arch/arm/mach-tegra/include/mach/iomap.h | 3 +
+ arch/arm/mach-tegra/pcie.c | 95 +-
+ arch/arm/mach-u300/Kconfig | 43 +-
+ arch/arm/mach-u300/Makefile | 1 -
+ arch/arm/mach-u300/core.c | 100 +-
+ .../mach-u300/{include/mach => }/dma_channels.h | 11 +-
+ arch/arm/mach-u300/i2c.c | 6 +-
+ arch/arm/mach-u300/include/mach/clkdev.h | 7 -
+ arch/arm/mach-u300/include/mach/irqs.h | 36 +-
+ arch/arm/mach-u300/include/mach/platform.h | 20 -
+ arch/arm/mach-u300/include/mach/syscon.h | 32 +-
+ arch/arm/mach-u300/include/mach/u300-regs.h | 19 +-
+ arch/arm/mach-u300/spi.c | 2 +-
+ arch/arm/mach-u300/timer.c | 5 +-
+ arch/arm/mach-u300/timer.h | 1 +
+ arch/arm/mach-u300/u300-gpio.h | 46 +-
+ arch/arm/mach-u300/u300.c | 57 -
+ arch/arm/mach-ux500/Kconfig | 1 +
+ arch/arm/mach-ux500/board-mop500-regulators.c | 15 +
+ arch/arm/mach-ux500/board-mop500-regulators.h | 1 +
+ arch/arm/mach-ux500/board-mop500.c | 19 +
+ arch/arm/mach-ux500/cache-l2x0.c | 2 +-
+ arch/arm/mach-ux500/clock.c | 2 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 3 +-
+ arch/arm/mach-ux500/cpu.c | 4 +-
+ arch/arm/mach-ux500/include/mach/id.h | 44 +-
+ arch/arm/mach-ux500/platsmp.c | 4 +-
+ arch/arm/mach-ux500/timer.c | 2 +-
+ arch/arm/mach-versatile/core.c | 10 -
+ arch/arm/mach-versatile/include/mach/hardware.h | 1 -
+ arch/arm/mach-versatile/include/mach/io.h | 27 -
+ arch/arm/mach-versatile/pci.c | 22 +-
+ arch/arm/mm/cache-l2x0.c | 2 +-
+ arch/arm/mm/cache-tauros2.c | 83 +-
+ arch/arm/mm/ioremap.c | 14 +
+ arch/arm/mm/mmu.c | 54 +-
+ arch/arm/plat-iop/pci.c | 25 +-
+ arch/arm/plat-iop/setup.c | 5 -
+ arch/arm/plat-omap/Kconfig | 3 +-
+ arch/arm/plat-omap/debug-leds.c | 293 ++---
+ arch/arm/plat-samsung/time.c | 1 -
+ arch/arm/plat-versatile/Kconfig | 4 +-
+ arch/arm/plat-versatile/leds.c | 8 +-
+ arch/arm/tools/mach-types | 1 -
+ arch/powerpc/platforms/83xx/suspend.c | 2 +-
+ arch/powerpc/platforms/cell/celleb_pci.c | 2 +-
+ arch/powerpc/sysdev/fsl_msi.c | 8 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 2 +
+ drivers/bus/Kconfig | 15 +
+ drivers/bus/Makefile | 5 +
+ drivers/bus/omap-ocp2scp.c | 88 ++
+ drivers/char/nwflash.c | 34 -
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-prima2.c | 1171 ++++++++++++++++++++
+ drivers/gpio/gpio-mpc8xxx.c | 2 +-
+ drivers/gpio/gpio-omap.c | 8 +-
+ drivers/gpio/gpio-pxa.c | 77 +-
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/i2c/busses/i2c-iop3xx.c | 121 +-
+ drivers/i2c/busses/i2c-mpc.c | 12 +-
+ drivers/i2c/busses/i2c-omap.c | 3 +-
+ drivers/leds/Kconfig | 10 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/ledtrig-cpu.c | 163 +++
+ drivers/macintosh/mediabay.c | 8 +-
+ drivers/mfd/da9052-i2c.c | 4 +-
+ drivers/mmc/host/omap_hsmmc.c | 2 +-
+ drivers/mtd/nand/bcm_umi_nand.c | 12 +-
+ drivers/mtd/nand/nand_bcm_umi.h | 73 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 87 +-
+ drivers/net/can/mscan/mpc5xxx_can.c | 4 +-
+ drivers/pinctrl/pinctrl-coh901.c | 220 +---
+ drivers/pinctrl/pinctrl-sirf.c | 58 +-
+ drivers/rtc/rtc-pxa.c | 11 +
+ drivers/spi/spi-imx.c | 2 +-
+ drivers/spi/spi-omap2-mcspi.c | 2 +-
+ drivers/tty/serial/mpc52xx_uart.c | 2 +-
+ drivers/usb/Kconfig | 1 -
+ drivers/usb/host/Kconfig | 2 +-
+ drivers/usb/host/ohci-hcd.c | 2 +-
+ drivers/usb/host/ohci-nxp.c | 84 +-
+ drivers/watchdog/Kconfig | 6 +-
+ drivers/watchdog/mpc8xxx_wdt.c | 2 +-
+ include/linux/atmel_tc.h | 2 +-
+ include/linux/leds.h | 16 +
+ include/linux/mod_devicetable.h | 2 +-
+ .../linux/platform_data/pinctrl-coh901.h | 13 +-
+ 355 files changed, 5920 insertions(+), 12039 deletions(-)
+ create mode 100644 Documentation/arm/Marvell/README
+ create mode 100644 Documentation/devicetree/bindings/arm/mrvl/tauros2.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/boot/dts/prima2-cb.dts
+ create mode 100644 arch/arm/boot/dts/prima2-evb.dts
+ create mode 100644 arch/arm/boot/dts/prima2.dtsi
+ create mode 100644 arch/arm/boot/dts/pxa27x.dtsi
+ create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi
+ create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi
+ delete mode 100644 arch/arm/configs/pnx4008_defconfig
+ delete mode 100644 arch/arm/include/asm/leds.h
+ delete mode 100644 arch/arm/kernel/leds.c
+ delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
+ delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
+ rename arch/arm/mach-bcmring/include/{cfg_global_defines.h => mach/cfg_global.h} (74%)
+ rename arch/arm/mach-bcmring/include/{ => mach}/csp/dmacHw.h (99%)
+ rename arch/arm/mach-bcmring/include/{ => mach}/csp/reg.h (81%)
+ rename arch/arm/mach-bcmring/include/{ => mach}/csp/tmrHw.h (99%)
+ delete mode 100644 arch/arm/mach-clps711x/p720t-leds.c
+ delete mode 100644 arch/arm/mach-dove/include/mach/io.h
+ delete mode 100644 arch/arm/mach-footbridge/ebsa285-leds.c
+ delete mode 100644 arch/arm/mach-footbridge/netwinder-leds.c
+ delete mode 100644 arch/arm/mach-integrator/include/mach/io.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h
+ delete mode 100644 arch/arm/mach-ks8695/include/mach/regs-timer.h
+ delete mode 100644 arch/arm/mach-ks8695/leds.c
+ delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h
+ delete mode 100644 arch/arm/mach-omap1/leds-h2p2-debug.c
+ delete mode 100644 arch/arm/mach-omap1/leds-innovator.c
+ delete mode 100644 arch/arm/mach-omap1/leds-osk.c
+ delete mode 100644 arch/arm/mach-omap1/leds.c
+ delete mode 100644 arch/arm/mach-omap1/leds.h
+ delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-pnx4008/Makefile
+ delete mode 100644 arch/arm/mach-pnx4008/Makefile.boot
+ delete mode 100644 arch/arm/mach-pnx4008/clock.c
+ delete mode 100644 arch/arm/mach-pnx4008/clock.h
+ delete mode 100644 arch/arm/mach-pnx4008/core.c
+ delete mode 100644 arch/arm/mach-pnx4008/dma.c
+ delete mode 100644 arch/arm/mach-pnx4008/gpio.c
+ delete mode 100644 arch/arm/mach-pnx4008/i2c.c
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/clock.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/dma.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/gpio-pnx4008.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/irq.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/param.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/platform.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/pm.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-pnx4008/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-pnx4008/irq.c
+ delete mode 100644 arch/arm/mach-pnx4008/pm.c
+ delete mode 100644 arch/arm/mach-pnx4008/serial.c
+ delete mode 100644 arch/arm/mach-pnx4008/sleep.S
+ delete mode 100644 arch/arm/mach-pnx4008/time.c
+ delete mode 100644 arch/arm/mach-pnx4008/time.h
+ create mode 100644 arch/arm/mach-prima2/Kconfig
+ delete mode 100644 arch/arm/mach-prima2/clock.c
+ rename arch/arm/mach-prima2/{prima2.c => common.c} (81%)
+ delete mode 100644 arch/arm/mach-pxa/leds-idp.c
+ delete mode 100644 arch/arm/mach-pxa/leds-lubbock.c
+ delete mode 100644 arch/arm/mach-pxa/leds-mainstone.c
+ delete mode 100644 arch/arm/mach-pxa/leds.c
+ delete mode 100644 arch/arm/mach-pxa/leds.h
+ create mode 100644 arch/arm/mach-pxa/pxa-dt.c
+ delete mode 100644 arch/arm/mach-sa1100/leds-assabet.c
+ delete mode 100644 arch/arm/mach-sa1100/leds-badge4.c
+ delete mode 100644 arch/arm/mach-sa1100/leds-cerf.c
+ delete mode 100644 arch/arm/mach-sa1100/leds-hackkit.c
+ delete mode 100644 arch/arm/mach-sa1100/leds-lart.c
+ delete mode 100644 arch/arm/mach-sa1100/leds.c
+ delete mode 100644 arch/arm/mach-sa1100/leds.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/io.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/io.h
+ rename arch/arm/mach-u300/{include/mach => }/dma_channels.h (88%)
+ delete mode 100644 arch/arm/mach-u300/include/mach/clkdev.h
+ delete mode 100644 arch/arm/mach-u300/include/mach/platform.h
+ create mode 100644 arch/arm/mach-u300/timer.h
+ delete mode 100644 arch/arm/mach-u300/u300.c
+ delete mode 100644 arch/arm/mach-versatile/include/mach/io.h
+ create mode 100644 drivers/bus/Kconfig
+ create mode 100644 drivers/bus/Makefile
+ create mode 100644 drivers/bus/omap-ocp2scp.c
+ create mode 100644 drivers/clk/clk-prima2.c
+ create mode 100644 drivers/leds/ledtrig-cpu.c
+ rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (72%)
+Merging ep93xx/ep93xx-for-next (fbad878 Merge branch 'ep93xx-cleanup' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (5a38a49 Merge branches 'cleanup', 'dt', 'soc', 'boards', 'defconfig', 'armadillo800eva-fixes' and 'fixes' into next)
+$ git merge renesas/next
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/marzen_defconfig | 17 +++++---
+ arch/arm/mach-shmobile/board-marzen.c | 68 +++++++++++++++++++++++++++++++-
+ arch/arm/mach-shmobile/clock-r8a7779.c | 11 +++++-
+ 3 files changed, 89 insertions(+), 7 deletions(-)
+Merging samsung/for-next (83f62b8 Merge branch 'next/board-samsung' into for-next)
+$ git merge samsung/for-next
+Auto-merging include/video/samsung_fimd.h
+Auto-merging drivers/video/s3c-fb.c
+Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-exynos/clock-exynos5.c | 9 --
+ arch/arm/mach-exynos/include/mach/map.h | 1 -
+ arch/arm/mach-exynos/include/mach/sysmmu.h | 2 +-
+ arch/arm/mach-exynos/mach-nuri.c | 2 +-
+ arch/arm/mach-exynos/mach-origen.c | 2 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 2 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
+ arch/arm/mach-exynos/setup-fimd0.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 36 ++++-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 14 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
+ arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
+ arch/arm/plat-samsung/clock.c | 5 +-
+ arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 --------------------
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
+ drivers/video/s3c-fb.c | 2 +-
+ .../plat/regs-fb.h => include/video/samsung_fimd.h | 152 +++++++++++++++++--
+ 31 files changed, 212 insertions(+), 212 deletions(-)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+ rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
+Merging tegra/for-next (2f027ec Merge branch 'for-3.7/maintainers' into for-next)
+$ git merge tegra/for-next
+Auto-merging drivers/regulator/tps6586x-regulator.c
+Auto-merging drivers/mmc/host/sdhci-tegra.c
+Removing arch/arm/mach-tegra/tegra2_clocks.c
+Removing arch/arm/mach-tegra/board-trimslice.h
+Removing arch/arm/mach-tegra/board-trimslice.c
+Removing arch/arm/mach-tegra/board-trimslice-pinmux.c
+Removing arch/arm/mach-tegra/board-paz00-pinmux.c
+Removing arch/arm/mach-tegra/board-harmony.c
+Removing arch/arm/mach-tegra/board-harmony-pinmux.c
+Removing arch/arm/boot/dts/tegra30-cardhu.dts
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/tps6586x.txt | 65 +-
+ MAINTAINERS | 4 +-
+ arch/arm/Kconfig | 3 +-
+ arch/arm/boot/dts/tegra20-paz00.dts | 173 ++
+ arch/arm/boot/dts/tegra20-seaboard.dts | 184 ++
+ arch/arm/boot/dts/tegra20-ventana.dts | 204 ++
+ arch/arm/boot/dts/tegra20-whistler.dts | 293 +++
+ arch/arm/boot/dts/tegra30-cardhu-a02.dts | 87 +
+ arch/arm/boot/dts/tegra30-cardhu-a04.dts | 98 +
+ arch/arm/boot/dts/tegra30-cardhu.dts | 171 --
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 473 ++++
+ arch/arm/configs/tegra_defconfig | 49 +-
+ arch/arm/mach-tegra/Kconfig | 20 -
+ arch/arm/mach-tegra/Makefile | 18 +-
+ arch/arm/mach-tegra/Makefile.boot | 3 +-
+ arch/arm/mach-tegra/apbio.c | 4 +-
+ arch/arm/mach-tegra/board-dt-tegra20.c | 17 +-
+ arch/arm/mach-tegra/board-harmony-pinmux.c | 156 --
+ arch/arm/mach-tegra/board-harmony-power.c | 46 +-
+ arch/arm/mach-tegra/board-harmony.c | 197 --
+ arch/arm/mach-tegra/board-harmony.h | 13 -
+ arch/arm/mach-tegra/board-paz00-pinmux.c | 156 --
+ arch/arm/mach-tegra/board-paz00.c | 192 --
+ arch/arm/mach-tegra/board-paz00.h | 17 +-
+ arch/arm/mach-tegra/board-trimslice-pinmux.c | 155 --
+ arch/arm/mach-tegra/board-trimslice.c | 183 --
+ arch/arm/mach-tegra/board-trimslice.h | 30 -
+ arch/arm/mach-tegra/clock.c | 574 +----
+ arch/arm/mach-tegra/clock.h | 40 +-
+ arch/arm/mach-tegra/common.c | 4 +-
+ arch/arm/mach-tegra/fuse.c | 4 +-
+ arch/arm/mach-tegra/headsmp.S | 6 +-
+ arch/arm/mach-tegra/hotplug.c | 118 +-
+ arch/arm/mach-tegra/include/mach/clk.h | 3 +
+ arch/arm/mach-tegra/platsmp.c | 29 +-
+ arch/arm/mach-tegra/powergate.c | 43 +-
+ arch/arm/mach-tegra/sleep-t20.S | 82 +
+ arch/arm/mach-tegra/sleep-t30.S | 107 +
+ arch/arm/mach-tegra/sleep.S | 33 +-
+ arch/arm/mach-tegra/sleep.h | 85 +
+ arch/arm/mach-tegra/tegra20_clocks.c | 1606 ++++++++++++
+ arch/arm/mach-tegra/tegra20_clocks.h | 41 +
+ arch/arm/mach-tegra/tegra20_clocks_data.c | 1110 +++++++++
+ arch/arm/mach-tegra/tegra2_clocks.c | 2484 -------------------
+ arch/arm/mach-tegra/tegra30_clocks.c | 2581 +++++++-------------
+ arch/arm/mach-tegra/tegra30_clocks.h | 53 +
+ arch/arm/mach-tegra/tegra30_clocks_data.c | 1377 +++++++++++
+ arch/arm/mach-tegra/tegra_cpu_car.h | 87 +
+ drivers/gpio/gpio-tegra.c | 3 -
+ drivers/i2c/busses/i2c-tegra.c | 130 +-
+ drivers/mfd/tps6586x.c | 13 +
+ drivers/mmc/host/sdhci-tegra.c | 1 -
+ drivers/regulator/tps6586x-regulator.c | 20 +-
+ include/linux/mfd/tps6586x.h | 1 +
+ 54 files changed, 7325 insertions(+), 6321 deletions(-)
+ create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a02.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a04.dts
+ delete mode 100644 arch/arm/boot/dts/tegra30-cardhu.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-cardhu.dtsi
+ delete mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
+ delete mode 100644 arch/arm/mach-tegra/board-harmony.c
+ delete mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c
+ delete mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c
+ delete mode 100644 arch/arm/mach-tegra/board-trimslice.c
+ delete mode 100644 arch/arm/mach-tegra/board-trimslice.h
+ create mode 100644 arch/arm/mach-tegra/sleep-t20.S
+ create mode 100644 arch/arm/mach-tegra/sleep-t30.S
+ create mode 100644 arch/arm/mach-tegra/sleep.h
+ create mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
+ create mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
+ create mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
+ delete mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
+ create mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
+ create mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
+ create mode 100644 arch/arm/mach-tegra/tegra_cpu_car.h
+Merging kvmtool/master (ecd036b kvm tools: add HOME env var to hostfs)
+$ git merge kvmtool/master
+Already up-to-date.
+Merging dma-mapping/dma-mapping-next (1ceb5a4 Merge branch 'next-cleanup' into HEAD)
+$ git merge dma-mapping/dma-mapping-next
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mach-kirkwood/common.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/ahci-platform.txt | 3 +
+ .../devicetree/bindings/dma/arm-pl330.txt | 3 +
+ .../devicetree/bindings/net/calxeda-xgmac.txt | 3 +
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/dts/highbank.dts | 1 +
+ arch/arm/include/asm/barrier.h | 7 +-
+ arch/arm/include/asm/dma-mapping.h | 8 +
+ arch/arm/include/asm/memory.h | 8 -
+ arch/arm/mach-highbank/highbank.c | 52 +++
+ arch/arm/mach-kirkwood/common.c | 7 +
+ arch/arm/mm/dma-mapping.c | 368 ++++++++++++++++----
+ arch/arm/mm/mmu.c | 11 -
+ drivers/base/dma-contiguous.c | 20 +-
+ 13 files changed, 395 insertions(+), 98 deletions(-)
+Merging pwm/for-next (c5d0b8a pwm: add devm_pwm_get() and devm_pwm_put())
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/driver-model/devres.txt | 4 ++
+ Documentation/pwm.txt | 3 +-
+ drivers/pwm/core.c | 80 +++++++++++++++++++++++++++++++++
+ include/linux/pwm.h | 26 +++++++++++
+ 4 files changed, 112 insertions(+), 1 deletion(-)
+Merging dma-buf/for-next (5b716ac Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (898132a ipv6: move dereference after check in fl_free())
+$ git merge userns/for-next
+Already up-to-date.
+Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (28fae20 alpha: don't open-code trace_report_syscall_{enter,exit})
+$ git merge signal/for-next
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/x86/kernel/signal.c' using previous resolution.
+Auto-merging kernel/sched/core.c
+Removing arch/xtensa/include/asm/exec.h
+Removing arch/x86/kernel/sys_i386_32.c
+Auto-merging arch/x86/kernel/signal.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging arch/x86/include/asm/thread_info.h
+Removing arch/unicore32/include/asm/exec.h
+Removing arch/um/kernel/internal.h
+Removing arch/tile/include/asm/exec.h
+Removing arch/sparc/include/asm/exec.h
+Auto-merging arch/sparc/include/asm/Kbuild
+Removing arch/sh/include/asm/exec.h
+Auto-merging arch/powerpc/include/asm/thread_info.h
+Removing arch/parisc/include/asm/exec.h
+Removing arch/mn10300/include/asm/exec.h
+Removing arch/microblaze/include/asm/exec.h
+Removing arch/m68k/include/asm/exec.h
+Removing arch/m32r/include/asm/exec.h
+Auto-merging arch/m32r/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
+Removing arch/ia64/include/asm/exec.h
+Removing arch/h8300/include/asm/exec.h
+Auto-merging arch/h8300/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
+Removing arch/frv/include/asm/exec.h
+Removing arch/cris/include/asm/exec.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Removing arch/c6x/include/asm/exec.h
+Removing arch/avr32/include/asm/exec.h
+Auto-merging arch/arm/include/asm/thread_info.h
+Auto-merging arch/alpha/kernel/process.c
+Removing arch/alpha/include/asm/exec.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 18637db] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/alpha/include/asm/exec.h | 6 ---
+ arch/alpha/include/asm/thread_info.h | 5 ++-
+ arch/alpha/include/asm/unistd.h | 2 +
+ arch/alpha/kernel/entry.S | 47 +++++++++++++--------
+ arch/alpha/kernel/process.c | 40 ------------------
+ arch/alpha/kernel/ptrace.c | 32 ++++++---------
+ arch/arm/include/asm/system.h | 1 -
+ arch/arm/include/asm/thread_info.h | 8 +++-
+ arch/arm/include/asm/unistd.h | 2 +
+ arch/arm/kernel/calls.S | 2 +-
+ arch/arm/kernel/entry-common.S | 21 +++++++---
+ arch/arm/kernel/signal.c | 1 -
+ arch/arm/kernel/sys_arm.c | 63 -----------------------------
+ arch/avr32/include/asm/Kbuild | 1 +
+ arch/avr32/include/asm/exec.h | 13 ------
+ arch/avr32/include/asm/thread_info.h | 17 +++-----
+ arch/avr32/kernel/signal.c | 1 -
+ arch/blackfin/include/asm/thread_info.h | 4 --
+ arch/blackfin/kernel/signal.c | 1 -
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/exec.h | 6 ---
+ arch/c6x/include/asm/thread_info.h | 1 -
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/exec.h | 6 ---
+ arch/cris/include/asm/thread_info.h | 3 --
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/frv/include/asm/exec.h | 17 --------
+ arch/frv/include/asm/thread_info.h | 3 --
+ arch/frv/kernel/signal.c | 9 -----
+ arch/h8300/include/asm/Kbuild | 1 +
+ arch/h8300/include/asm/exec.h | 6 ---
+ arch/h8300/include/asm/thread_info.h | 7 +---
+ arch/h8300/kernel/signal.c | 1 -
+ arch/hexagon/include/asm/thread_info.h | 5 ---
+ arch/hexagon/kernel/signal.c | 1 -
+ arch/hexagon/kernel/syscall.c | 1 -
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/exec.h | 14 -------
+ arch/ia64/include/asm/thread_info.h | 2 -
+ arch/ia64/kernel/signal.c | 8 ----
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/exec.h | 14 -------
+ arch/m32r/include/asm/thread_info.h | 9 +----
+ arch/m32r/kernel/signal.c | 3 --
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/exec.h | 6 ---
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/exec.h | 14 -------
+ arch/microblaze/include/asm/thread_info.h | 3 +-
+ arch/microblaze/kernel/signal.c | 7 +---
+ arch/mips/include/asm/thread_info.h | 9 ++---
+ arch/mips/kernel/entry.S | 15 +++++--
+ arch/mips/kernel/scall32-o32.S | 13 +-----
+ arch/mips/kernel/scall64-64.S | 13 +-----
+ arch/mips/kernel/scall64-n32.S | 13 +-----
+ arch/mips/kernel/scall64-o32.S | 13 +-----
+ arch/mips/kernel/signal.c | 8 ----
+ arch/mn10300/include/asm/Kbuild | 2 +
+ arch/mn10300/include/asm/exec.h | 16 --------
+ arch/mn10300/include/asm/thread_info.h | 3 +-
+ arch/mn10300/kernel/entry.S | 4 ++
+ arch/mn10300/kernel/signal.c | 13 ------
+ arch/openrisc/include/asm/thread_info.h | 3 +-
+ arch/parisc/hpux/gate.S | 2 +-
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/exec.h | 6 ---
+ arch/parisc/include/asm/thread_info.h | 5 ++-
+ arch/parisc/kernel/signal.c | 45 +++++++--------------
+ arch/parisc/kernel/syscall.S | 9 +++--
+ arch/powerpc/include/asm/thread_info.h | 2 +
+ arch/powerpc/kernel/signal_32.c | 1 -
+ arch/s390/include/asm/thread_info.h | 4 --
+ arch/score/include/asm/thread_info.h | 4 --
+ arch/score/kernel/signal.c | 1 +
+ arch/sh/include/asm/Kbuild | 1 +
+ arch/sh/include/asm/exec.h | 10 -----
+ arch/sh/include/asm/thread_info.h | 3 ++
+ arch/sh/kernel/cpu/sh5/entry.S | 2 +-
+ arch/sh/kernel/entry-common.S | 2 +-
+ arch/sh/kernel/signal_32.c | 1 -
+ arch/sh/kernel/signal_64.c | 1 -
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/exec.h | 6 ---
+ arch/sparc/include/asm/thread_info_32.h | 3 +-
+ arch/sparc/include/asm/thread_info_64.h | 3 ++
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/tile/include/asm/exec.h | 20 ---------
+ arch/tile/kernel/compat_signal.c | 9 -----
+ arch/tile/kernel/signal.c | 12 +-----
+ arch/um/include/asm/thread_info.h | 3 --
+ arch/um/kernel/exec.c | 47 ++++-----------------
+ arch/um/kernel/internal.h | 1 -
+ arch/um/kernel/signal.c | 6 ++-
+ arch/um/kernel/syscall.c | 17 --------
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/unicore32/include/asm/exec.h | 15 -------
+ arch/unicore32/include/asm/thread_info.h | 4 +-
+ arch/unicore32/kernel/entry.S | 2 -
+ arch/unicore32/kernel/signal.c | 1 -
+ arch/unicore32/kernel/sys.c | 1 -
+ arch/x86/include/asm/syscalls.h | 2 +-
+ arch/x86/include/asm/thread_info.h | 2 -
+ arch/x86/include/asm/unistd.h | 2 +
+ arch/x86/kernel/Makefile | 2 +-
+ arch/x86/kernel/asm-offsets.c | 3 ++
+ arch/x86/kernel/entry_32.S | 30 +++++++-------
+ arch/x86/kernel/entry_64.S | 46 +++++++--------------
+ arch/x86/kernel/process.c | 27 -------------
+ arch/x86/kernel/process_32.c | 6 +++
+ arch/x86/kernel/signal.c | 4 --
+ arch/x86/kernel/sys_i386_32.c | 40 ------------------
+ arch/x86/kernel/vm86_32.c | 6 +--
+ arch/x86/syscalls/syscall_32.tbl | 2 +-
+ arch/x86/um/signal.c | 6 ---
+ arch/x86/um/sys_call_table_32.c | 1 -
+ arch/xtensa/include/asm/Kbuild | 2 +
+ arch/xtensa/include/asm/exec.h | 14 -------
+ arch/xtensa/include/asm/thread_info.h | 5 ---
+ arch/xtensa/kernel/signal.c | 4 --
+ fs/binfmt_elf.c | 1 -
+ fs/binfmt_elf_fdpic.c | 1 -
+ fs/exec.c | 40 +++++++++++++++++-
+ include/linux/binfmts.h | 7 ++++
+ include/linux/thread_info.h | 4 ++
+ kernel/sched/core.c | 2 +-
+ 127 files changed, 286 insertions(+), 774 deletions(-)
+ delete mode 100644 arch/alpha/include/asm/exec.h
+ delete mode 100644 arch/avr32/include/asm/exec.h
+ delete mode 100644 arch/c6x/include/asm/exec.h
+ delete mode 100644 arch/cris/include/asm/exec.h
+ delete mode 100644 arch/frv/include/asm/exec.h
+ delete mode 100644 arch/h8300/include/asm/exec.h
+ delete mode 100644 arch/ia64/include/asm/exec.h
+ delete mode 100644 arch/m32r/include/asm/exec.h
+ delete mode 100644 arch/m68k/include/asm/exec.h
+ delete mode 100644 arch/microblaze/include/asm/exec.h
+ delete mode 100644 arch/mn10300/include/asm/exec.h
+ delete mode 100644 arch/parisc/include/asm/exec.h
+ delete mode 100644 arch/sh/include/asm/exec.h
+ delete mode 100644 arch/sparc/include/asm/exec.h
+ delete mode 100644 arch/tile/include/asm/exec.h
+ delete mode 100644 arch/um/kernel/internal.h
+ delete mode 100644 arch/unicore32/include/asm/exec.h
+ delete mode 100644 arch/x86/kernel/sys_i386_32.c
+ delete mode 100644 arch/xtensa/include/asm/exec.h
+Merging clk/clk-next (672575e clk: versatile: make config option boolean)
+$ git merge clk/clk-next
+Auto-merging arch/arm/mach-realview/realview_pbx.c
+Auto-merging arch/arm/mach-realview/realview_pba8.c
+Auto-merging arch/arm/mach-realview/realview_pb11mp.c
+Auto-merging arch/arm/mach-realview/realview_pb1176.c
+Auto-merging arch/arm/mach-realview/realview_eb.c
+Removing arch/arm/mach-realview/include/mach/clkdev.h
+Auto-merging arch/arm/mach-realview/core.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 7 +-
+ arch/arm/mach-mmp/Kconfig | 3 +
+ arch/arm/mach-realview/core.c | 106 ------
+ arch/arm/mach-realview/include/mach/clkdev.h | 16 -
+ arch/arm/mach-realview/realview_eb.c | 2 +
+ arch/arm/mach-realview/realview_pb1176.c | 2 +
+ arch/arm/mach-realview/realview_pb11mp.c | 2 +
+ arch/arm/mach-realview/realview_pba8.c | 2 +
+ arch/arm/mach-realview/realview_pbx.c | 2 +
+ drivers/clk/Kconfig | 7 +
+ drivers/clk/Makefile | 6 +-
+ drivers/clk/clk-ls1x.c | 111 +++++++
+ drivers/clk/mmp/Makefile | 9 +
+ drivers/clk/mmp/clk-apbc.c | 152 +++++++++
+ drivers/clk/mmp/clk-apmu.c | 97 ++++++
+ drivers/clk/mmp/clk-frac.c | 153 +++++++++
+ drivers/clk/mmp/clk-mmp2.c | 449 ++++++++++++++++++++++++++
+ drivers/clk/mmp/clk-pxa168.c | 346 ++++++++++++++++++++
+ drivers/clk/mmp/clk-pxa910.c | 320 ++++++++++++++++++
+ drivers/clk/mmp/clk.h | 35 ++
+ drivers/clk/versatile/Makefile | 1 +
+ drivers/clk/versatile/clk-realview.c | 114 +++++++
+ include/linux/platform_data/clk-realview.h | 1 +
+ 23 files changed, 1816 insertions(+), 127 deletions(-)
+ delete mode 100644 arch/arm/mach-realview/include/mach/clkdev.h
+ create mode 100644 drivers/clk/clk-ls1x.c
+ create mode 100644 drivers/clk/mmp/Makefile
+ create mode 100644 drivers/clk/mmp/clk-apbc.c
+ create mode 100644 drivers/clk/mmp/clk-apmu.c
+ create mode 100644 drivers/clk/mmp/clk-frac.c
+ create mode 100644 drivers/clk/mmp/clk-mmp2.c
+ create mode 100644 drivers/clk/mmp/clk-pxa168.c
+ create mode 100644 drivers/clk/mmp/clk-pxa910.c
+ create mode 100644 drivers/clk/mmp/clk.h
+ create mode 100644 drivers/clk/versatile/clk-realview.c
+ create mode 100644 include/linux/platform_data/clk-realview.h
+Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
+$ git merge random/dev
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master ()
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/akpm/master:akpm
+From ../next
+ * [new branch] akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
+From ../next
+ * [new branch] akpm/base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: memory hotplug: reset pgdat->kswapd to NULL if creating kernel thread fails
+Applying: mm/ia64: fix a memory block size bug
+Applying: MAINTAINERS: fix TXT maintainer list and source repo path
+Applying: nbd: clear waiting_queue on shutdown
+Applying: slab: do ClearSlabPfmemalloc() for all pages of slab
+Applying: slab: fix starting index for finding another object
+Applying: slub: consider pfmemalloc_match() in get_partial_node()
+Applying: include/net/sock.h: squelch compiler warning in sk_rmem_schedule()
+Applying: pid-namespace: limit value of ns_last_pid to (0, max_pid)
+Applying: compiler.h: add __visible
+Applying: CRIS: Fix I/O macros
+Applying: drivers/scsi/ipr.c: missing unlock before a return
+Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
+Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
+Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
+Applying: acpi_memhotplug.c: remove memory info from list before freeing it
+Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
+Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
+Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: x86/mm/init.c: devmem_is_allowed() off by one
+Applying: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: audit.h: replace defines with C stubs
+Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
+Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: h8300: select generic atomic64_t support
+Applying: thermal: add generic cpufreq cooling implementation
+Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory
+Applying: thermal: exynos5: add exynos5 thermal sensor driver support
+Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer
+Applying: ARM: exynos: add thermal sensor driver platform data support
+Applying: drivers/thermal/exynos_thermal.c: fix build error
+Applying: drivers/thermal/exynos_thermal.c: remove duplicate inclusion of err.h header file
+Applying: drivers/thermal/exynos_thermal.c: use devm_* functions
+Applying: unicore32: select generic atomic64_t support
+Applying: readahead: fault retry breaks mmap file read random detection
+Applying: drivers/scsi/atp870u.c: fix bad use of udelay
+Applying: drivers/scsi/ipr.c: remove an unneeded check
+Applying: cciss: cleanup bitops usage
+Applying: cciss: use check_signature
+Applying: cciss: remove unneeded memset()
+Applying: block: store partition_meta_info.uuid as a string
+Applying: init: reduce PARTUUID min length to 1 from 36
+Applying: block: partition: msdos: provide UUIDs for partitions
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems
+Applying: mm/page_alloc.c: remove duplicate check
+Applying: mm: remove __GFP_NO_KSWAPD
+Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
+Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
+Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
+Applying: mm, x86, pat: rework linear pfn-mmap tracking
+Applying: mm: introduce arch-specific vma flag VM_ARCH_1
+Applying: mm: kill vma flag VM_INSERTPAGE
+Applying: mm: kill vma flag VM_CAN_NONLINEAR
+Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
+Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
+Applying: mm: prepare VM_DONTDUMP for using in drivers
+Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
+Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
+Applying: mm: fix nonuniform page status when writing new file with small buffer
+Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix
+Applying: mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix
+Applying: mm/mmap.c: replace find_vma_prepare() with clearer find_vma_links()
+Applying: mm: compaction: update comment in try_to_compact_pages
+Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction based on failures
+Applying: mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix
+Applying: mm: compaction: capture a suitable high-order page immediately when it is made available
+Applying: Revert "mm: mempolicy: Let vma_merge and vma_split handle vma->vm_policy linkages"
+Applying: mempolicy: remove mempolicy sharing
+Applying: mempolicy: fix a race in shared_policy_replace()
+Applying: mempolicy: fix refcount leak in mpol_set_shared_policy()
+Applying: mempolicy: fix a memory corruption by refcount imbalance in alloc_pages_vma()
+Applying: mempolicy-fix-a-memory-corruption-by-refcount-imbalance-in-alloc_pages_vma-v2
+Applying: mm: mmu_notifier: fix inconsistent memory between secondary MMU and host
+Applying: mm-mmu_notifier-fix-inconsistent-memory-between-secondary-mmu-and-host-fix
+Applying: mm: mmu_notifier: have mmu_notifiers use a global SRCU so they may safely schedule
+Applying: mm/mmu_notifier: init notifier if necessary
+Applying: mm/mmu_notifier: init notifier if necessary
+Applying: mm/vmscan: fix error number for failed kthread
+Applying: oom: remove deprecated oom_adj
+Applying: mm: hugetlb: add arch hook for clearing page flags before entering pool
+Applying: mm: adjust final #endif position in mm/internal.h
+Applying: thp: fix the count of THP_COLLAPSE_ALLOC
+Applying: thp: remove unnecessary check in start_khugepaged
+Applying: thp: move khugepaged_mutex out of khugepaged
+Applying: thp: remove unnecessary khugepaged_thread check
+Applying: thp: remove wake_up_interruptible in the exit path
+Applying: thp: remove some code depend on CONFIG_NUMA
+Applying: thp: merge page pre-alloc in khugepaged_loop into khugepaged_do_scan
+Applying: thp: release page in page pre-alloc path
+Applying: thp: introduce khugepaged_prealloc_page and khugepaged_alloc_page
+Applying: thp: remove khugepaged_loop
+Applying: thp: use khugepaged_enabled to remove duplicate code
+Applying: thp: remove unnecessary set_recommended_min_free_kbytes
+Applying: mm: fix potential anon_vma locking issue in mprotect()
+Applying: thp, x86: introduce HAVE_ARCH_TRANSPARENT_HUGEPAGE
+Applying: thp: remove assumptions on pgtable_t type
+Applying: thp: introduce pmdp_invalidate()
+Applying: thp: make MADV_HUGEPAGE check for mm->def_flags
+Applying: thp, s390: thp splitting backend for s390
+Applying: thp, s390: thp pagetable pre-allocation for s390
+Applying: thp, s390: disable thp for kvm host on s390
+Applying: thp, s390: architecture backend for thp on s390
+Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
+Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
+Applying: rbtree: empty nodes have no color
+Applying: rbtree-empty-nodes-have-no-color-fix
+Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
+Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
+Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
+Applying: rbtree: performance and correctness test
+Applying: rbtree-performance-and-correctness-test-fix
+Applying: rbtree: break out of rb_insert_color loop after tree rotation
+Applying: rbtree: adjust root color in rb_insert_color() only when necessary
+Applying: rbtree: low level optimizations in rb_insert_color()
+Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
+Applying: perf tools: fix build for another rbtree.c change
+Applying: rbtree: optimize case selection logic in __rb_erase_color()
+Applying: rbtree: low level optimizations in __rb_erase_color()
+Applying: rbtree: coding style adjustments
+Applying: rbtree: optimize fetching of sibling node
+Applying: rbtree test: fix sparse warning about 64-bit constant
+Applying: rbtree: add __rb_change_child() helper function
+Applying: rbtree: place easiest case first in rb_erase()
+Applying: rbtree: handle 1-child recoloring in rb_erase() instead of rb_erase_color()
+Applying: rbtree: low level optimizations in rb_erase()
+Applying: rbtree: augmented rbtree test
+Applying: rbtree: faster augmented rbtree manipulation
+Applying: rbtree: remove prior augmented rbtree implementation
+Applying: rbtree: add RB_DECLARE_CALLBACKS() macro
+Applying: rbtree: add prio tree and interval tree tests
+Applying: mm: replace vma prio_tree with an interval tree
+Applying: kmemleak: use rbtree instead of prio tree
+Applying: prio_tree: remove
+Applying: rbtree: move augmented rbtree functionality to rbtree_augmented.h
+Applying: memory-hotplug: build zonelists when offlining pages
+Applying: mm: mmu_notifier: make the mmu_notifier srcu static
+Applying: mm: change enum migrate_mode with bitwise type
+Applying: mm: support MIGRATE_DISCARD
+Applying: mm-support-migrate_discard-fix
+Applying: mm: move all mmu notifier invocations to be done outside the PT lock
+Applying: mm-move-all-mmu-notifier-invocations-to-be-done-outside-the-pt-lock-fix
+Applying: mm: wrap calls to set_pte_at_notify with invalidate_range_start and invalidate_range_end
+Applying: frv: kill used but uninitialized variable
+Applying: score: select generic atomic64_t support
+Applying: drivers/misc/lis3lv02d: add generic DT matching code
+Applying: drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code
+Applying: cross-arch: don't corrupt personality flags upon exec()
+Applying: tile: fix personality bits handling upon exec()
+Applying: kernel/sys.c: call disable_nonboot_cpus() in kernel_restart()
+Applying: lib: vsprintf: optimize division by 10 for small integers
+Applying: lib: vsprintf: optimize division by 10000
+Applying: lib: vsprintf: optimize put_dec_trunc8()
+Applying: lib: vsprintf: fix broken comments
+Applying: lib/vsprintf: update documentation to cover all of %p[Mm][FR]
+Applying: MAINTAINERS: update gpio subsystem file list
+Applying: MAINTAINERS: add defconfig file to IMX section
+Applying: MAINTAINERS: Update gianfar_ptp after renaming
+Applying: drivers/video/backlight/pwm_bl.c: add device tree support for Low Threshold Brightness
+Applying: drivers/video/backlight/da9052_bl.c: use usleep_range() instead of msleep() for small sleeps
+Applying: drivers/video/backlight/ltv350qv.c: use usleep_range() instead of msleep() for small sleeps
+Applying: drivers/video/backlight/kb3886_bl.c: use usleep_range() instead of msleep() for small sleeps
+Applying: backlight: lp855x: add FAST bit description for LP8556
+Applying: backlight: add Backlight driver for lm3630 chip
+Applying: backlight-add-backlight-driver-for-lm3630-chip-fix
+Applying: backlight: add new lm3639 backlight driver
+Applying: backlight-add-new-lm3639-backlight-driver-fix
+Applying: backlight: remove ProGear driver
+Applying: lib/parser.c: avoid overflow in match_number()
+Applying: lib-parserc-avoid-overflow-in-match_number-fix
+Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
+Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
+Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
+Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
+Applying: epoll: support for disabling items, and a self-test app
+Applying: drivers/rtc/rtc-isl1208.c: add support for the ISL1218
+Applying: rtc-proc: permit the /proc/driver/rtc device to use other devices
+Applying: rtc: add Dallas DS2404 driver
+Applying: rtc-add-dallas-ds2404-driver-fix
+Applying: rtc: snvs: add Freescale rtc-snvs driver
+Applying: rtc: snvs: change timeout to use a fixed number of loop
+Applying: rtc: recycle id when unloading a rtc driver
+Applying: drivers/rtc/rtc-at91sam9.c: use module_platform_driver() macro
+Applying: rtc: tps65910: add RTC driver for TPS65910 PMIC RTC
+Applying: rtc: add MAX8907 RTC driver
+Applying: rtc: kconfig: remove unnecessary dependencies.
+Applying: drivers/rtc/rtc-jz4740.c: fix IRQ error check
+Applying: drivers/rtc/rtc-spear.c: fix several error checks
+Applying: rtc: rc5t583: add ricoh rc5t583 RTC driver
+Applying: drivers/rtc/rtc-coh901331.c: use clk_prepare_enable() and clk_disable_unprepare()
+Applying: fat: use accessor function for msdos_dir_entry 'start'
+Applying: fat (exportfs): move NFS support code
+Applying: fat (exportfs): fix dentry reconnection
+Applying: fs/fat: fix a checkpatch issue in namei_msdos.c
+Applying: fs/fat: fix some checkpatch issues in fat.h
+Applying: fs/fat: chang indentation of some comments in fat.h
+Applying: fs/fat: fix two checkpatch issues in cache.c
+Applying: fs/fat: fix some small checkpatch issues in dir.c
+Applying: fs/fat: fix all other checkpatch issues in dir.c
+Applying: fs-fat-fix-all-other-checkpatch-issues-in-dirc-fix
+Applying: fs/fat: fix checkpatch issues in fatent.c
+Applying: fat: no need to reset EOF in ent_put for FAT32
+Applying: fat: simplify writeback_inode()
+Applying: fat-simplify-writeback_inode-checkpatch-fixes
+Applying: fat-simplify-writeback_inode-checkpatch-fixes-fix
+Applying: device_cgroup: add "deny_all" in dev_cgroup structure
+Applying: device_cgroup: introduce dev_whitelist_clean()
+Applying: device_cgroup: convert device_cgroup internally to policy + exceptions
+Applying: device_cgroup: rename whitelist to exception list
+Applying: coredump: move core dump functionality into its own file
+Applying: coredump: make core dump functionality optional
+Applying: fs: amended coredump-related sysctl functions
+Applying: coredump: update coredump-related headers
+Applying: proc: return -ENOMEM when inode allocation failed
+Applying: proc: no need to initialize proc_inode->fd in proc_get_inode()
+Applying: proc: use kzalloc instead of kmalloc and memset
+Applying: proc-use-kzalloc-instead-of-kmalloc-and-memset-fix
+Applying: proc_sysctl.c: use BUG_ON instead of BUG
+Applying: kdump: remove unneeded include
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: rapidio/tsi721: modify mport name assignment
+Applying: nbd: add set flags ioctl
+Applying: nbd: handle discard requests
+Applying: aoe: for performance support larger packet payloads
+Applying: aoe: kernel thread handles I/O completions for simple locking
+Applying: aoe: become I/O request queue handler for increased user control
+Applying: aoe: use a kernel thread for transmissions
+Applying: aoe: use packets that work with the smallest-MTU local interface
+Applying: aoe: failover remote interface based on aoe_deadsecs parameter
+Applying: aoe: do revalidation steps in order
+Applying: aoe: disallow unsupported AoE minor addresses
+Applying: aoe: associate frames with the AoE storage target
+Applying: aoe: increase net_device reference count while using it
+Applying: aoe: remove unused code and add cosmetic improvements
+Applying: aoe: update internal version number to 49
+Applying: aoe: update copyright year in touched files
+Applying: aoe: update documentation with new URL and VM settings reference
+Applying: taskstats: cgroupstats_user_cmd() may leak on error
+Applying: lib/decompress.c add __init to decompress_method and data
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + edcba17...d28e1f3 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (d28e1f3 lib/decompress.c add __init to decompress_method and data)
+$ git merge --no-ff akpm/master
+Removing mm/prio_tree.c
+Removing lib/prio_tree.c
+Removing include/linux/prio_tree.h
+Auto-merging include/linux/platform_data/exynos_thermal.h
+Removing drivers/video/backlight/progear_bl.c
+Removing drivers/hwmon/exynos4_tmu.c
+Auto-merging Documentation/thermal/exynos_thermal
+Removing Documentation/prio_tree.txt
+Removing Documentation/ABI/obsolete/proc-pid-oom_adj
+Merge made by the 'recursive' strategy.
+ Documentation/00-INDEX | 2 -
+ Documentation/ABI/obsolete/proc-pid-oom_adj | 22 -
+ Documentation/aoe/aoe.txt | 9 +-
+ .../devicetree/bindings/crypto/fsl-sec4.txt | 51 +
+ Documentation/devicetree/bindings/misc/lis302.txt | 76 ++
+ Documentation/devicetree/bindings/rtc/snvs-rtc.txt | 1 +
+ .../bindings/video/backlight/pwm-backlight.txt | 21 +
+ Documentation/feature-removal-schedule.txt | 25 -
+ Documentation/filesystems/proc.txt | 22 +-
+ Documentation/printk-formats.txt | 1 +
+ Documentation/prio_tree.txt | 107 --
+ Documentation/rbtree.txt | 209 +++-
+ Documentation/rtc.txt | 5 +-
+ Documentation/thermal/cpu-cooling-api.txt | 60 +
+ .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
+ Documentation/vm/unevictable-lru.txt | 4 +-
+ MAINTAINERS | 11 +-
+ arch/Kconfig | 3 +
+ arch/alpha/kernel/pci-sysfs.c | 2 +-
+ arch/arm/mm/fault-armv.c | 3 +-
+ arch/arm/mm/fault.c | 1 +
+ arch/arm/mm/flush.c | 3 +-
+ arch/avr32/include/asm/elf.h | 3 +-
+ arch/avr32/mm/fault.c | 1 +
+ arch/blackfin/include/asm/elf.h | 3 +-
+ arch/c6x/include/asm/elf.h | 3 +-
+ arch/cris/include/asm/elf.h | 3 +-
+ arch/cris/include/asm/io.h | 39 +-
+ arch/cris/mm/fault.c | 1 +
+ arch/frv/include/asm/elf.h | 3 +-
+ arch/frv/kernel/pm.c | 19 +-
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/elf.h | 3 +-
+ arch/hexagon/include/asm/elf.h | 3 +-
+ arch/hexagon/mm/vm_fault.c | 1 +
+ arch/ia64/include/asm/hugetlb.h | 4 +
+ arch/ia64/kernel/perfmon.c | 2 +-
+ arch/ia64/mm/fault.c | 1 +
+ arch/ia64/mm/init.c | 3 +-
+ arch/m32r/include/asm/elf.h | 3 +-
+ arch/m68k/include/asm/elf.h | 3 +-
+ arch/m68k/mm/fault.c | 1 +
+ arch/microblaze/include/asm/elf.h | 3 +-
+ arch/microblaze/mm/fault.c | 1 +
+ arch/mips/include/asm/hugetlb.h | 4 +
+ arch/mips/mm/fault.c | 1 +
+ arch/mn10300/Makefile | 2 +-
+ arch/mn10300/include/asm/elf.h | 3 +-
+ arch/openrisc/include/asm/elf.h | 3 +-
+ arch/openrisc/mm/fault.c | 1 +
+ arch/parisc/kernel/cache.c | 3 +-
+ arch/powerpc/include/asm/hugetlb.h | 4 +
+ arch/powerpc/kvm/book3s_hv.c | 2 +-
+ arch/powerpc/mm/fault.c | 1 +
+ arch/powerpc/oprofile/cell/spu_task_sync.c | 15 +-
+ arch/s390/include/asm/hugetlb.h | 19 +-
+ arch/s390/include/asm/pgtable.h | 208 ++++
+ arch/s390/include/asm/setup.h | 5 +-
+ arch/s390/include/asm/tlb.h | 1 +
+ arch/s390/kernel/early.c | 2 +
+ arch/s390/mm/fault.c | 1 +
+ arch/s390/mm/gup.c | 11 +-
+ arch/s390/mm/pgtable.c | 108 ++
+ arch/score/Kconfig | 3 +-
+ arch/score/include/asm/elf.h | 2 +-
+ arch/sh/include/asm/elf.h | 3 +-
+ arch/sh/include/asm/hugetlb.h | 6 +
+ arch/sh/mm/fault.c | 1 +
+ arch/sparc/include/asm/elf_32.h | 3 +-
+ arch/sparc/include/asm/hugetlb.h | 4 +
+ arch/sparc/kernel/pci.c | 2 +-
+ arch/sparc/mm/fault_32.c | 1 +
+ arch/sparc/mm/fault_64.c | 1 +
+ arch/tile/include/asm/elf.h | 4 +-
+ arch/tile/include/asm/hugetlb.h | 4 +
+ arch/tile/mm/elf.c | 19 +-
+ arch/tile/mm/fault.c | 1 +
+ arch/um/kernel/trap.c | 1 +
+ arch/unicore32/Kconfig | 1 +
+ arch/unicore32/kernel/process.c | 2 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/hugetlb.h | 4 +
+ arch/x86/kernel/acpi/boot.c | 5 +
+ arch/x86/mm/fault.c | 1 +
+ arch/x86/mm/hugetlbpage.c | 3 +-
+ arch/x86/mm/init.c | 2 +-
+ arch/x86/mm/numa.c | 3 +-
+ arch/x86/mm/pat.c | 87 +-
+ arch/x86/mm/pat_rbtree.c | 34 +-
+ arch/x86/platform/iris/iris.c | 67 +-
+ arch/x86/xen/mmu.c | 3 +-
+ arch/xtensa/include/asm/elf.h | 3 +-
+ arch/xtensa/mm/fault.c | 1 +
+ block/genhd.c | 8 +-
+ block/partitions/efi.c | 7 +-
+ block/partitions/msdos.c | 21 +-
+ drivers/acpi/acpi_memhotplug.c | 123 +-
+ drivers/block/aoe/aoe.h | 85 +-
+ drivers/block/aoe/aoeblk.c | 89 +-
+ drivers/block/aoe/aoechr.c | 11 +-
+ drivers/block/aoe/aoecmd.c | 1219 +++++++++++++-------
+ drivers/block/aoe/aoedev.c | 161 ++-
+ drivers/block/aoe/aoemain.c | 10 +-
+ drivers/block/aoe/aoenet.c | 61 +-
+ drivers/block/cciss.c | 22 +-
+ drivers/block/nbd.c | 32 +-
+ drivers/char/mbcs.c | 2 +-
+ drivers/char/mem.c | 2 +-
+ drivers/char/mspec.c | 2 +-
+ drivers/dma/dmaengine.c | 2 +-
+ drivers/firmware/dmi_scan.c | 78 +-
+ drivers/gpu/drm/drm_gem.c | 2 +-
+ drivers/gpu/drm/drm_vm.c | 10 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 2 +-
+ drivers/gpu/drm/gma500/framebuffer.c | 3 +-
+ drivers/gpu/drm/i915/intel_pm.c | 3 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +-
+ drivers/gpu/drm/udl/udl_fb.c | 2 +-
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/exynos4_tmu.c | 518 ---------
+ drivers/infiniband/hw/ehca/ehca_uverbs.c | 4 +-
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
+ drivers/media/pci/meye/meye.c | 2 +-
+ drivers/media/platform/omap/omap_vout.c | 2 +-
+ drivers/media/platform/vino.c | 2 +-
+ drivers/media/usb/sn9c102/sn9c102_core.c | 3 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 3 +-
+ drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +-
+ drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-memops.c | 2 +-
+ drivers/misc/carma/carma-fpga.c | 2 -
+ drivers/misc/lis3lv02d/lis3lv02d.c | 152 +++
+ drivers/misc/lis3lv02d/lis3lv02d.h | 4 +
+ drivers/misc/lis3lv02d/lis3lv02d_spi.c | 14 +
+ drivers/misc/sgi-gru/grufile.c | 5 +-
+ drivers/mtd/mtdchar.c | 2 +-
+ drivers/mtd/mtdcore.c | 6 +-
+ drivers/oprofile/buffer_sync.c | 17 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/rapidio/devices/tsi721.c | 3 +-
+ drivers/rtc/Kconfig | 86 +-
+ drivers/rtc/Makefile | 5 +
+ drivers/rtc/class.c | 1 +
+ drivers/rtc/rtc-at91sam9.c | 13 +-
+ drivers/rtc/rtc-coh901331.c | 3 +-
+ drivers/rtc/rtc-ds2404.c | 303 +++++
+ drivers/rtc/rtc-isl1208.c | 1 +
+ drivers/rtc/rtc-jz4740.c | 2 +-
+ drivers/rtc/rtc-max8907.c | 245 ++++
+ drivers/rtc/rtc-proc.c | 24 +-
+ drivers/rtc/rtc-rc5t583.c | 331 ++++++
+ drivers/rtc/rtc-snvs.c | 350 ++++++
+ drivers/rtc/rtc-spear.c | 12 +-
+ drivers/rtc/rtc-tps65910.c | 352 ++++++
+ drivers/scsi/atp870u.c | 11 +-
+ drivers/scsi/ipr.c | 19 +-
+ drivers/scsi/sg.c | 2 +-
+ drivers/staging/android/ashmem.c | 1 -
+ drivers/staging/omapdrm/omap_gem_dmabuf.c | 2 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 2 +-
+ drivers/thermal/Kconfig | 20 +
+ drivers/thermal/Makefile | 4 +-
+ drivers/thermal/cpu_cooling.c | 483 ++++++++
+ drivers/thermal/exynos_thermal.c | 928 +++++++++++++++
+ drivers/uio/uio.c | 4 +-
+ drivers/usb/mon/mon_bin.c | 2 +-
+ drivers/vfio/pci/vfio_pci.c | 2 +-
+ drivers/video/68328fb.c | 2 +-
+ drivers/video/aty/atyfb_base.c | 3 +-
+ drivers/video/backlight/Kconfig | 21 +-
+ drivers/video/backlight/Makefile | 3 +-
+ drivers/video/backlight/da9052_bl.c | 2 +-
+ drivers/video/backlight/kb3886_bl.c | 4 +-
+ drivers/video/backlight/lm3630_bl.c | 475 ++++++++
+ drivers/video/backlight/lm3639_bl.c | 437 +++++++
+ drivers/video/backlight/ltv350qv.c | 6 +-
+ drivers/video/backlight/progear_bl.c | 162 ---
+ drivers/video/backlight/pwm_bl.c | 5 +
+ drivers/video/fb-puv3.c | 3 +-
+ drivers/video/fb_defio.c | 2 +-
+ drivers/video/fbmem.c | 3 +-
+ drivers/video/gbefb.c | 2 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 2 +-
+ drivers/video/sbuslib.c | 5 +-
+ drivers/video/smscufx.c | 1 -
+ drivers/video/udlfb.c | 1 -
+ drivers/video/vermilion/vermilion.c | 1 -
+ drivers/video/vfb.c | 1 -
+ drivers/xen/gntalloc.c | 2 +-
+ drivers/xen/gntdev.c | 2 +-
+ drivers/xen/privcmd.c | 3 +-
+ fs/9p/v9fs.c | 5 +
+ fs/9p/vfs_file.c | 1 +
+ fs/Kconfig.binfmt | 8 +
+ fs/Makefile | 1 +
+ fs/adfs/super.c | 5 +
+ fs/affs/super.c | 5 +
+ fs/afs/super.c | 5 +
+ fs/attr.c | 5 +
+ fs/befs/linuxvfs.c | 5 +
+ fs/bfs/inode.c | 5 +
+ fs/binfmt_elf.c | 4 +-
+ fs/binfmt_elf_fdpic.c | 2 +-
+ fs/btrfs/disk-io.c | 2 +-
+ fs/btrfs/extent_io.c | 6 +
+ fs/btrfs/file.c | 2 +-
+ fs/btrfs/inode.c | 5 +
+ fs/ceph/addr.c | 2 +-
+ fs/ceph/super.c | 5 +
+ fs/cifs/cifsfs.c | 5 +
+ fs/cifs/file.c | 1 +
+ fs/coda/inode.c | 5 +
+ fs/coredump.c | 691 +++++++++++
+ fs/coredump.h | 6 +
+ fs/dcache.c | 2 +-
+ fs/ecryptfs/main.c | 6 +
+ fs/efs/super.c | 5 +
+ fs/eventpoll.c | 38 +-
+ fs/exec.c | 648 +----------
+ fs/exofs/super.c | 5 +
+ fs/ext2/super.c | 5 +
+ fs/ext3/super.c | 5 +
+ fs/ext4/file.c | 2 +-
+ fs/ext4/super.c | 5 +
+ fs/fat/Makefile | 2 +-
+ fs/fat/cache.c | 10 +-
+ fs/fat/dir.c | 56 +-
+ fs/fat/fat.h | 97 +-
+ fs/fat/fatent.c | 13 +-
+ fs/fat/inode.c | 192 +--
+ fs/fat/namei_msdos.c | 7 +-
+ fs/fat/namei_vfat.c | 5 +-
+ fs/fat/nfs.c | 101 ++
+ fs/freevxfs/vxfs_super.c | 5 +
+ fs/fuse/file.c | 1 +
+ fs/fuse/inode.c | 6 +
+ fs/gfs2/file.c | 2 +-
+ fs/hfs/super.c | 6 +
+ fs/hfsplus/super.c | 6 +
+ fs/hpfs/super.c | 5 +
+ fs/hugetlbfs/inode.c | 18 +-
+ fs/inode.c | 2 +-
+ fs/isofs/inode.c | 5 +
+ fs/jffs2/readinode.c | 13 +-
+ fs/jffs2/super.c | 6 +
+ fs/jfs/super.c | 6 +
+ fs/logfs/inode.c | 5 +
+ fs/minix/inode.c | 5 +
+ fs/ncpfs/inode.c | 5 +
+ fs/nfs/file.c | 1 +
+ fs/nfs/inode.c | 5 +
+ fs/nfs/internal.h | 2 +-
+ fs/nfs/write.c | 2 +-
+ fs/nilfs2/file.c | 2 +-
+ fs/nilfs2/super.c | 6 +
+ fs/ntfs/super.c | 6 +
+ fs/ocfs2/dlmfs/dlmfs.c | 5 +
+ fs/ocfs2/mmap.c | 2 +-
+ fs/ocfs2/super.c | 5 +
+ fs/openpromfs/inode.c | 5 +
+ fs/proc/base.c | 117 +-
+ fs/proc/generic.c | 15 +-
+ fs/proc/inode.c | 1 -
+ fs/proc/proc_sysctl.c | 8 +-
+ fs/proc/task_mmu.c | 2 +-
+ fs/qnx4/inode.c | 5 +
+ fs/qnx6/inode.c | 5 +
+ fs/reiserfs/super.c | 5 +
+ fs/romfs/super.c | 5 +
+ fs/squashfs/super.c | 5 +
+ fs/super.c | 6 -
+ fs/sysv/inode.c | 5 +
+ fs/ubifs/file.c | 1 +
+ fs/ubifs/super.c | 6 +
+ fs/udf/super.c | 5 +
+ fs/ufs/super.c | 5 +
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_super.c | 5 +
+ include/asm-generic/pgtable.h | 70 +-
+ include/linux/audit.h | 177 ++-
+ include/linux/binfmts.h | 1 -
+ include/linux/compaction.h | 4 +-
+ include/linux/compiler-gcc4.h | 7 +
+ include/linux/compiler.h | 4 +
+ include/linux/coredump.h | 5 +
+ include/linux/cpu_cooling.h | 99 ++
+ include/linux/eventpoll.h | 1 +
+ include/linux/fs.h | 12 +-
+ include/linux/genhd.h | 8 +-
+ include/linux/gfp.h | 5 +-
+ include/linux/huge_mm.h | 1 -
+ include/linux/interval_tree.h | 27 +
+ include/linux/interval_tree_tmpl.h | 219 ++++
+ include/linux/memory.h | 2 +-
+ include/linux/mempolicy.h | 4 +-
+ include/linux/mfd/rc5t583.h | 22 +
+ include/linux/mfd/tps65910.h | 10 +
+ include/linux/migrate.h | 10 +-
+ include/linux/migrate_mode.h | 22 +-
+ include/linux/mm.h | 101 +-
+ include/linux/mm_types.h | 16 +-
+ include/linux/mman.h | 1 -
+ include/linux/mmu_notifier.h | 60 +-
+ include/linux/nbd.h | 15 +-
+ include/linux/oom.h | 11 -
+ .../{exynos4_tmu.h => exynos_thermal.h} | 31 +-
+ include/linux/platform_data/lm3630_bl.h | 57 +
+ include/linux/platform_data/lm3639_bl.h | 69 ++
+ include/linux/platform_data/lp855x.h | 2 +
+ include/linux/prio_tree.h | 120 --
+ include/linux/rbtree.h | 119 +-
+ include/linux/rbtree_augmented.h | 223 ++++
+ include/linux/rio.h | 3 +-
+ include/linux/rtc-ds2404.h | 20 +
+ include/linux/sched.h | 1 -
+ include/linux/timerqueue.h | 2 +-
+ include/net/sock.h | 2 +-
+ include/trace/events/gfpflags.h | 1 -
+ init/Kconfig | 1 +
+ init/do_mounts.c | 61 +-
+ init/main.c | 2 -
+ ipc/mqueue.c | 3 -
+ ipc/sem.c | 250 ++--
+ kernel/auditsc.c | 13 +-
+ kernel/events/core.c | 2 +-
+ kernel/events/uprobes.c | 8 +-
+ kernel/fork.c | 27 +-
+ kernel/kexec.c | 1 -
+ kernel/pid_namespace.c | 6 +-
+ kernel/signal.c | 1 +
+ kernel/sys.c | 1 +
+ kernel/sysctl.c | 12 +-
+ kernel/taskstats.c | 1 +
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ lib/Kconfig.debug | 13 +
+ lib/Makefile | 7 +-
+ lib/decompress.c | 9 +-
+ lib/interval_tree.c | 13 +
+ lib/interval_tree_test_main.c | 105 ++
+ lib/parser.c | 10 +-
+ lib/prio_tree.c | 466 --------
+ lib/rbtree.c | 656 ++++++-----
+ lib/rbtree_test.c | 234 ++++
+ lib/vsprintf.c | 104 +-
+ mm/Kconfig | 2 +-
+ mm/Makefile | 4 +-
+ mm/compaction.c | 96 +-
+ mm/filemap.c | 6 +-
+ mm/filemap_xip.c | 10 +-
+ mm/fremap.c | 16 +-
+ mm/huge_memory.c | 404 +++----
+ mm/hugetlb.c | 25 +-
+ mm/internal.h | 4 +-
+ mm/interval_tree.c | 61 +
+ mm/kmemleak.c | 101 +-
+ mm/ksm.c | 29 +-
+ mm/madvise.c | 8 +-
+ mm/memory-failure.c | 3 +-
+ mm/memory.c | 95 +-
+ mm/memory_hotplug.c | 7 +-
+ mm/mempolicy.c | 137 ++-
+ mm/migrate.c | 79 +-
+ mm/mlock.c | 2 +-
+ mm/mmap.c | 105 +-
+ mm/mmu_notifier.c | 103 +-
+ mm/mremap.c | 8 +-
+ mm/nommu.c | 33 +-
+ mm/oom_kill.c | 4 +-
+ mm/page_alloc.c | 75 +-
+ mm/pgtable-generic.c | 50 +
+ mm/prio_tree.c | 208 ----
+ mm/rmap.c | 36 +-
+ mm/shmem.c | 3 +-
+ mm/slab.c | 6 +-
+ mm/slub.c | 15 +-
+ mm/swap.c | 11 +-
+ mm/vmalloc.c | 3 +-
+ mm/vmscan.c | 30 +-
+ net/ceph/osd_client.c | 1 -
+ security/device_cgroup.c | 373 +++---
+ security/selinux/netnode.c | 3 +-
+ security/selinux/selinuxfs.c | 2 +-
+ security/tomoyo/util.c | 9 +-
+ sound/core/pcm_native.c | 6 +-
+ sound/usb/usx2y/us122l.c | 2 +-
+ sound/usb/usx2y/usX2Yhwdep.c | 2 +-
+ sound/usb/usx2y/usx2yhwdeppcm.c | 2 +-
+ tools/perf/util/include/linux/rbtree.h | 1 +
+ tools/testing/selftests/Makefile | 2 +-
+ tools/testing/selftests/epoll/Makefile | 11 +
+ tools/testing/selftests/epoll/test_epoll.c | 344 ++++++
+ 394 files changed, 11611 insertions(+), 5384 deletions(-)
+ delete mode 100644 Documentation/ABI/obsolete/proc-pid-oom_adj
+ create mode 100644 Documentation/devicetree/bindings/misc/lis302.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/snvs-rtc.txt
+ delete mode 100644 Documentation/prio_tree.txt
+ create mode 100644 Documentation/thermal/cpu-cooling-api.txt
+ rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
+ delete mode 100644 drivers/hwmon/exynos4_tmu.c
+ create mode 100644 drivers/rtc/rtc-ds2404.c
+ create mode 100644 drivers/rtc/rtc-max8907.c
+ create mode 100644 drivers/rtc/rtc-rc5t583.c
+ create mode 100644 drivers/rtc/rtc-snvs.c
+ create mode 100644 drivers/rtc/rtc-tps65910.c
+ create mode 100644 drivers/thermal/cpu_cooling.c
+ create mode 100644 drivers/thermal/exynos_thermal.c
+ create mode 100644 drivers/video/backlight/lm3630_bl.c
+ create mode 100644 drivers/video/backlight/lm3639_bl.c
+ delete mode 100644 drivers/video/backlight/progear_bl.c
+ create mode 100644 fs/coredump.c
+ create mode 100644 fs/coredump.h
+ create mode 100644 fs/fat/nfs.c
+ create mode 100644 include/linux/cpu_cooling.h
+ create mode 100644 include/linux/interval_tree.h
+ create mode 100644 include/linux/interval_tree_tmpl.h
+ rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (74%)
+ create mode 100644 include/linux/platform_data/lm3630_bl.h
+ create mode 100644 include/linux/platform_data/lm3639_bl.h
+ delete mode 100644 include/linux/prio_tree.h
+ create mode 100644 include/linux/rbtree_augmented.h
+ create mode 100644 include/linux/rtc-ds2404.h
+ create mode 100644 lib/interval_tree.c
+ create mode 100644 lib/interval_tree_test_main.c
+ delete mode 100644 lib/prio_tree.c
+ create mode 100644 lib/rbtree_test.c
+ create mode 100644 mm/interval_tree.c
+ delete mode 100644 mm/prio_tree.c
+ create mode 100644 tools/testing/selftests/epoll/Makefile
+ create mode 100644 tools/testing/selftests/epoll/test_epoll.c
projects / karo-tx-linux.git / commitdiff