Next/merge.log

   1 $ date
   2 Friday 17 August  10:07:38 EST 2012
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
   7 Merging origin/master (d987569 Linux 3.6-rc2)
   8 $ git merge origin/master
   9 Updating ddf343f..d987569
  10 Fast-forward
  11  MAINTAINERS                             |   25 ++--
  12  Makefile                                |    2 +-
  13  arch/sh/drivers/dma/dma-sh.c            |    2 +-
  14  arch/sh/include/cpu-sh2a/cpu/sh7269.h   |   36 ++++--
  15  arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c |  195 ++++++++++++++++++-------------
  16  arch/sparc/kernel/sys_sparc_64.c        |   10 +-
  17  arch/sparc/mm/init_64.c                 |   28 ++++-
  18  arch/x86/xen/p2m.c                      |    5 +
  19  drivers/dma/imx-dma.c                   |   36 ++++--
  20  drivers/dma/tegra20-apb-dma.c           |   18 ++-
  21  drivers/gpu/drm/i915/intel_display.c    |   11 --
  22  drivers/gpu/drm/i915/intel_dp.c         |   14 +--
  23  drivers/gpu/drm/i915/intel_i2c.c        |    7 +-
  24  drivers/gpu/drm/i915/intel_panel.c      |   13 ++-
  25  drivers/gpu/drm/i915/intel_ringbuffer.c |   41 ++++---
  26  drivers/gpu/drm/nouveau/nouveau_i2c.c   |    2 +-
  27  drivers/gpu/drm/nouveau/nouveau_state.c |    1 -
  28  drivers/gpu/drm/nouveau/nv84_fifo.c     |    9 ++
  29  drivers/gpu/drm/nouveau/nvc0_pm.c       |    2 +-
  30  drivers/gpu/drm/nouveau/nvd0_display.c  |    2 +-
  31  drivers/gpu/drm/nouveau/nve0_fifo.c     |   37 +++++-
  32  drivers/sh/intc/core.c                  |   27 ++++-
  33  fs/autofs4/expire.c                     |   31 +++--
  34  fs/fuse/file.c                          |   15 ++-
  35  fs/fuse/fuse_i.h                        |    3 +
  36  fs/fuse/inode.c                         |   32 ++++-
  37  include/linux/Kbuild                    |    1 +
  38  include/linux/fuse.h                    |   19 ++-
  39  scripts/decodecode                      |    2 +-
  40  29 files changed, 414 insertions(+), 212 deletions(-)
  41 Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
  42 $ git merge fixes/master
  43 Already up-to-date.
  44 Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1)
  45 $ git merge kbuild-current/rc-fixes
  46 Already up-to-date.
  47 Merging arm-current/fixes (8986873 ARM: 7490/1: Drop duplicate select for GENERIC_IRQ_PROBE)
  48 $ git merge arm-current/fixes
  49 Merge made by the 'recursive' strategy.
  50  arch/arm/Kconfig                   |    6 -
  51  arch/arm/include/asm/pgtable.h     |   40 +--
  52  arch/arm/include/asm/sched_clock.h |    2 +
  53  arch/arm/kernel/sched_clock.c      |   24 ++
  54  arch/arm/kernel/topology.c         |    2 +-
  55  arch/arm/lib/Makefile              |   23 +-
  56  arch/arm/lib/io-readsw-armv3.S     |  106 +++++++
  57  arch/arm/lib/io-writesw-armv3.S    |  126 ++++++++
  58  arch/arm/lib/uaccess.S             |  564 ++++++++++++++++++++++++++++++++++++
  59  arch/arm/mm/flush.c                |    2 -
  60  arch/arm/mm/tlb-v7.S               |    6 +-
  61  arch/arm/vfp/vfpmodule.c           |    2 +
  62  12 files changed, 869 insertions(+), 34 deletions(-)
  63  create mode 100644 arch/arm/lib/io-readsw-armv3.S
  64  create mode 100644 arch/arm/lib/io-writesw-armv3.S
  65  create mode 100644 arch/arm/lib/uaccess.S
  66 Merging m68k-current/for-linus (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k)
  67 $ git merge m68k-current/for-linus
  68 Already up-to-date.
  69 Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI macro)
  70 $ git merge powerpc-merge/merge
  71 Already up-to-date.
  72 Merging sparc/master (2a95e37 scripts/decodecode: Fixup trapping instruction marker)
  73 $ git merge sparc/master
  74 Already up-to-date.
  75 Merging net/master (476ad15 net: netprio: fix cgrp create and write priomap race)
  76 $ git merge net/master
  77 Merge made by the 'recursive' strategy.
  78  Documentation/networking/netconsole.txt            |   19 +-
  79  drivers/bluetooth/ath3k.c                          |    2 +
  80  drivers/bluetooth/btusb.c                          |    2 +
  81  drivers/net/bonding/bond_main.c                    |   12 +-
  82  .../net/ethernet/freescale/fs_enet/mii-bitbang.c   |    4 +-
  83  drivers/net/ethernet/freescale/fs_enet/mii-fec.c   |    8 +-
  84  drivers/net/ethernet/mellanox/mlx4/mcg.c           |    4 +-
  85  drivers/net/ethernet/ti/davinci_cpdma.c            |    3 +-
  86  drivers/net/netconsole.c                           |    5 -
  87  drivers/net/team/team.c                            |   16 +-
  88  drivers/net/usb/qmi_wwan.c                         |  248 ++++----------------
  89  drivers/net/usb/sierra_net.c                       |   52 +---
  90  drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
  91  drivers/net/wireless/at76c50x-usb.c                |    2 +-
  92  drivers/net/wireless/ath/ath5k/base.c              |    6 +-
  93  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    5 +-
  94  drivers/net/wireless/ath/ath9k/mac.c               |   18 +-
  95  drivers/net/wireless/ath/ath9k/mac.h               |    1 +
  96  drivers/net/wireless/ath/ath9k/main.c              |    4 +-
  97  drivers/net/wireless/ath/ath9k/pci.c               |    1 +
  98  drivers/net/wireless/ath/ath9k/recv.c              |    2 +-
  99  drivers/net/wireless/rndis_wlan.c                  |    6 +-
 100  include/linux/if_team.h                            |   30 +--
 101  include/linux/netdevice.h                          |    3 +-
 102  include/linux/netpoll.h                            |   42 ++--
 103  include/net/llc.h                                  |    2 +-
 104  net/8021q/vlan_dev.c                               |   52 ++--
 105  net/atm/common.c                                   |    1 +
 106  net/atm/pvc.c                                      |    1 +
 107  net/bluetooth/hci_event.c                          |   28 ++-
 108  net/bluetooth/hci_sock.c                           |    2 +
 109  net/bluetooth/l2cap_core.c                         |    1 +
 110  net/bluetooth/l2cap_sock.c                         |    3 +-
 111  net/bluetooth/rfcomm/sock.c                        |    2 +
 112  net/bluetooth/rfcomm/tty.c                         |    2 +-
 113  net/bluetooth/sco.c                                |   19 +-
 114  net/bluetooth/smp.c                                |    5 +-
 115  net/bridge/br_device.c                             |   30 +--
 116  net/bridge/br_forward.c                            |    2 +-
 117  net/bridge/br_if.c                                 |    6 +-
 118  net/bridge/br_private.h                            |    4 +-
 119  net/core/netpoll.c                                 |  109 ++++++---
 120  net/core/netprio_cgroup.c                          |   30 +--
 121  net/core/scm.c                                     |    4 +
 122  net/dccp/ccid.h                                    |    4 +-
 123  net/dccp/ccids/ccid3.c                             |    1 +
 124  net/ipv4/route.c                                   |    1 -
 125  net/ipv6/addrconf.c                                |    4 +-
 126  net/ipv6/proc.c                                    |    4 +-
 127  net/l2tp/l2tp_ip6.c                                |    1 +
 128  net/llc/af_llc.c                                   |    8 +-
 129  net/llc/llc_input.c                                |   21 +-
 130  net/llc/llc_station.c                              |   23 +-
 131  net/netfilter/ipvs/ip_vs_ctl.c                     |    1 +
 132  net/sched/act_mirred.c                             |   11 +-
 133  net/socket.c                                       |    1 +
 134  56 files changed, 396 insertions(+), 484 deletions(-)
 135 Merging sound-current/for-linus (5e68fb3 ALSA: hda - Don't send invalid volume knob command on IDT 92hd75bxx)
 136 $ git merge sound-current/for-linus
 137 Merge made by the 'recursive' strategy.
 138  sound/arm/pxa2xx-ac97.c        |    4 ++--
 139  sound/atmel/abdac.c            |    2 +-
 140  sound/atmel/ac97c.c            |    2 +-
 141  sound/drivers/aloop.c          |    2 +-
 142  sound/drivers/dummy.c          |    2 +-
 143  sound/drivers/pcsp/pcsp.c      |    4 ++--
 144  sound/pci/cs46xx/cs46xx_lib.c  |    2 +-
 145  sound/pci/hda/hda_beep.c       |   29 +++++++++++++++++++++++------
 146  sound/pci/hda/hda_codec.c      |    2 +-
 147  sound/pci/hda/hda_intel.c      |    9 +++++++++
 148  sound/pci/hda/hda_proc.c       |    2 +-
 149  sound/pci/hda/patch_sigmatel.c |    9 +++++----
 150  sound/pci/hda/patch_via.c      |    8 ++++++++
 151  sound/pci/lx6464es/lx6464es.c  |    2 ++
 152  sound/ppc/powermac.c           |    2 +-
 153  sound/usb/endpoint.c           |    4 ----
 154  sound/usb/pcm.c                |    3 +++
 155  17 files changed, 62 insertions(+), 26 deletions(-)
 156 Merging pci-current/for-linus (9f6445a Merge branch 'pci/rafael-3.6-fixes' into for-linus)
 157 $ git merge pci-current/for-linus
 158 Merge made by the 'recursive' strategy.
 159  drivers/pci/pci-acpi.c   |    4 ++--
 160  drivers/pci/pci-driver.c |    7 +++++++
 161  2 files changed, 9 insertions(+), 2 deletions(-)
 162 Merging wireless/master (7dd6753 ath5k: fix spin_lock_irqsave/spin_lock_bh nesting in mesh)
 163 $ git merge wireless/master
 164 Already up-to-date.
 165 Merging driver-core.current/driver-core-linus (7b7e995 extcon: extcon_gpio: Replace gpio_request_one by devm_gpio_request_one)
 166 $ git merge driver-core.current/driver-core-linus
 167 Merge made by the 'recursive' strategy.
 168  drivers/base/core.c          |    9 +++++++--
 169  drivers/extcon/extcon_gpio.c |    3 ++-
 170  2 files changed, 9 insertions(+), 3 deletions(-)
 171 Merging tty.current/tty-linus (38f8eef pmac_zilog,kdb: Fix console poll hook to return instead of loop)
 172 $ git merge tty.current/tty-linus
 173 Merge made by the 'recursive' strategy.
 174  drivers/tty/serial/Kconfig      |   10 +++++-----
 175  drivers/tty/serial/ifx6x60.c    |    2 +-
 176  drivers/tty/serial/mxs-auart.c  |   14 +++++++++-----
 177  drivers/tty/serial/pmac_zilog.c |   12 +++++++++---
 178  4 files changed, 24 insertions(+), 14 deletions(-)
 179 Merging usb.current/usb-linus (731879f USB: qcserial: fix port handling on Gobi 1K and 2K+)
 180 $ git merge usb.current/usb-linus
 181 Auto-merging MAINTAINERS
 182 Merge made by the 'recursive' strategy.
 183  MAINTAINERS                          |   10 +-
 184  drivers/usb/chipidea/Kconfig         |    9 +-
 185  drivers/usb/gadget/u_ether.c         |    6 +
 186  drivers/usb/host/ehci-omap.c         |  167 +-------------------
 187  drivers/usb/host/ehci-sead3.c        |    2 +-
 188  drivers/usb/host/ehci-tegra.c        |    3 +-
 189  drivers/usb/host/isp1362-hcd.c       |    8 +-
 190  drivers/usb/host/pci-quirks.c        |    7 +
 191  drivers/usb/host/pci-quirks.h        |    1 +
 192  drivers/usb/host/xhci-pci.c          |   10 ++
 193  drivers/usb/host/xhci-ring.c         |   40 +++--
 194  drivers/usb/host/xhci.c              |    8 +-
 195  drivers/usb/host/xhci.h              |    3 +
 196  drivers/usb/musb/Kconfig             |    4 +-
 197  drivers/usb/musb/musb_dsps.c         |   19 +--
 198  drivers/usb/renesas_usbhs/common.c   |    6 +-
 199  drivers/usb/renesas_usbhs/mod_host.c |    8 +
 200  drivers/usb/serial/bus.c             |   15 +-
 201  drivers/usb/serial/ftdi_sio.c        |    1 +
 202  drivers/usb/serial/ftdi_sio_ids.h    |    7 +
 203  drivers/usb/serial/ipw.c             |    3 +-
 204  drivers/usb/serial/mos7840.c         |   16 +-
 205  drivers/usb/serial/option.c          |  285 ++++++++++++++--------------------
 206  drivers/usb/serial/qcserial.c        |   47 +++---
 207  drivers/usb/serial/usb-wwan.h        |    3 +-
 208  drivers/usb/serial/usb_wwan.c        |   68 ++++----
 209  26 files changed, 299 insertions(+), 457 deletions(-)
 210 Merging staging.current/staging-linus (3a491ae Merge tag 'v3.6-rc1-iio-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
 211 $ git merge staging.current/staging-linus
 212 Merge made by the 'recursive' strategy.
 213  drivers/iio/frequency/adf4350.c               |   24 +++---
 214  drivers/iio/light/adjd_s311.c                 |    7 +-
 215  drivers/iio/light/lm3533-als.c                |    4 +-
 216  drivers/staging/comedi/drivers.c              |    2 +-
 217  drivers/staging/comedi/drivers/adv_pci1710.c  |    3 -
 218  drivers/staging/comedi/drivers/adv_pci1723.c  |    2 -
 219  drivers/staging/comedi/drivers/adv_pci_dio.c  |    2 -
 220  drivers/staging/comedi/drivers/daqboard2000.c |   17 +++--
 221  drivers/staging/comedi/drivers/dt3000.c       |    6 +-
 222  drivers/staging/comedi/drivers/rtd520.c       |   26 +++----
 223  drivers/staging/comedi/drivers/usbdux.c       |    4 +-
 224  drivers/staging/comedi/drivers/usbduxfast.c   |    4 +-
 225  drivers/staging/comedi/drivers/usbduxsigma.c  |    4 +-
 226  drivers/staging/csr/Kconfig                   |    2 +-
 227  drivers/staging/iio/adc/ad7192.c              |   48 ++++++------
 228  drivers/staging/iio/adc/ad7298_ring.c         |    2 +-
 229  drivers/staging/iio/adc/ad7780.c              |   10 ++-
 230  drivers/staging/iio/adc/ad7793.c              |   99 +++++++++++++++----------
 231  include/linux/iio/frequency/adf4350.h         |    2 +
 232  19 files changed, 150 insertions(+), 118 deletions(-)
 233 Merging char-misc.current/char-misc-linus (f3261df 1-Wire: Add support for the maxim ds1825 temperature sensor)
 234 $ git merge char-misc.current/char-misc-linus
 235 Merge made by the 'recursive' strategy.
 236  Documentation/w1/slaves/w1_therm |    2 ++
 237  drivers/misc/mei/interrupt.c     |    2 +-
 238  drivers/misc/mei/main.c          |   27 +++++++++++++++++++++++++++
 239  drivers/misc/ti-st/st_ll.c       |    2 +-
 240  drivers/w1/slaves/w1_therm.c     |    9 +++++++++
 241  drivers/w1/w1_family.h           |    1 +
 242  6 files changed, 41 insertions(+), 2 deletions(-)
 243 Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus)
 244 $ git merge input-current/for-linus
 245 Already up-to-date.
 246 Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync)
 247 $ git merge md-current/for-linus
 248 Already up-to-date.
 249 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
 250 $ git merge audit-current/for-linus
 251 Already up-to-date.
 252 Merging crypto-current/master (76f16f8 crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs)
 253 $ git merge crypto-current/master
 254 Merge made by the 'recursive' strategy.
 255  drivers/crypto/hifn_795x.c |    4 ++--
 256  1 file changed, 2 insertions(+), 2 deletions(-)
 257 Merging ide/master (39a50b4 Merge branch 'hfsplus')
 258 $ git merge ide/master
 259 Already up-to-date.
 260 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
 261 $ git merge dwmw2/master
 262 Already up-to-date.
 263 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
 264 $ git merge sh-current/sh-fixes-for-linus
 265 Already up-to-date.
 266 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
 267 $ git merge irqdomain-current/irqdomain/merge
 268 Already up-to-date.
 269 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
 270 $ git merge devicetree-current/devicetree/merge
 271 Auto-merging drivers/of/base.c
 272 Merge made by the 'recursive' strategy.
 273  drivers/of/base.c |    2 ++
 274  1 file changed, 2 insertions(+)
 275 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
 276 $ git merge spi-current/spi/merge
 277 Auto-merging drivers/spi/spi.c
 278 Auto-merging drivers/spi/spi-s3c64xx.c
 279 Auto-merging drivers/spi/spi-bcm63xx.c
 280 Merge made by the 'recursive' strategy.
 281  drivers/spi/spi-bcm63xx.c |   16 ++++++----------
 282  drivers/spi/spi-s3c64xx.c |   10 ++++------
 283  drivers/spi/spi.c         |    5 ++++-
 284  3 files changed, 14 insertions(+), 17 deletions(-)
 285 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
 286 $ git merge gpio-current/gpio/merge
 287 Already up-to-date.
 288 Merging arm/for-next (22018e9 Merge branches 'fixes' and 'misc' into for-next)
 289 $ git merge arm/for-next
 290 Merge made by the 'recursive' strategy.
 291  arch/arm/mach-exynos/platsmp.c |    2 +-
 292  arch/arm/mm/init.c             |    2 +-
 293  2 files changed, 2 insertions(+), 2 deletions(-)
 294 Merging arm-perf/for-next/perf (b90c4b9 Merge branch 'hw-breakpoint' into for-next/perf)
 295 $ git merge arm-perf/for-next/perf
 296 Removing arch/arm/kernel/pmu.c
 297 Auto-merging arch/arm/Kconfig
 298 Auto-merging MAINTAINERS
 299 Merge made by the 'recursive' strategy.
 300  Documentation/devicetree/bindings/arm/pmu.txt |    4 +
 301  MAINTAINERS                                   |    1 -
 302  arch/arm/Kconfig                              |    8 +-
 303  arch/arm/include/asm/perf_event.h             |    9 +-
 304  arch/arm/include/asm/pmu.h                    |   77 ++----
 305  arch/arm/kernel/Makefile                      |    3 +-
 306  arch/arm/kernel/hw_breakpoint.c               |   61 +++--
 307  arch/arm/kernel/perf_event.c                  |  347 ++++---------------------
 308  arch/arm/kernel/perf_event_cpu.c              |  295 +++++++++++++++++++++
 309  arch/arm/kernel/perf_event_v6.c               |   12 +-
 310  arch/arm/kernel/perf_event_v7.c               |   32 +--
 311  arch/arm/kernel/perf_event_xscale.c           |   10 +-
 312  arch/arm/kernel/pmu.c                         |   36 ---
 313  arch/arm/mach-bcmring/arch.c                  |    3 +-
 314  arch/arm/mach-omap2/devices.c                 |    3 +-
 315  arch/arm/mach-pxa/devices.c                   |    3 +-
 316  arch/arm/mach-realview/realview_eb.c          |    3 +-
 317  arch/arm/mach-realview/realview_pb1176.c      |    3 +-
 318  arch/arm/mach-realview/realview_pb11mp.c      |    3 +-
 319  arch/arm/mach-realview/realview_pba8.c        |    3 +-
 320  arch/arm/mach-realview/realview_pbx.c         |    3 +-
 321  arch/arm/mach-tegra/devices.c                 |    3 +-
 322  arch/arm/mach-ux500/cpu-db8500.c              |    3 +-
 323  arch/arm/mach-vexpress/ct-ca9x4.c             |    3 +-
 324  arch/arm/plat-iop/pmu.c                       |    3 +-
 325  arch/arm/plat-samsung/devs.c                  |    3 +-
 326  26 files changed, 467 insertions(+), 467 deletions(-)
 327  create mode 100644 arch/arm/kernel/perf_event_cpu.c
 328  delete mode 100644 arch/arm/kernel/pmu.c
 329 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
 330 $ git merge davinci/davinci-next
 331 Already up-to-date.
 332 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
 333 $ git merge xilinx/arm-next
 334 Already up-to-date.
 335 Merging blackfin/for-linus (719154c bf60x: fix build warning)
 336 $ git merge blackfin/for-linus
 337 Already up-to-date.
 338 Merging c6x/for-linux-next (01ddd9a C6X: select GENERIC_ATOMIC64)
 339 $ git merge c6x/for-linux-next
 340 Merge made by the 'recursive' strategy.
 341  arch/c6x/Kconfig             |    1 +
 342  arch/c6x/include/asm/cache.h |   16 +++++++++++-----
 343  2 files changed, 12 insertions(+), 5 deletions(-)
 344 Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
 345 $ git merge cris/for-next
 346 Removing arch/cris/arch-v32/mach-fs/vcs_hook.h
 347 Removing arch/cris/arch-v32/mach-fs/vcs_hook.c
 348 Removing arch/cris/arch-v32/mach-a3/vcs_hook.h
 349 Removing arch/cris/arch-v32/mach-a3/vcs_hook.c
 350 Auto-merging arch/cris/arch-v32/drivers/pci/bios.c
 351 Auto-merging arch/cris/Kconfig
 352 Merge made by the 'recursive' strategy.
 353  arch/cris/Kconfig                                  |    5 -
 354  arch/cris/arch-v32/drivers/axisflashmap.c          |   29 ------
 355  arch/cris/arch-v32/drivers/pci/bios.c              |   25 -----
 356  arch/cris/arch-v32/kernel/head.S                   |   58 +----------
 357  arch/cris/arch-v32/kernel/kgdb.c                   |   14 ---
 358  arch/cris/arch-v32/mach-a3/Makefile                |    2 -
 359  arch/cris/arch-v32/mach-a3/vcs_hook.c              |  103 --------------------
 360  arch/cris/arch-v32/mach-a3/vcs_hook.h              |   58 -----------
 361  arch/cris/arch-v32/mach-fs/Makefile                |    2 -
 362  arch/cris/arch-v32/mach-fs/vcs_hook.c              |  100 -------------------
 363  arch/cris/arch-v32/mach-fs/vcs_hook.h              |   42 --------
 364  arch/cris/arch-v32/mm/init.c                       |    8 --
 365  arch/cris/include/arch-v32/arch/page.h             |    5 -
 366  arch/cris/include/arch-v32/arch/processor.h        |    6 +-
 367  .../cris/include/arch-v32/mach-fs/mach/startup.inc |    6 --
 368  arch/cris/include/asm/pci.h                        |    1 -
 369  16 files changed, 3 insertions(+), 461 deletions(-)
 370  delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.c
 371  delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.h
 372  delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.c
 373  delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.h
 374 Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
 375 $ git merge hexagon/linux-next
 376 Already up-to-date.
 377 Merging ia64/next (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts)
 378 $ git merge ia64/next
 379 Already up-to-date.
 380 Merging m68k/for-next (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k)
 381 $ git merge m68k/for-next
 382 Already up-to-date.
 383 Merging m68knommu/for-next (c8efcf9 m68k: select CONFIG_GENERIC_ATOMIC64 for all m68k CPU types)
 384 $ git merge m68knommu/for-next
 385 Auto-merging arch/m68k/Kconfig.cpu
 386 Auto-merging arch/m68k/Kconfig
 387 Merge made by the 'recursive' strategy.
 388  arch/m68k/Kconfig     |    1 +
 389  arch/m68k/Kconfig.cpu |    5 +----
 390  2 files changed, 2 insertions(+), 4 deletions(-)
 391 Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
 392 $ git merge microblaze/next
 393 Already up-to-date.
 394 Merging mips/mips-for-linux-next (a9b21c6 Merge branches 'next/for-linus', 'next/generic', 'next/lantiq' and 'next/trace' into mips-for-linux-next)
 395 $ git merge mips/mips-for-linux-next
 396 Auto-merging drivers/spi/spi-bcm63xx.c
 397 Merge made by the 'recursive' strategy.
 398  arch/mips/Kconfig                                  |    8 +
 399  arch/mips/alchemy/board-mtx1.c                     |    2 +
 400  arch/mips/ath79/dev-usb.c                          |    2 +
 401  arch/mips/ath79/gpio.c                             |    6 +-
 402  arch/mips/bcm63xx/dev-spi.c                        |    4 +
 403  arch/mips/cavium-octeon/octeon-irq.c               |   89 +-
 404  arch/mips/include/asm/atomic.h                     |   64 +-
 405  arch/mips/include/asm/cpu-features.h               |    4 +
 406  arch/mips/include/asm/cpu.h                        |    1 +
 407  arch/mips/include/asm/elf.h                        |    1 +
 408  arch/mips/include/asm/mach-ath79/ar71xx_regs.h     |    3 +-
 409  .../include/asm/mach-ath79/cpu-feature-overrides.h |    1 -
 410  .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     |    2 +
 411  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |   13 +-
 412  arch/mips/include/asm/mach-cavium-octeon/irq.h     |   10 +-
 413  .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h |    3 +
 414  arch/mips/include/asm/mipsregs.h                   |    2 +
 415  arch/mips/include/asm/module.h                     |    1 +
 416  arch/mips/include/asm/ptrace.h                     |   17 +-
 417  arch/mips/include/asm/r4k-timer.h                  |    8 +-
 418  arch/mips/include/asm/siginfo.h                    |    9 +
 419  arch/mips/include/asm/syscall.h                    |  129 +++
 420  arch/mips/include/asm/thread_info.h                |    7 +
 421  arch/mips/include/asm/unistd.h                     |   11 +
 422  arch/mips/kernel/Makefile                          |    1 +
 423  arch/mips/kernel/cpu-probe.c                       |    5 +-
 424  arch/mips/kernel/ftrace.c                          |   33 +
 425  arch/mips/kernel/module.c                          |   43 +-
 426  arch/mips/kernel/perf_event_mipsxx.c               |  262 +++---
 427  arch/mips/kernel/ptrace.c                          |  210 +++--
 428  arch/mips/kernel/scall32-o32.S                     |  887 +++++++++-----------
 429  arch/mips/kernel/scall64-64.S                      |   40 +-
 430  arch/mips/kernel/scall64-n32.S                     |   48 +-
 431  arch/mips/kernel/scall64-o32.S                     |   82 +-
 432  arch/mips/kernel/smp.c                             |    4 +-
 433  arch/mips/kernel/sync-r4k.c                        |   26 +-
 434  arch/mips/kernel/vmlinux.lds.S                     |   21 +-
 435  arch/mips/lantiq/xway/sysctrl.c                    |   14 +
 436  arch/mips/mm/init.c                                |   17 +-
 437  arch/mips/pci/pci-lantiq.c                         |    7 +-
 438  drivers/spi/spi-bcm63xx.c                          |   31 +-
 439  include/asm-generic/vmlinux.lds.h                  |    9 +
 440  42 files changed, 1206 insertions(+), 931 deletions(-)
 441  create mode 100644 arch/mips/include/asm/syscall.h
 442 Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
 443 $ git merge openrisc/for-upstream
 444 Already up-to-date.
 445 Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
 446 $ git merge parisc/for-next
 447 Merge made by the 'recursive' strategy.
 448  arch/parisc/include/asm/atomic.h |    4 ++--
 449  arch/parisc/kernel/process.c     |    2 +-
 450  arch/parisc/kernel/sys_parisc.c  |    8 ++++----
 451  3 files changed, 7 insertions(+), 7 deletions(-)
 452 Merging powerpc/next (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
 453 $ git merge powerpc/next
 454 Already up-to-date.
 455 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
 456 $ git merge 4xx/next
 457 Already up-to-date.
 458 Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
 459 $ git merge mpc5xxx/next
 460 Merge made by the 'recursive' strategy.
 461  arch/powerpc/platforms/512x/Kconfig          |    1 +
 462  arch/powerpc/platforms/512x/clock.c          |    6 ++++--
 463  arch/powerpc/platforms/512x/mpc512x_shared.c |    6 ------
 464  3 files changed, 5 insertions(+), 8 deletions(-)
 465 Merging galak/next (ce629a2 powerpc/e5500: Add Power ISA properties to comply with ePAPR 1.1)
 466 $ git merge galak/next
 467 Removing arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
 468 Removing arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
 469 Removing arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
 470 Removing arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
 471 Merge made by the 'recursive' strategy.
 472  arch/powerpc/Kconfig                            |    6 +-
 473  arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi |   58 ++++
 474  arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi |   52 ++++
 475  arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi  |   59 +++++
 476  arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi    |    3 +
 477  arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi    |    3 +
 478  arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi    |    3 +
 479  arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi    |    3 +
 480  arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi    |    3 +
 481  arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi    |    3 +
 482  arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi      |    3 +
 483  arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi      |    3 +
 484  arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi      |    3 +
 485  arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi      |    3 +
 486  arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi      |    3 +
 487  arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi      |    3 +
 488  arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi      |    3 +
 489  arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi      |    3 +
 490  arch/powerpc/boot/dts/fsl/p4080si-post.dtsi     |    7 +
 491  arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi      |    3 +
 492  arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi      |    3 +
 493  arch/powerpc/boot/dts/fsl/p5040si-post.dtsi     |  320 +++++++++++++++++++++++
 494  arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi      |  114 ++++++++
 495  arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi   |  118 +++++++++
 496  arch/powerpc/boot/dts/mpc8540ads.dts            |    2 +
 497  arch/powerpc/boot/dts/mpc8541cds.dts            |    2 +
 498  arch/powerpc/boot/dts/mpc8555cds.dts            |    2 +
 499  arch/powerpc/boot/dts/mpc8560ads.dts            |    2 +
 500  arch/powerpc/boot/dts/p1020rdb_camp_core0.dts   |   63 -----
 501  arch/powerpc/boot/dts/p1020rdb_camp_core1.dts   |  141 ----------
 502  arch/powerpc/boot/dts/p1022rdk.dts              |  188 +++++++++++++
 503  arch/powerpc/boot/dts/p2020rdb_camp_core0.dts   |   67 -----
 504  arch/powerpc/boot/dts/p2020rdb_camp_core1.dts   |  125 ---------
 505  arch/powerpc/boot/dts/p5040ds.dts               |  203 ++++++++++++++
 506  arch/powerpc/configs/corenet32_smp_defconfig    |    1 +
 507  arch/powerpc/configs/corenet64_smp_defconfig    |    1 +
 508  arch/powerpc/configs/mpc85xx_defconfig          |    2 +
 509  arch/powerpc/configs/mpc85xx_smp_defconfig      |    1 +
 510  arch/powerpc/include/asm/cacheflush.h           |    2 +
 511  arch/powerpc/include/asm/fsl_guts.h             |    2 +
 512  arch/powerpc/include/asm/mpic.h                 |   19 ++
 513  arch/powerpc/include/asm/smp.h                  |    2 +
 514  arch/powerpc/include/asm/swiotlb.h              |    6 +
 515  arch/powerpc/kernel/cpu_setup_fsl_booke.S       |   74 +++++-
 516  arch/powerpc/kernel/cputable.c                  |    4 +
 517  arch/powerpc/kernel/dma-swiotlb.c               |   20 ++
 518  arch/powerpc/kernel/exceptions-64e.S            |   18 +-
 519  arch/powerpc/kernel/head_fsl_booke.S            |   46 +++-
 520  arch/powerpc/kernel/smp.c                       |   12 +-
 521  arch/powerpc/mm/mem.c                           |    3 +-
 522  arch/powerpc/platforms/44x/currituck.c          |   10 +-
 523  arch/powerpc/platforms/85xx/Kconfig             |   21 ++
 524  arch/powerpc/platforms/85xx/Makefile            |    2 +
 525  arch/powerpc/platforms/85xx/corenet_ds.c        |   10 +-
 526  arch/powerpc/platforms/85xx/mpc85xx_ds.c        |    1 +
 527  arch/powerpc/platforms/85xx/p1022_rdk.c         |  195 ++++++++++++++
 528  arch/powerpc/platforms/85xx/p5040_ds.c          |   89 +++++++
 529  arch/powerpc/platforms/85xx/qemu_e500.c         |    1 +
 530  arch/powerpc/platforms/85xx/smp.c               |  220 +++++++++++++---
 531  arch/powerpc/sysdev/Makefile                    |    2 +-
 532  arch/powerpc/sysdev/fsl_85xx_l2ctlr.c           |   10 +
 533  arch/powerpc/sysdev/fsl_mpic_err.c              |  149 +++++++++++
 534  arch/powerpc/sysdev/fsl_pci.c                   |   19 +-
 535  arch/powerpc/sysdev/mpic.c                      |  102 ++++++--
 536  arch/powerpc/sysdev/mpic.h                      |   22 ++
 537  65 files changed, 2130 insertions(+), 513 deletions(-)
 538  create mode 100644 arch/powerpc/boot/dts/fsl/e500mc_power_isa.dtsi
 539  create mode 100644 arch/powerpc/boot/dts/fsl/e500v2_power_isa.dtsi
 540  create mode 100644 arch/powerpc/boot/dts/fsl/e5500_power_isa.dtsi
 541  create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
 542  create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
 543  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
 544  delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
 545  delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
 546  create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
 547  delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
 548  delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
 549  create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
 550  create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
 551  create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
 552  create mode 100644 arch/powerpc/sysdev/fsl_mpic_err.c
 553 Merging s390/features (3c011c6 s390/bpf,jit: BPF Just In Time compiler for s390)
 554 $ git merge s390/features
 555 Merge made by the 'recursive' strategy.
 556  arch/s390/Kbuild                  |    1 +
 557  arch/s390/Kconfig                 |    1 +
 558  arch/s390/include/asm/processor.h |    1 +
 559  arch/s390/kernel/dis.c            |   23 ++
 560  arch/s390/net/Makefile            |    4 +
 561  arch/s390/net/bpf_jit.S           |  130 +++++++
 562  arch/s390/net/bpf_jit_comp.c      |  738 +++++++++++++++++++++++++++++++++++++
 563  7 files changed, 898 insertions(+)
 564  create mode 100644 arch/s390/net/Makefile
 565  create mode 100644 arch/s390/net/bpf_jit.S
 566  create mode 100644 arch/s390/net/bpf_jit_comp.c
 567 Merging sh/sh-latest (fa75ce6 Merge branches 'sh/urgent' and 'sh/gpiolib' into sh-latest)
 568 $ git merge sh/sh-latest
 569 Already up-to-date.
 570 Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
 571 $ git merge sparc-next/master
 572 Already up-to-date.
 573 Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
 574 $ git merge tile/master
 575 Already up-to-date.
 576 Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
 577 $ git merge unicore32/unicore32
 578 Auto-merging arch/unicore32/Kconfig
 579 Merge made by the 'recursive' strategy.
 580  arch/unicore32/Kconfig               |    3 +++
 581  arch/unicore32/include/asm/bug.h     |    5 -----
 582  arch/unicore32/include/asm/cmpxchg.h |    2 +-
 583  arch/unicore32/kernel/setup.h        |    6 ++++++
 584  arch/unicore32/mm/fault.c            |   37 +++++++++++++++++++++++++---------
 585  5 files changed, 37 insertions(+), 16 deletions(-)
 586 Merging xtensa/for_next (499d9ec xtensa: ISS: exit simulator in case of halt or panic)
 587 $ git merge xtensa/for_next
 588 Auto-merging MAINTAINERS
 589 Merge made by the 'recursive' strategy.
 590  MAINTAINERS                         |    2 ++
 591  arch/xtensa/Kconfig                 |    2 ++
 592  arch/xtensa/include/asm/io.h        |   10 ++++++++++
 593  arch/xtensa/kernel/Makefile         |    1 +
 594  arch/xtensa/kernel/irq.c            |    4 ++--
 595  arch/xtensa/kernel/pci.c            |    9 ++++++++-
 596  arch/xtensa/kernel/platform.c       |    4 ++--
 597  arch/xtensa/platforms/iss/Makefile  |    4 ++--
 598  arch/xtensa/platforms/iss/console.c |   18 +++++++++++++-----
 599  arch/xtensa/platforms/iss/setup.c   |   14 ++++++++++----
 600  10 files changed, 52 insertions(+), 16 deletions(-)
 601 Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper())
 602 $ git merge ceph/master
 603 Already up-to-date.
 604 Merging cifs/for-next (30e5913 Remove sparse warning in cifsfs.c)
 605 $ git merge cifs/for-next
 606 Merge made by the 'recursive' strategy.
 607  fs/cifs/Kconfig         |    1 +
 608  fs/cifs/Makefile        |    2 +-
 609  fs/cifs/cifsacl.c       |    2 +-
 610  fs/cifs/cifsencrypt.c   |   30 +-
 611  fs/cifs/cifsfs.c        |   33 +-
 612  fs/cifs/cifsglob.h      |  221 ++++++++++-
 613  fs/cifs/cifsproto.h     |   85 ++---
 614  fs/cifs/cifssmb.c       |  151 ++++----
 615  fs/cifs/connect.c       |  148 +-------
 616  fs/cifs/dir.c           |  105 +++---
 617  fs/cifs/file.c          |  444 ++++++++++++----------
 618  fs/cifs/inode.c         |  347 ++++++++---------
 619  fs/cifs/ioctl.c         |   13 +-
 620  fs/cifs/link.c          |   76 ++--
 621  fs/cifs/misc.c          |    2 +-
 622  fs/cifs/netmisc.c       |    3 +-
 623  fs/cifs/readdir.c       |  165 ++++----
 624  fs/cifs/smb1ops.c       |  324 +++++++++++++++-
 625  fs/cifs/smb2file.c      |  106 ++++++
 626  fs/cifs/smb2glob.h      |   14 +
 627  fs/cifs/smb2inode.c     |   98 ++++-
 628  fs/cifs/smb2maperror.c  |    3 +-
 629  fs/cifs/smb2misc.c      |  102 ++++-
 630  fs/cifs/smb2ops.c       |  282 +++++++++++++-
 631  fs/cifs/smb2pdu.c       |  956 ++++++++++++++++++++++++++++++++++++++++++++++-
 632  fs/cifs/smb2pdu.h       |  185 ++++++++-
 633  fs/cifs/smb2proto.h     |   63 +++-
 634  fs/cifs/smb2transport.c |  157 +++++++-
 635  fs/cifs/transport.c     |   33 +-
 636  29 files changed, 3236 insertions(+), 915 deletions(-)
 637  create mode 100644 fs/cifs/smb2file.c
 638 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
 639 $ git merge configfs/linux-next
 640 Already up-to-date.
 641 Merging ecryptfs/next (0d7614f Linux 3.6-rc1)
 642 $ git merge ecryptfs/next
 643 Already up-to-date.
 644 Merging ext3/for_next (68766a2 udf: fix retun value on error path in udf_load_logicalvol)
 645 $ git merge ext3/for_next
 646 Merge made by the 'recursive' strategy.
 647  fs/jbd/journal.c     |    5 +++++
 648  fs/quota/dquot.c     |    2 +-
 649  fs/reiserfs/bitmap.c |    2 --
 650  fs/reiserfs/inode.c  |    2 +-
 651  fs/udf/inode.c       |    5 ++++-
 652  fs/udf/super.c       |    7 ++++++-
 653  6 files changed, 17 insertions(+), 6 deletions(-)
 654 Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail to claim space)
 655 $ git merge ext4/dev
 656 Already up-to-date.
 657 Merging fuse/for-next (fb6ccff fuse: verify all ioctl retry iov elements)
 658 $ git merge fuse/for-next
 659 Already up-to-date.
 660 Merging gfs2/master (257cd64 GFS2: Use rbm for gfs2_setbit())
 661 $ git merge gfs2/master
 662 Merge made by the 'recursive' strategy.
 663  fs/gfs2/aops.c       |   11 +-
 664  fs/gfs2/bmap.c       |    2 +-
 665  fs/gfs2/file.c       |   35 ++-
 666  fs/gfs2/glock.c      |   60 ++--
 667  fs/gfs2/incore.h     |   25 +-
 668  fs/gfs2/inode.c      |   17 +-
 669  fs/gfs2/quota.c      |    9 +-
 670  fs/gfs2/rgrp.c       |  834 ++++++++++++++++++++++++--------------------------
 671  fs/gfs2/rgrp.h       |   22 +-
 672  fs/gfs2/super.c      |    2 +-
 673  fs/gfs2/trace_gfs2.h |   10 +-
 674  fs/gfs2/trans.h      |    7 +-
 675  fs/gfs2/xattr.c      |   96 ++----
 676  13 files changed, 527 insertions(+), 603 deletions(-)
 677 Merging logfs/master (9f0bbd8 logfs: query block device for number of pages to send with bio)
 678 $ git merge logfs/master
 679 Auto-merging fs/logfs/readwrite.c
 680 Merge made by the 'recursive' strategy.
 681  fs/logfs/dev_bdev.c  |   15 +++++++--------
 682  fs/logfs/inode.c     |   18 +++++++++++++++++-
 683  fs/logfs/journal.c   |    2 +-
 684  fs/logfs/readwrite.c |    1 -
 685  fs/logfs/segment.c   |    2 +-
 686  5 files changed, 26 insertions(+), 12 deletions(-)
 687 Merging nfs/linux-next (d0f6eca7 NFS: return -ENOKEY when the upcall fails to map the name)
 688 $ git merge nfs/linux-next
 689 Merge made by the 'recursive' strategy.
 690  fs/nfs/Makefile              |   18 +++++-----
 691  fs/nfs/client.c              |    2 +-
 692  fs/nfs/idmap.c               |   62 ++++++++++++++++++++++++----------
 693  fs/nfs/nfs4_fs.h             |    3 ++
 694  fs/nfs/nfs4proc.c            |   76 +++++++++++++++++++++++++++++++++++-------
 695  fs/nfs/nfs4super.c           |   15 ---------
 696  fs/nfs/nfs4xdr.c             |   26 ++++++---------
 697  fs/nfs/objlayout/objio_osd.c |   55 ++++++++++++++++++++++++++++--
 698  fs/nfs/pagelist.c            |    2 ++
 699  fs/nfs/pnfs.c                |   39 +---------------------
 700  fs/nfs/pnfs.h                |    2 +-
 701  fs/nfs/super.c               |   39 +++++++++++++++++++++-
 702  fs/nfs/write.c               |   15 +++++++--
 703  include/linux/nfs_page.h     |    1 +
 704  include/linux/nfs_xdr.h      |    1 +
 705  15 files changed, 239 insertions(+), 117 deletions(-)
 706 Merging nfsd/nfsd-next (2c142ba NFSd: make boot_time variable per network namespace)
 707 $ git merge nfsd/nfsd-next
 708 Already up-to-date.
 709 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
 710 $ git merge ocfs2/linux-next
 711 Merge made by the 'recursive' strategy.
 712  fs/ocfs2/cluster/heartbeat.c |   40 +++++++++-------------------------------
 713  fs/ocfs2/cluster/masklog.h   |    3 ++-
 714  fs/ocfs2/dlm/dlmmaster.c     |   10 ++++++++--
 715  fs/ocfs2/dlm/dlmrecovery.c   |    7 +++++++
 716  fs/ocfs2/symlink.c           |    2 +-
 717  5 files changed, 27 insertions(+), 35 deletions(-)
 718 Merging omfs/for-next (976d167 Linux 3.1-rc9)
 719 $ git merge omfs/for-next
 720 Already up-to-date.
 721 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
 722 $ git merge squashfs/master
 723 Already up-to-date.
 724 Merging v9fs/for-next (5fcb08b 9p: BUG before corrupting memory)
 725 $ git merge v9fs/for-next
 726 Already up-to-date.
 727 Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list iterator variable)
 728 $ git merge ubifs/linux-next
 729 Already up-to-date.
 730 Merging xfs/for-next (643bfc0 xfs: check for possible overflow in xfs_ioc_trim)
 731 $ git merge xfs/for-next
 732 Merge made by the 'recursive' strategy.
 733  fs/xfs/xfs_discard.c |    6 ++++--
 734  fs/xfs/xfs_ialloc.c  |   17 +++++++++--------
 735  fs/xfs/xfs_mount.h   |    5 -----
 736  fs/xfs/xfs_rtalloc.c |    2 +-
 737  fs/xfs/xfs_trace.h   |    1 +
 738  5 files changed, 15 insertions(+), 16 deletions(-)
 739 Merging vfs/for-next (dbc6e02 delousing target_core_file a bit)
 740 $ git merge vfs/for-next
 741 Already up-to-date.
 742 Merging pci/next (960a81c Merge branch 'pci/lance-aer-notice' into next)
 743 $ git merge pci/next
 744 Merge made by the 'recursive' strategy.
 745  drivers/pci/pcie/aer/aerdrv_core.c |    6 ++----
 746  drivers/pci/setup-irq.c            |    4 ++--
 747  2 files changed, 4 insertions(+), 6 deletions(-)
 748 Merging hid/for-next (86476aa Merge branch 'picolcd' into for-next)
 749 $ git merge hid/for-next
 750 Removing drivers/hid/hid-picolcd.c
 751 Auto-merging drivers/hid/hid-ids.h
 752 Auto-merging drivers/hid/hid-core.c
 753 Auto-merging MAINTAINERS
 754 Merge made by the 'recursive' strategy.
 755  Documentation/ABI/testing/sysfs-driver-wacom |   13 +
 756  MAINTAINERS                                  |    6 +
 757  drivers/hid/Kconfig                          |    8 +
 758  drivers/hid/Makefile                         |   20 +
 759  drivers/hid/hid-core.c                       |    2 +-
 760  drivers/hid/hid-ids.h                        |    7 +
 761  drivers/hid/hid-multitouch.c                 |   49 +-
 762  drivers/hid/hid-picolcd.c                    | 2748 --------------------------
 763  drivers/hid/hid-picolcd.h                    |  300 +++
 764  drivers/hid/hid-picolcd_backlight.c          |  122 ++
 765  drivers/hid/hid-picolcd_cir.c                |   61 +
 766  drivers/hid/hid-picolcd_core.c               |  712 +++++++
 767  drivers/hid/hid-picolcd_debugfs.c            |  898 +++++++++
 768  drivers/hid/hid-picolcd_fb.c                 |  605 ++++++
 769  drivers/hid/hid-picolcd_lcd.c                |  107 +
 770  drivers/hid/hid-picolcd_leds.c               |  175 ++
 771  drivers/hid/hid-wacom.c                      |  146 +-
 772  drivers/hid/hidraw.c                         |   15 +-
 773  drivers/hid/usbhid/hid-quirks.c              |    1 +
 774  19 files changed, 3235 insertions(+), 2760 deletions(-)
 775  delete mode 100644 drivers/hid/hid-picolcd.c
 776  create mode 100644 drivers/hid/hid-picolcd.h
 777  create mode 100644 drivers/hid/hid-picolcd_backlight.c
 778  create mode 100644 drivers/hid/hid-picolcd_cir.c
 779  create mode 100644 drivers/hid/hid-picolcd_core.c
 780  create mode 100644 drivers/hid/hid-picolcd_debugfs.c
 781  create mode 100644 drivers/hid/hid-picolcd_fb.c
 782  create mode 100644 drivers/hid/hid-picolcd_lcd.c
 783  create mode 100644 drivers/hid/hid-picolcd_leds.c
 784 Merging quilt/i2c (a918790 i2c: Convert struct i2c_msg initialization to C99 format)
 785 $ git merge quilt/i2c
 786 Merge made by the 'recursive' strategy.
 787  drivers/i2c/busses/Kconfig          |    1 +
 788  drivers/i2c/busses/i2c-i801.c       |  214 ++++++++++++++++++++++++++++++++++-
 789  drivers/i2c/i2c-core.c              |   16 ++-
 790  drivers/i2c/i2c-mux.c               |   22 ++++
 791  drivers/i2c/i2c-smbus.c             |   11 +-
 792  drivers/i2c/muxes/i2c-mux-gpio.c    |    4 +-
 793  drivers/i2c/muxes/i2c-mux-pca9541.c |    2 +-
 794  drivers/i2c/muxes/i2c-mux-pca954x.c |   10 +-
 795  drivers/i2c/muxes/i2c-mux-pinctrl.c |    2 +-
 796  include/linux/i2c-mux-gpio.h        |    2 +
 797  include/linux/i2c-mux.h             |    1 +
 798  include/linux/i2c/pca954x.h         |    1 +
 799  12 files changed, 268 insertions(+), 18 deletions(-)
 800 Merging i2c-embedded/i2c-embedded/for-next (5db20c4 Revert "i2c: tegra: convert normal suspend/resume to *_noirq")
 801 $ git merge i2c-embedded/i2c-embedded/for-next
 802 Already up-to-date.
 803 Merging quilt/jdelvare-hwmon (4ac1223 hwmon: (coretemp) Use get_online_cpus to avoid races involving CPU hotplug)
 804 $ git merge quilt/jdelvare-hwmon
 805 Merge made by the 'recursive' strategy.
 806  drivers/hwmon/coretemp.c    |    5 +++++
 807  drivers/hwmon/via-cputemp.c |    5 +++++
 808  2 files changed, 10 insertions(+)
 809 Merging hwmon-staging/hwmon-next (c7078d3 hwmon: (adt7410) handle errors from adt7410_update_device())
 810 $ git merge hwmon-staging/hwmon-next
 811 Auto-merging drivers/hwmon/via-cputemp.c
 812 Merge made by the 'recursive' strategy.
 813  Documentation/hwmon/adt7410    |   51 +++++
 814  drivers/hwmon/Kconfig          |   10 +
 815  drivers/hwmon/Makefile         |    1 +
 816  drivers/hwmon/abituguru.c      |    7 +-
 817  drivers/hwmon/abituguru3.c     |    6 +-
 818  drivers/hwmon/ad7314.c         |   16 +-
 819  drivers/hwmon/ad7414.c         |   21 +-
 820  drivers/hwmon/ad7418.c         |   21 +-
 821  drivers/hwmon/adcxx.c          |    4 +-
 822  drivers/hwmon/adm1029.c        |   21 +-
 823  drivers/hwmon/ads1015.c        |   12 +-
 824  drivers/hwmon/ads7828.c        |   15 +-
 825  drivers/hwmon/ads7871.c        |   21 +-
 826  drivers/hwmon/adt7410.c        |  464 ++++++++++++++++++++++++++++++++++++++++
 827  drivers/hwmon/adt7411.c        |    9 +-
 828  drivers/hwmon/adt7462.c        |   15 +-
 829  drivers/hwmon/adt7470.c        |   15 +-
 830  drivers/hwmon/amc6821.c        |   16 +-
 831  drivers/hwmon/asb100.c         |   17 +-
 832  drivers/hwmon/dme1737.c        |   45 ++--
 833  drivers/hwmon/ds620.c          |   16 +-
 834  drivers/hwmon/emc1403.c        |   18 +-
 835  drivers/hwmon/emc2103.c        |   10 +-
 836  drivers/hwmon/f71882fg.c       |   48 ++---
 837  drivers/hwmon/f75375s.c        |    8 +-
 838  drivers/hwmon/fam15h_power.c   |   25 +--
 839  drivers/hwmon/g760a.c          |   10 +-
 840  drivers/hwmon/jz4740-hwmon.c   |   49 ++---
 841  drivers/hwmon/lm70.c           |    4 +-
 842  drivers/hwmon/lm95241.c        |   15 +-
 843  drivers/hwmon/lm95245.c        |   15 +-
 844  drivers/hwmon/ltc4151.c        |   15 +-
 845  drivers/hwmon/ltc4215.c        |   15 +-
 846  drivers/hwmon/ltc4245.c        |   14 +-
 847  drivers/hwmon/max1668.c        |    8 +-
 848  drivers/hwmon/mcp3021.c        |   15 +-
 849  drivers/hwmon/sch5627.c        |    5 +-
 850  drivers/hwmon/sch5636.c        |    6 +-
 851  drivers/hwmon/sch56xx-common.c |   28 +--
 852  drivers/hwmon/sht15.c          |   58 ++---
 853  drivers/hwmon/sht21.c          |   13 +-
 854  drivers/hwmon/via-cputemp.c    |   23 +-
 855  drivers/hwmon/vt8231.c         |   24 +--
 856  drivers/hwmon/w83l786ng.c      |   13 +-
 857  44 files changed, 764 insertions(+), 478 deletions(-)
 858  create mode 100644 Documentation/hwmon/adt7410
 859  create mode 100644 drivers/hwmon/adt7410.c
 860 Merging v4l-dvb/master (8a745a4 Merge /home/v4l/v4l/patchwork)
 861 $ git merge v4l-dvb/master
 862 Removing drivers/staging/media/lirc/lirc_ttusbir.c
 863 Removing drivers/staging/media/lirc/lirc_ene0100.h
 864 Removing drivers/staging/media/easycap/easycap_testcard.c
 865 Removing drivers/staging/media/easycap/easycap_sound.c
 866 Removing drivers/staging/media/easycap/easycap_settings.c
 867 Removing drivers/staging/media/easycap/easycap_main.c
 868 Removing drivers/staging/media/easycap/easycap_low.c
 869 Removing drivers/staging/media/easycap/easycap_ioctl.c
 870 Removing drivers/staging/media/easycap/easycap.h
 871 Removing drivers/staging/media/easycap/README
 872 Removing drivers/staging/media/easycap/Makefile
 873 Removing drivers/staging/media/easycap/Kconfig
 874 Removing drivers/media/video/tlg2300/Makefile
 875 Removing drivers/media/video/bt8xx/Makefile
 876 Removing drivers/media/video/bt8xx/Kconfig
 877 Removing drivers/media/video/Makefile
 878 Removing drivers/media/video/Kconfig
 879 Auto-merging drivers/media/v4l2-core/videobuf2-vmalloc.c
 880 Auto-merging drivers/media/v4l2-core/videobuf2-core.c
 881 Auto-merging drivers/media/v4l2-core/videobuf-dvb.c
 882 Auto-merging drivers/media/v4l2-core/v4l2-ioctl.c
 883 Auto-merging drivers/media/v4l2-core/v4l2-dev.c
 884 Auto-merging drivers/media/v4l2-core/v4l2-common.c
 885 Auto-merging drivers/media/usb/uvc/uvcvideo.h
 886 Auto-merging drivers/media/usb/uvc/uvc_video.c
 887 Auto-merging drivers/media/usb/uvc/uvc_queue.c
 888 Auto-merging drivers/media/usb/uvc/uvc_driver.c
 889 Auto-merging drivers/media/usb/usbvision/usbvision-video.c
 890 Auto-merging drivers/media/usb/usbvision/Makefile
 891 Auto-merging drivers/media/usb/ttusb-dec/Makefile
 892 Auto-merging drivers/media/usb/tm6000/tm6000-video.c
 893 Auto-merging drivers/media/usb/tm6000/tm6000-input.c
 894 Auto-merging drivers/media/usb/tm6000/tm6000-alsa.c
 895 Auto-merging drivers/media/usb/tm6000/Makefile
 896 Auto-merging drivers/media/usb/s2255/s2255drv.c
 897 Auto-merging drivers/media/usb/pvrusb2/pvrusb2-devattr.c
 898 Auto-merging drivers/media/usb/pvrusb2/Makefile
 899 Auto-merging drivers/media/usb/hdpvr/Makefile
 900 Auto-merging drivers/media/usb/gspca/vc032x.c
 901 Auto-merging drivers/media/usb/gspca/stv06xx/Makefile
 902 Auto-merging drivers/media/usb/gspca/sq930x.c
 903 Auto-merging drivers/media/usb/gspca/sq905c.c
 904 Auto-merging drivers/media/usb/gspca/m5602/Makefile
 905 Auto-merging drivers/media/usb/gspca/gl860/Makefile
 906 Auto-merging drivers/media/usb/gspca/Kconfig
 907 Auto-merging drivers/media/usb/em28xx/em28xx-video.c
 908 Auto-merging drivers/media/usb/em28xx/em28xx-core.c
 909 Auto-merging drivers/media/usb/em28xx/em28xx-audio.c
 910 Auto-merging drivers/media/usb/em28xx/Makefile
 911 Auto-merging drivers/media/usb/dvb-usb/pctv452e.c
 912 Auto-merging drivers/media/usb/dvb-usb/dvb-usb.h
 913 Auto-merging drivers/media/usb/dvb-usb/dvb-usb-dvb.c
 914 Auto-merging drivers/media/usb/dvb-usb/dib0700_core.c
 915 Auto-merging drivers/media/usb/dvb-usb/Makefile
 916 Auto-merging drivers/media/usb/dvb-usb/Kconfig
 917 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.h
 918 Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
 919 Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf.h
 920 Auto-merging drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c
 921 Auto-merging drivers/media/usb/dvb-usb-v2/lmedm04.c
 922 Auto-merging drivers/media/usb/dvb-usb-v2/gl861.h
 923 Auto-merging drivers/media/usb/dvb-usb-v2/gl861.c
 924 Auto-merging drivers/media/usb/dvb-usb-v2/ec168.h
 925 Auto-merging drivers/media/usb/dvb-usb-v2/ec168.c
 926 Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.h
 927 Auto-merging drivers/media/usb/dvb-usb-v2/ce6230.c
 928 Auto-merging drivers/media/usb/dvb-usb-v2/az6007.c
 929 Auto-merging drivers/media/usb/dvb-usb-v2/au6610.h
 930 Auto-merging drivers/media/usb/dvb-usb-v2/au6610.c
 931 Auto-merging drivers/media/usb/dvb-usb-v2/anysee.h
 932 Auto-merging drivers/media/usb/dvb-usb-v2/anysee.c
 933 Auto-merging drivers/media/usb/dvb-usb-v2/af9035.h
 934 Auto-merging drivers/media/usb/dvb-usb-v2/af9035.c
 935 Auto-merging drivers/media/usb/dvb-usb-v2/af9015.h
 936 Auto-merging drivers/media/usb/cx231xx/cx231xx-video.c
 937 Auto-merging drivers/media/usb/cx231xx/cx231xx-417.c
 938 Auto-merging drivers/media/usb/cx231xx/Makefile
 939 Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c
 940 Auto-merging drivers/media/usb/cpia2/cpia2_core.c
 941 Auto-merging drivers/media/usb/b2c2/flexcop-usb.c
 942 Auto-merging drivers/media/usb/au0828/au0828.h
 943 Auto-merging drivers/media/usb/au0828/au0828-video.c
 944 Auto-merging drivers/media/usb/au0828/au0828-reg.h
 945 Auto-merging drivers/media/usb/au0828/au0828-i2c.c
 946 Auto-merging drivers/media/usb/au0828/au0828-dvb.c
 947 Auto-merging drivers/media/usb/au0828/au0828-core.c
 948 Auto-merging drivers/media/usb/au0828/au0828-cards.c
 949 Auto-merging drivers/media/usb/au0828/Makefile
 950 Auto-merging drivers/media/tuners/xc5000.c
 951 Auto-merging drivers/media/tuners/xc4000.c
 952 Auto-merging drivers/media/tuners/tuner-xc2028.c
 953 Auto-merging drivers/media/tuners/tda18218.c
 954 Auto-merging drivers/media/tuners/tda18212.c
 955 Auto-merging drivers/media/tuners/qt1010.c
 956 Auto-merging drivers/media/tuners/Makefile
 957 Auto-merging drivers/media/platform/vivi.c
 958 Auto-merging drivers/media/platform/soc_mediabus.c
 959 Auto-merging drivers/media/platform/soc_camera_platform.c
 960 Auto-merging drivers/media/platform/soc_camera.c
 961 Auto-merging drivers/media/platform/sh_vou.c
 962 Auto-merging drivers/media/platform/s5p-tv/sii9234_drv.c
 963 Auto-merging drivers/media/platform/s5p-tv/sdo_drv.c
 964 Auto-merging drivers/media/platform/s5p-tv/regs-sdo.h
 965 Auto-merging drivers/media/platform/s5p-tv/mixer_video.c
 966 Auto-merging drivers/media/platform/s5p-tv/mixer_drv.c
 967 Auto-merging drivers/media/platform/s5p-tv/hdmi_drv.c
 968 Auto-merging drivers/media/platform/s5p-tv/Makefile
 969 Auto-merging drivers/media/platform/s5p-tv/Kconfig
 970 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.h
 971 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
 972 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.h
 973 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
 974 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
 975 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr.c
 976 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.h
 977 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_intr.c
 978 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.h
 979 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
 980 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.h
 981 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
 982 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
 983 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h
 984 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
 985 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h
 986 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c
 987 Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c
 988 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-regs.h
 989 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-hw.h
 990 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.h
 991 Auto-merging drivers/media/platform/s5p-jpeg/jpeg-core.c
 992 Auto-merging drivers/media/platform/s5p-g2d/g2d.c
 993 Auto-merging drivers/media/platform/omap3isp/ispvideo.h
 994 Auto-merging drivers/media/platform/omap3isp/ispvideo.c
 995 Auto-merging drivers/media/platform/omap3isp/ispresizer.c
 996 Auto-merging drivers/media/platform/omap3isp/ispqueue.c
 997 Auto-merging drivers/media/platform/omap3isp/isppreview.h
 998 Auto-merging drivers/media/platform/omap3isp/isppreview.c
 999 Auto-merging drivers/media/platform/omap3isp/isphist.c
1000 Auto-merging drivers/media/platform/omap3isp/isph3a_af.c
1001 Auto-merging drivers/media/platform/omap3isp/isph3a_aewb.c
1002 Auto-merging drivers/media/platform/omap3isp/ispcsi2.c
1003 Auto-merging drivers/media/platform/omap3isp/ispccdc.h
1004 Auto-merging drivers/media/platform/omap3isp/ispccdc.c
1005 Auto-merging drivers/media/platform/omap3isp/isp.h
1006 Auto-merging drivers/media/platform/omap3isp/isp.c
1007 Auto-merging drivers/media/platform/omap3isp/cfa_coef_table.h
1008 Auto-merging drivers/media/platform/omap24xxcam.h
1009 Auto-merging drivers/media/platform/omap24xxcam.c
1010 Auto-merging drivers/media/platform/omap24xxcam-dma.c
1011 Auto-merging drivers/media/platform/omap1_camera.c
1012 Auto-merging drivers/media/platform/mx3_camera.c
1013 Auto-merging drivers/media/platform/mx2_emmaprp.c
1014 Auto-merging drivers/media/platform/mx2_camera.c
1015 Auto-merging drivers/media/platform/mx1_camera.c
1016 Auto-merging drivers/media/platform/mem2mem_testdev.c
1017 Auto-merging drivers/media/platform/fsl-viu.c
1018 Auto-merging drivers/media/platform/davinci/vpss.c
1019 Auto-merging drivers/media/platform/davinci/vpif_display.c
1020 Auto-merging drivers/media/platform/davinci/vpif_capture.c
1021 Auto-merging drivers/media/platform/davinci/vpif.c
1022 Auto-merging drivers/media/platform/davinci/vpfe_capture.c
1023 Auto-merging drivers/media/platform/davinci/vpbe_display.c
1024 Auto-merging drivers/media/platform/davinci/isif.c
1025 Auto-merging drivers/media/platform/davinci/dm644x_ccdc.c
1026 Auto-merging drivers/media/platform/davinci/dm355_ccdc.c
1027 Auto-merging drivers/media/platform/blackfin/bfin_capture.c
1028 Auto-merging drivers/media/pci/ttpci/budget.c
1029 Auto-merging drivers/media/pci/ttpci/Makefile
1030 Auto-merging drivers/media/pci/saa7164/saa7164.h
1031 Auto-merging drivers/media/pci/saa7164/saa7164-core.c
1032 Auto-merging drivers/media/pci/saa7164/saa7164-api.c
1033 Auto-merging drivers/media/pci/saa7164/Makefile
1034 Auto-merging drivers/media/pci/saa7134/saa7134.h
1035 Auto-merging drivers/media/pci/saa7134/saa7134-input.c
1036 Auto-merging drivers/media/pci/saa7134/saa7134-dvb.c
1037 Auto-merging drivers/media/pci/saa7134/Makefile
1038 Auto-merging drivers/media/pci/pt1/Makefile
1039 Auto-merging drivers/media/pci/ngene/ngene-core.c
1040 Auto-merging drivers/media/pci/ngene/ngene-cards.c
1041 Auto-merging drivers/media/pci/ngene/Makefile
1042 Auto-merging drivers/media/pci/mantis/mantis_dvb.c
1043 Auto-merging drivers/media/pci/mantis/mantis_core.c
1044 Auto-merging drivers/media/pci/mantis/mantis_cards.c
1045 Auto-merging drivers/media/pci/mantis/Makefile
1046 Auto-merging drivers/media/pci/ivtv/ivtv-streams.c
1047 Auto-merging drivers/media/pci/ivtv/ivtv-firmware.c
1048 Auto-merging drivers/media/pci/ivtv/ivtv-fileops.c
1049 Auto-merging drivers/media/pci/ivtv/Makefile
1050 Auto-merging drivers/media/pci/ddbridge/Makefile
1051 Auto-merging drivers/media/pci/cx88/cx88.h
1052 Auto-merging drivers/media/pci/cx88/cx88-dvb.c
1053 Auto-merging drivers/media/pci/cx88/cx88-core.c
1054 Auto-merging drivers/media/pci/cx88/cx88-alsa.c
1055 Auto-merging drivers/media/pci/cx88/Makefile
1056 Auto-merging drivers/media/pci/cx25821/Makefile
1057 Auto-merging drivers/media/pci/cx23885/cx23885-input.c
1058 Auto-merging drivers/media/pci/cx23885/cx23885-dvb.c
1059 Auto-merging drivers/media/pci/cx23885/cx23885-cards.c
1060 Auto-merging drivers/media/pci/cx23885/cx23885-417.c
1061 Auto-merging drivers/media/pci/cx23885/Makefile
1062 Auto-merging drivers/media/pci/cx18/cx18-firmware.c
1063 Auto-merging drivers/media/pci/cx18/cx18-dvb.c
1064 Auto-merging drivers/media/pci/cx18/cx18-driver.c
1065 Auto-merging drivers/media/pci/cx18/cx18-av-firmware.c
1066 Auto-merging drivers/media/pci/cx18/Makefile
1067 Auto-merging drivers/media/pci/bt8xx/dst_ca.c
1068 Auto-merging drivers/media/pci/bt8xx/Kconfig
1069 Auto-merging drivers/media/i2c/tvp514x_regs.h
1070 Auto-merging drivers/media/i2c/tvp514x.c
1071 Auto-merging drivers/media/i2c/tcm825x.h
1072 Auto-merging drivers/media/i2c/tcm825x.c
1073 Auto-merging drivers/media/i2c/soc_camera/tw9910.c
1074 Auto-merging drivers/media/i2c/soc_camera/rj54n1cb0c.c
1075 Auto-merging drivers/media/i2c/soc_camera/ov9740.c
1076 Auto-merging drivers/media/i2c/soc_camera/ov9640.c
1077 Auto-merging drivers/media/i2c/soc_camera/ov772x.c
1078 Auto-merging drivers/media/i2c/soc_camera/ov6650.c
1079 Auto-merging drivers/media/i2c/soc_camera/ov5642.c
1080 Auto-merging drivers/media/i2c/soc_camera/ov2640.c
1081 Auto-merging drivers/media/i2c/soc_camera/mt9v022.c
1082 Auto-merging drivers/media/i2c/soc_camera/mt9t112.c
1083 Auto-merging drivers/media/i2c/soc_camera/mt9t031.c
1084 Auto-merging drivers/media/i2c/soc_camera/mt9m111.c
1085 Auto-merging drivers/media/i2c/soc_camera/mt9m001.c
1086 Auto-merging drivers/media/i2c/soc_camera/imx074.c
1087 Auto-merging drivers/media/i2c/smiapp/smiapp.h
1088 Auto-merging drivers/media/i2c/smiapp/smiapp-regs.c
1089 Auto-merging drivers/media/i2c/smiapp/smiapp-reg.h
1090 Auto-merging drivers/media/i2c/smiapp/smiapp-reg-defs.h
1091 Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.h
1092 Auto-merging drivers/media/i2c/smiapp/smiapp-quirk.c
1093 Auto-merging drivers/media/i2c/smiapp/smiapp-limits.h
1094 Auto-merging drivers/media/i2c/smiapp/smiapp-limits.c
1095 Auto-merging drivers/media/i2c/smiapp/smiapp-core.c
1096 Auto-merging drivers/media/i2c/smiapp/Makefile
1097 Auto-merging drivers/media/i2c/smiapp-pll.h
1098 Auto-merging drivers/media/i2c/smiapp-pll.c
1099 Auto-merging drivers/media/i2c/saa7127.c
1100 Auto-merging drivers/media/i2c/s5k6aa.c
1101 Auto-merging drivers/media/i2c/cx25840/cx25840-firmware.c
1102 Auto-merging drivers/media/i2c/cx25840/Makefile
1103 Auto-merging drivers/media/i2c/as3645a.c
1104 Auto-merging drivers/media/i2c/adp1653.c
1105 Auto-merging drivers/media/firewire/Makefile
1106 Removing drivers/media/dvb/ttusb-budget/Makefile
1107 Removing drivers/media/dvb/siano/Kconfig
1108 Removing drivers/media/dvb/pluto2/Makefile
1109 Removing drivers/media/dvb/dvb-usb/mxl111sf.c
1110 Removing drivers/media/dvb/dvb-usb/it913x.c
1111 Removing drivers/media/dvb/dvb-usb/af9015.c
1112 Removing drivers/media/dvb/dm1105/Makefile
1113 Removing drivers/media/dvb/bt8xx/Makefile
1114 Removing drivers/media/dvb/b2c2/Makefile
1115 Removing drivers/media/dvb/Makefile
1116 Removing drivers/media/dvb/Kconfig
1117 Auto-merging drivers/media/dvb-frontends/rtl2830.c
1118 Auto-merging drivers/media/dvb-frontends/nxt200x.c
1119 Auto-merging drivers/media/dvb-frontends/m88rs2000.c
1120 Auto-merging drivers/media/dvb-frontends/lgs8gxx.c
1121 Auto-merging drivers/media/dvb-frontends/lgs8gl5.c
1122 Auto-merging drivers/media/dvb-frontends/it913x-fe.c
1123 Auto-merging drivers/media/dvb-frontends/dvb-pll.h
1124 Auto-merging drivers/media/dvb-frontends/dvb-pll.c
1125 Auto-merging drivers/media/dvb-frontends/cxd2820r_t.c
1126 Auto-merging drivers/media/dvb-frontends/au8522_priv.h
1127 Auto-merging drivers/media/dvb-frontends/au8522_dig.c
1128 Auto-merging drivers/media/dvb-frontends/au8522_decoder.c
1129 Auto-merging drivers/media/dvb-frontends/au8522_common.c
1130 Auto-merging drivers/media/dvb-frontends/atbm8830.c
1131 Auto-merging drivers/media/dvb-frontends/Makefile
1132 Auto-merging drivers/media/dvb-core/dvbdev.h
1133 Auto-merging drivers/media/dvb-core/dvb_frontend.h
1134 Auto-merging drivers/media/dvb-core/dvb_frontend.c
1135 Auto-merging drivers/media/dvb-core/dvb_demux.c
1136 Auto-merging drivers/media/dvb-core/dmxdev.c
1137 Auto-merging drivers/media/common/siano/Makefile
1138 Auto-merging drivers/media/common/saa7146/saa7146_fops.c
1139 Auto-merging drivers/media/common/saa7146/saa7146_core.c
1140 Auto-merging drivers/media/common/b2c2/Kconfig
1141 Auto-merging MAINTAINERS
1142 Merge made by the 'recursive' strategy.
1143  Documentation/DocBook/media/Makefile               |    2 +-
1144  Documentation/DocBook/media/dvb/audio.xml          |  113 +-
1145  Documentation/DocBook/media/dvb/ca.xml             |  353 ++
1146  Documentation/DocBook/media/dvb/demux.xml          |  230 +-
1147  Documentation/DocBook/media/dvb/dvbapi.xml         |    2 +-
1148  Documentation/DocBook/media/dvb/dvbproperty.xml    |   65 +-
1149  Documentation/DocBook/media/dvb/frontend.xml       |   70 +-
1150  Documentation/DocBook/media/dvb/kdapi.xml          |    2 +-
1151  Documentation/DocBook/media/dvb/net.xml            |  127 +
1152  Documentation/DocBook/media/dvb/video.xml          |  333 +-
1153  Documentation/DocBook/media/v4l/biblio.xml         |   12 +-
1154  Documentation/DocBook/media/v4l/compat.xml         |   16 -
1155  Documentation/DocBook/media/v4l/controls.xml       |  453 ++-
1156  Documentation/DocBook/media/v4l/dev-rds.xml        |    2 +-
1157  Documentation/DocBook/media/v4l/dev-subdev.xml     |   20 +-
1158  .../DocBook/media/v4l/pixfmt-srggb10dpcm8.xml      |    3 +-
1159  Documentation/DocBook/media/v4l/selection-api.xml  |   22 +-
1160  Documentation/DocBook/media/v4l/v4l2.xml           |   14 +-
1161  .../DocBook/media/v4l/vidioc-g-selection.xml       |    9 +-
1162  Documentation/DocBook/media/v4l/vidioc-g-tuner.xml |    2 +-
1163  Documentation/DocBook/media/v4l/vidioc-qbuf.xml    |    2 +
1164  .../media/v4l/vidioc-subdev-g-selection.xml        |    8 +-
1165  Documentation/DocBook/media_api.tmpl               |    9 +-
1166  Documentation/dvb/README.dvb-usb                   |    2 +-
1167  Documentation/feature-removal-schedule.txt         |    9 +
1168  Documentation/ioctl/ioctl-number.txt               |    5 -
1169  MAINTAINERS                                        |   28 +-
1170  arch/arm/mach-imx/clk-imx27.c                      |    4 +-
1171  arch/arm/mach-imx/devices-imx27.h                  |    4 +
1172  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |   49 +-
1173  arch/arm/mach-omap2/board-rx51-peripherals.c       |   30 +
1174  arch/arm/plat-mxc/devices/Kconfig                  |    6 +-
1175  arch/arm/plat-mxc/devices/Makefile                 |    1 +
1176  arch/arm/plat-mxc/devices/platform-imx27-coda.c    |   37 +
1177  arch/arm/plat-mxc/include/mach/devices-common.h    |    8 +
1178  drivers/media/Kconfig                              |   32 +-
1179  drivers/media/Makefile                             |    7 +-
1180  drivers/media/common/Kconfig                       |   12 +-
1181  drivers/media/common/Makefile                      |    7 +-
1182  drivers/media/{dvb => common}/b2c2/Kconfig         |   20 +-
1183  drivers/media/common/b2c2/Makefile                 |    7 +
1184  .../media/{dvb => common}/b2c2/flexcop-common.h    |    0
1185  .../media/{dvb => common}/b2c2/flexcop-eeprom.c    |    0
1186  .../media/{dvb => common}/b2c2/flexcop-fe-tuner.c  |    0
1187  .../media/{dvb => common}/b2c2/flexcop-hw-filter.c |    0
1188  drivers/media/{dvb => common}/b2c2/flexcop-i2c.c   |    0
1189  drivers/media/{dvb => common}/b2c2/flexcop-misc.c  |    0
1190  drivers/media/{dvb => common}/b2c2/flexcop-reg.h   |    0
1191  drivers/media/{dvb => common}/b2c2/flexcop-sram.c  |    0
1192  drivers/media/{dvb => common}/b2c2/flexcop.c       |    0
1193  drivers/media/{dvb => common}/b2c2/flexcop.h       |    0
1194  .../{dvb => common}/b2c2/flexcop_ibi_value_be.h    |    0
1195  .../{dvb => common}/b2c2/flexcop_ibi_value_le.h    |    0
1196  drivers/media/common/saa7146/Kconfig               |    9 +
1197  drivers/media/common/saa7146/Makefile              |    5 +
1198  drivers/media/common/{ => saa7146}/saa7146_core.c  |    8 -
1199  drivers/media/common/{ => saa7146}/saa7146_fops.c  |   55 +-
1200  drivers/media/common/{ => saa7146}/saa7146_hlp.c   |    0
1201  drivers/media/common/{ => saa7146}/saa7146_i2c.c   |    0
1202  drivers/media/common/{ => saa7146}/saa7146_vbi.c   |    0
1203  drivers/media/common/{ => saa7146}/saa7146_video.c |    0
1204  drivers/media/common/siano/Kconfig                 |   17 +
1205  drivers/media/{dvb => common}/siano/Makefile       |    6 +-
1206  drivers/media/{dvb => common}/siano/sms-cards.c    |    0
1207  drivers/media/{dvb => common}/siano/sms-cards.h    |    0
1208  drivers/media/{dvb => common}/siano/smscoreapi.c   |    0
1209  drivers/media/{dvb => common}/siano/smscoreapi.h   |    0
1210  drivers/media/{dvb => common}/siano/smsdvb.c       |    0
1211  drivers/media/{dvb => common}/siano/smsendian.c    |    0
1212  drivers/media/{dvb => common}/siano/smsendian.h    |    0
1213  drivers/media/{dvb => common}/siano/smsir.c        |    0
1214  drivers/media/{dvb => common}/siano/smsir.h        |    0
1215  drivers/media/dvb-core/Kconfig                     |   29 +
1216  drivers/media/{dvb => }/dvb-core/Makefile          |    0
1217  drivers/media/{dvb => }/dvb-core/demux.h           |    0
1218  drivers/media/{dvb => }/dvb-core/dmxdev.c          |    4 +-
1219  drivers/media/{dvb => }/dvb-core/dmxdev.h          |    0
1220  .../media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h  |    0
1221  drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c  |    0
1222  drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h  |    0
1223  drivers/media/{dvb => }/dvb-core/dvb_demux.c       |   19 +-
1224  drivers/media/{dvb => }/dvb-core/dvb_demux.h       |    0
1225  drivers/media/{dvb => }/dvb-core/dvb_filter.c      |    0
1226  drivers/media/{dvb => }/dvb-core/dvb_filter.h      |    0
1227  drivers/media/{dvb => }/dvb-core/dvb_frontend.c    |   72 +-
1228  drivers/media/{dvb => }/dvb-core/dvb_frontend.h    |    4 +
1229  drivers/media/{dvb => }/dvb-core/dvb_math.c        |    0
1230  drivers/media/{dvb => }/dvb-core/dvb_math.h        |    0
1231  drivers/media/{dvb => }/dvb-core/dvb_net.c         |    0
1232  drivers/media/{dvb => }/dvb-core/dvb_net.h         |    0
1233  drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c  |    0
1234  drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h  |    0
1235  drivers/media/{dvb => }/dvb-core/dvbdev.c          |    0
1236  drivers/media/{dvb => }/dvb-core/dvbdev.h          |   26 -
1237  .../media/{dvb/frontends => dvb-frontends}/Kconfig |    0
1238  .../{dvb/frontends => dvb-frontends}/Makefile      |    4 +-
1239  .../media/{dvb/frontends => dvb-frontends}/a8293.c |    0
1240  .../media/{dvb/frontends => dvb-frontends}/a8293.h |    0
1241  .../{dvb/frontends => dvb-frontends}/af9013.c      |    0
1242  .../{dvb/frontends => dvb-frontends}/af9013.h      |    0
1243  .../{dvb/frontends => dvb-frontends}/af9013_priv.h |    0
1244  .../{dvb/frontends => dvb-frontends}/af9033.c      |    0
1245  .../{dvb/frontends => dvb-frontends}/af9033.h      |    0
1246  .../{dvb/frontends => dvb-frontends}/af9033_priv.h |    0
1247  .../{dvb/frontends => dvb-frontends}/atbm8830.c    |    2 +-
1248  .../{dvb/frontends => dvb-frontends}/atbm8830.h    |    0
1249  .../frontends => dvb-frontends}/atbm8830_priv.h    |    0
1250  .../{dvb/frontends => dvb-frontends}/au8522.h      |    0
1251  .../frontends => dvb-frontends}/au8522_common.c    |   22 +-
1252  .../frontends => dvb-frontends}/au8522_decoder.c   |   11 +-
1253  .../{dvb/frontends => dvb-frontends}/au8522_dig.c  |   98 +-
1254  .../{dvb/frontends => dvb-frontends}/au8522_priv.h |   29 +-
1255  .../{dvb/frontends => dvb-frontends}/bcm3510.c     |    0
1256  .../{dvb/frontends => dvb-frontends}/bcm3510.h     |    0
1257  .../frontends => dvb-frontends}/bcm3510_priv.h     |    0
1258  .../{dvb/frontends => dvb-frontends}/bsbe1-d01a.h  |    0
1259  .../media/{dvb/frontends => dvb-frontends}/bsbe1.h |    0
1260  .../media/{dvb/frontends => dvb-frontends}/bsru6.h |    0
1261  .../{dvb/frontends => dvb-frontends}/cx22700.c     |    0
1262  .../{dvb/frontends => dvb-frontends}/cx22700.h     |    0
1263  .../{dvb/frontends => dvb-frontends}/cx22702.c     |    0
1264  .../{dvb/frontends => dvb-frontends}/cx22702.h     |    0
1265  .../{dvb/frontends => dvb-frontends}/cx24110.c     |    0
1266  .../{dvb/frontends => dvb-frontends}/cx24110.h     |    0
1267  .../{dvb/frontends => dvb-frontends}/cx24113.c     |    0
1268  .../{dvb/frontends => dvb-frontends}/cx24113.h     |    0
1269  .../{dvb/frontends => dvb-frontends}/cx24116.c     |    0
1270  .../{dvb/frontends => dvb-frontends}/cx24116.h     |    0
1271  .../{dvb/frontends => dvb-frontends}/cx24123.c     |    0
1272  .../{dvb/frontends => dvb-frontends}/cx24123.h     |    0
1273  .../{dvb/frontends => dvb-frontends}/cxd2820r.h    |    0
1274  .../{dvb/frontends => dvb-frontends}/cxd2820r_c.c  |    0
1275  .../frontends => dvb-frontends}/cxd2820r_core.c    |    0
1276  .../frontends => dvb-frontends}/cxd2820r_priv.h    |    0
1277  .../{dvb/frontends => dvb-frontends}/cxd2820r_t.c  |    3 +-
1278  .../{dvb/frontends => dvb-frontends}/cxd2820r_t2.c |    0
1279  .../{dvb/frontends => dvb-frontends}/dib0070.c     |    0
1280  .../{dvb/frontends => dvb-frontends}/dib0070.h     |    0
1281  .../{dvb/frontends => dvb-frontends}/dib0090.c     |    0
1282  .../{dvb/frontends => dvb-frontends}/dib0090.h     |    0
1283  .../{dvb/frontends => dvb-frontends}/dib3000.h     |    0
1284  .../{dvb/frontends => dvb-frontends}/dib3000mb.c   |    0
1285  .../frontends => dvb-frontends}/dib3000mb_priv.h   |    0
1286  .../{dvb/frontends => dvb-frontends}/dib3000mc.c   |    0
1287  .../{dvb/frontends => dvb-frontends}/dib3000mc.h   |    0
1288  .../{dvb/frontends => dvb-frontends}/dib7000m.c    |    0
1289  .../{dvb/frontends => dvb-frontends}/dib7000m.h    |    0
1290  .../{dvb/frontends => dvb-frontends}/dib7000p.c    |    0
1291  .../{dvb/frontends => dvb-frontends}/dib7000p.h    |    0
1292  .../{dvb/frontends => dvb-frontends}/dib8000.c     |    0
1293  .../{dvb/frontends => dvb-frontends}/dib8000.h     |    0
1294  .../{dvb/frontends => dvb-frontends}/dib9000.c     |    0
1295  .../{dvb/frontends => dvb-frontends}/dib9000.h     |    0
1296  .../frontends => dvb-frontends}/dibx000_common.c   |    0
1297  .../frontends => dvb-frontends}/dibx000_common.h   |    0
1298  .../media/{dvb/frontends => dvb-frontends}/drxd.h  |    0
1299  .../{dvb/frontends => dvb-frontends}/drxd_firm.c   |    0
1300  .../{dvb/frontends => dvb-frontends}/drxd_firm.h   |    0
1301  .../{dvb/frontends => dvb-frontends}/drxd_hard.c   |    0
1302  .../frontends => dvb-frontends}/drxd_map_firm.h    |    0
1303  .../media/{dvb/frontends => dvb-frontends}/drxk.h  |    0
1304  .../{dvb/frontends => dvb-frontends}/drxk_hard.c   |    0
1305  .../{dvb/frontends => dvb-frontends}/drxk_hard.h   |    0
1306  .../{dvb/frontends => dvb-frontends}/drxk_map.h    |    0
1307  .../{dvb/frontends => dvb-frontends}/ds3000.c      |    0
1308  .../{dvb/frontends => dvb-frontends}/ds3000.h      |    0
1309  .../{dvb/frontends => dvb-frontends}/dvb-pll.c     |   26 +
1310  .../{dvb/frontends => dvb-frontends}/dvb-pll.h     |    1 +
1311  .../frontends => dvb-frontends}/dvb_dummy_fe.c     |    0
1312  .../frontends => dvb-frontends}/dvb_dummy_fe.h     |    0
1313  .../media/{dvb/frontends => dvb-frontends}/ec100.c |    0
1314  .../media/{dvb/frontends => dvb-frontends}/ec100.h |    0
1315  .../{dvb/frontends => dvb-frontends}/ec100_priv.h  |    0
1316  .../{dvb/frontends => dvb-frontends}/eds1547.h     |    0
1317  .../{dvb/frontends => dvb-frontends}/hd29l2.c      |    0
1318  .../{dvb/frontends => dvb-frontends}/hd29l2.h      |    0
1319  .../{dvb/frontends => dvb-frontends}/hd29l2_priv.h |    0
1320  .../{dvb/frontends => dvb-frontends}/isl6405.c     |    0
1321  .../{dvb/frontends => dvb-frontends}/isl6405.h     |    0
1322  .../{dvb/frontends => dvb-frontends}/isl6421.c     |    0
1323  .../{dvb/frontends => dvb-frontends}/isl6421.h     |    0
1324  .../{dvb/frontends => dvb-frontends}/isl6423.c     |    0
1325  .../{dvb/frontends => dvb-frontends}/isl6423.h     |    0
1326  .../frontends => dvb-frontends}/it913x-fe-priv.h   |    0
1327  .../{dvb/frontends => dvb-frontends}/it913x-fe.c   |    2 +-
1328  .../{dvb/frontends => dvb-frontends}/it913x-fe.h   |    0
1329  .../{dvb/frontends => dvb-frontends}/itd1000.c     |    0
1330  .../{dvb/frontends => dvb-frontends}/itd1000.h     |    0
1331  .../frontends => dvb-frontends}/itd1000_priv.h     |    0
1332  .../{dvb/frontends => dvb-frontends}/ix2505v.c     |    0
1333  .../{dvb/frontends => dvb-frontends}/ix2505v.h     |    0
1334  .../{dvb/frontends => dvb-frontends}/l64781.c      |    0
1335  .../{dvb/frontends => dvb-frontends}/l64781.h      |    0
1336  .../{dvb/frontends => dvb-frontends}/lg2160.c      |    0
1337  .../{dvb/frontends => dvb-frontends}/lg2160.h      |    0
1338  .../{dvb/frontends => dvb-frontends}/lgdt3305.c    |    0
1339  .../{dvb/frontends => dvb-frontends}/lgdt3305.h    |    0
1340  .../{dvb/frontends => dvb-frontends}/lgdt330x.c    |    0
1341  .../{dvb/frontends => dvb-frontends}/lgdt330x.h    |    0
1342  .../frontends => dvb-frontends}/lgdt330x_priv.h    |    0
1343  .../{dvb/frontends => dvb-frontends}/lgs8gl5.c     |    2 +-
1344  .../{dvb/frontends => dvb-frontends}/lgs8gl5.h     |    0
1345  .../{dvb/frontends => dvb-frontends}/lgs8gxx.c     |    2 +-
1346  .../{dvb/frontends => dvb-frontends}/lgs8gxx.h     |    0
1347  .../frontends => dvb-frontends}/lgs8gxx_priv.h     |    0
1348  .../{dvb/frontends => dvb-frontends}/lnbh24.h      |    0
1349  .../{dvb/frontends => dvb-frontends}/lnbp21.c      |    0
1350  .../{dvb/frontends => dvb-frontends}/lnbp21.h      |    0
1351  .../{dvb/frontends => dvb-frontends}/lnbp22.c      |    0
1352  .../{dvb/frontends => dvb-frontends}/lnbp22.h      |    0
1353  .../{dvb/frontends => dvb-frontends}/m88rs2000.c   |    2 +-
1354  .../{dvb/frontends => dvb-frontends}/m88rs2000.h   |    0
1355  .../{dvb/frontends => dvb-frontends}/mb86a16.c     |    0
1356  .../{dvb/frontends => dvb-frontends}/mb86a16.h     |    0
1357  .../frontends => dvb-frontends}/mb86a16_priv.h     |    0
1358  .../{dvb/frontends => dvb-frontends}/mb86a20s.c    |    0
1359  .../{dvb/frontends => dvb-frontends}/mb86a20s.h    |    0
1360  .../media/{dvb/frontends => dvb-frontends}/mt312.c |    0
1361  .../media/{dvb/frontends => dvb-frontends}/mt312.h |    0
1362  .../{dvb/frontends => dvb-frontends}/mt312_priv.h  |    0
1363  .../media/{dvb/frontends => dvb-frontends}/mt352.c |    0
1364  .../media/{dvb/frontends => dvb-frontends}/mt352.h |    0
1365  .../{dvb/frontends => dvb-frontends}/mt352_priv.h  |    0
1366  .../{dvb/frontends => dvb-frontends}/nxt200x.c     |   64 +-
1367  .../{dvb/frontends => dvb-frontends}/nxt200x.h     |    0
1368  .../{dvb/frontends => dvb-frontends}/nxt6000.c     |    0
1369  .../{dvb/frontends => dvb-frontends}/nxt6000.h     |    0
1370  .../frontends => dvb-frontends}/nxt6000_priv.h     |    0
1371  .../{dvb/frontends => dvb-frontends}/or51132.c     |    0
1372  .../{dvb/frontends => dvb-frontends}/or51132.h     |    0
1373  .../{dvb/frontends => dvb-frontends}/or51211.c     |    0
1374  .../{dvb/frontends => dvb-frontends}/or51211.h     |    0
1375  .../{dvb/frontends => dvb-frontends}/rtl2830.c     |    2 +-
1376  .../{dvb/frontends => dvb-frontends}/rtl2830.h     |    0
1377  .../frontends => dvb-frontends}/rtl2830_priv.h     |    0
1378  .../{dvb/frontends => dvb-frontends}/rtl2832.c     |    0
1379  .../{dvb/frontends => dvb-frontends}/rtl2832.h     |    0
1380  .../frontends => dvb-frontends}/rtl2832_priv.h     |    0
1381  .../{dvb/frontends => dvb-frontends}/s5h1409.c     |    0
1382  .../{dvb/frontends => dvb-frontends}/s5h1409.h     |    0
1383  .../{dvb/frontends => dvb-frontends}/s5h1411.c     |    0
1384  .../{dvb/frontends => dvb-frontends}/s5h1411.h     |    0
1385  .../{dvb/frontends => dvb-frontends}/s5h1420.c     |    0
1386  .../{dvb/frontends => dvb-frontends}/s5h1420.h     |    0
1387  .../frontends => dvb-frontends}/s5h1420_priv.h     |    0
1388  .../{dvb/frontends => dvb-frontends}/s5h1432.c     |    0
1389  .../{dvb/frontends => dvb-frontends}/s5h1432.h     |    0
1390  .../media/{dvb/frontends => dvb-frontends}/s921.c  |    0
1391  .../media/{dvb/frontends => dvb-frontends}/s921.h  |    0
1392  .../{dvb/frontends => dvb-frontends}/si21xx.c      |    0
1393  .../{dvb/frontends => dvb-frontends}/si21xx.h      |    0
1394  .../{dvb/frontends => dvb-frontends}/sp8870.c      |    0
1395  .../{dvb/frontends => dvb-frontends}/sp8870.h      |    0
1396  .../{dvb/frontends => dvb-frontends}/sp887x.c      |    0
1397  .../{dvb/frontends => dvb-frontends}/sp887x.h      |    0
1398  .../frontends => dvb-frontends}/stb0899_algo.c     |    0
1399  .../{dvb/frontends => dvb-frontends}/stb0899_cfg.h |    0
1400  .../{dvb/frontends => dvb-frontends}/stb0899_drv.c |    0
1401  .../{dvb/frontends => dvb-frontends}/stb0899_drv.h |    0
1402  .../frontends => dvb-frontends}/stb0899_priv.h     |    0
1403  .../{dvb/frontends => dvb-frontends}/stb0899_reg.h |    0
1404  .../{dvb/frontends => dvb-frontends}/stb6000.c     |    0
1405  .../{dvb/frontends => dvb-frontends}/stb6000.h     |    0
1406  .../{dvb/frontends => dvb-frontends}/stb6100.c     |    0
1407  .../{dvb/frontends => dvb-frontends}/stb6100.h     |    0
1408  .../{dvb/frontends => dvb-frontends}/stb6100_cfg.h |    0
1409  .../frontends => dvb-frontends}/stb6100_proc.h     |    0
1410  .../{dvb/frontends => dvb-frontends}/stv0288.c     |    0
1411  .../{dvb/frontends => dvb-frontends}/stv0288.h     |    0
1412  .../{dvb/frontends => dvb-frontends}/stv0297.c     |    0
1413  .../{dvb/frontends => dvb-frontends}/stv0297.h     |    0
1414  .../{dvb/frontends => dvb-frontends}/stv0299.c     |    0
1415  .../{dvb/frontends => dvb-frontends}/stv0299.h     |    0
1416  .../{dvb/frontends => dvb-frontends}/stv0367.c     |    0
1417  .../{dvb/frontends => dvb-frontends}/stv0367.h     |    0
1418  .../frontends => dvb-frontends}/stv0367_priv.h     |    0
1419  .../frontends => dvb-frontends}/stv0367_regs.h     |    0
1420  .../{dvb/frontends => dvb-frontends}/stv0900.h     |    0
1421  .../frontends => dvb-frontends}/stv0900_core.c     |    0
1422  .../frontends => dvb-frontends}/stv0900_init.h     |    0
1423  .../frontends => dvb-frontends}/stv0900_priv.h     |    0
1424  .../{dvb/frontends => dvb-frontends}/stv0900_reg.h |    0
1425  .../{dvb/frontends => dvb-frontends}/stv0900_sw.c  |    0
1426  .../{dvb/frontends => dvb-frontends}/stv090x.c     |    0
1427  .../{dvb/frontends => dvb-frontends}/stv090x.h     |    0
1428  .../frontends => dvb-frontends}/stv090x_priv.h     |    0
1429  .../{dvb/frontends => dvb-frontends}/stv090x_reg.h |    0
1430  .../{dvb/frontends => dvb-frontends}/stv6110.c     |    0
1431  .../{dvb/frontends => dvb-frontends}/stv6110.h     |    0
1432  .../{dvb/frontends => dvb-frontends}/stv6110x.c    |    0
1433  .../{dvb/frontends => dvb-frontends}/stv6110x.h    |    0
1434  .../frontends => dvb-frontends}/stv6110x_priv.h    |    0
1435  .../frontends => dvb-frontends}/stv6110x_reg.h     |    0
1436  .../{dvb/frontends => dvb-frontends}/tda10021.c    |    0
1437  .../{dvb/frontends => dvb-frontends}/tda10023.c    |    0
1438  .../{dvb/frontends => dvb-frontends}/tda1002x.h    |    0
1439  .../{dvb/frontends => dvb-frontends}/tda10048.c    |    0
1440  .../{dvb/frontends => dvb-frontends}/tda10048.h    |    0
1441  .../{dvb/frontends => dvb-frontends}/tda1004x.c    |    0
1442  .../{dvb/frontends => dvb-frontends}/tda1004x.h    |    0
1443  .../{dvb/frontends => dvb-frontends}/tda10071.c    |    0
1444  .../{dvb/frontends => dvb-frontends}/tda10071.h    |    0
1445  .../frontends => dvb-frontends}/tda10071_priv.h    |    0
1446  .../{dvb/frontends => dvb-frontends}/tda10086.c    |    0
1447  .../{dvb/frontends => dvb-frontends}/tda10086.h    |    0
1448  .../frontends => dvb-frontends}/tda18271c2dd.c     |    0
1449  .../frontends => dvb-frontends}/tda18271c2dd.h     |    0
1450  .../tda18271c2dd_maps.h                            |    0
1451  .../{dvb/frontends => dvb-frontends}/tda665x.c     |    0
1452  .../{dvb/frontends => dvb-frontends}/tda665x.h     |    0
1453  .../{dvb/frontends => dvb-frontends}/tda8083.c     |    0
1454  .../{dvb/frontends => dvb-frontends}/tda8083.h     |    0
1455  .../{dvb/frontends => dvb-frontends}/tda8261.c     |    0
1456  .../{dvb/frontends => dvb-frontends}/tda8261.h     |    0
1457  .../{dvb/frontends => dvb-frontends}/tda8261_cfg.h |    0
1458  .../{dvb/frontends => dvb-frontends}/tda826x.c     |    0
1459  .../{dvb/frontends => dvb-frontends}/tda826x.h     |    0
1460  .../media/{dvb/frontends => dvb-frontends}/tdhd1.h |    0
1461  .../{dvb/frontends => dvb-frontends}/tua6100.c     |    0
1462  .../{dvb/frontends => dvb-frontends}/tua6100.h     |    0
1463  .../{dvb/frontends => dvb-frontends}/ves1820.c     |    0
1464  .../{dvb/frontends => dvb-frontends}/ves1820.h     |    0
1465  .../{dvb/frontends => dvb-frontends}/ves1x93.c     |    0
1466  .../{dvb/frontends => dvb-frontends}/ves1x93.h     |    0
1467  .../{dvb/frontends => dvb-frontends}/z0194a.h      |    0
1468  .../{dvb/frontends => dvb-frontends}/zl10036.c     |    0
1469  .../{dvb/frontends => dvb-frontends}/zl10036.h     |    0
1470  .../{dvb/frontends => dvb-frontends}/zl10039.c     |    0
1471  .../{dvb/frontends => dvb-frontends}/zl10039.h     |    0
1472  .../{dvb/frontends => dvb-frontends}/zl10353.c     |    0
1473  .../{dvb/frontends => dvb-frontends}/zl10353.h     |    0
1474  .../frontends => dvb-frontends}/zl10353_priv.h     |    0
1475  drivers/media/dvb/Kconfig                          |   91 -
1476  drivers/media/dvb/Makefile                         |   21 -
1477  drivers/media/dvb/b2c2/Makefile                    |   16 -
1478  drivers/media/dvb/bt8xx/Makefile                   |    6 -
1479  drivers/media/dvb/dm1105/Makefile                  |    3 -
1480  drivers/media/dvb/dvb-usb/af9015.c                 | 1952 ---------
1481  drivers/media/dvb/dvb-usb/it913x.c                 |  931 -----
1482  drivers/media/dvb/dvb-usb/mxl111sf.c               | 1835 ---------
1483  drivers/media/dvb/pluto2/Makefile                  |    3 -
1484  drivers/media/dvb/siano/Kconfig                    |   34 -
1485  drivers/media/dvb/ttusb-budget/Makefile            |    3 -
1486  drivers/media/{dvb => }/firewire/Kconfig           |    0
1487  drivers/media/{dvb => }/firewire/Makefile          |    2 +-
1488  drivers/media/{dvb => }/firewire/firedtv-avc.c     |    0
1489  drivers/media/{dvb => }/firewire/firedtv-ci.c      |    0
1490  drivers/media/{dvb => }/firewire/firedtv-dvb.c     |    0
1491  drivers/media/{dvb => }/firewire/firedtv-fe.c      |    0
1492  drivers/media/{dvb => }/firewire/firedtv-fw.c      |    0
1493  drivers/media/{dvb => }/firewire/firedtv-rc.c      |    0
1494  drivers/media/{dvb => }/firewire/firedtv.h         |    0
1495  drivers/media/i2c/Kconfig                          |  570 +++
1496  drivers/media/i2c/Makefile                         |   64 +
1497  drivers/media/{video => i2c}/adp1653.c             |    2 +-
1498  drivers/media/{video => i2c}/adv7170.c             |    0
1499  drivers/media/{video => i2c}/adv7175.c             |    0
1500  drivers/media/{video => i2c}/adv7180.c             |    0
1501  drivers/media/{video => i2c}/adv7183.c             |    0
1502  drivers/media/{video => i2c}/adv7183_regs.h        |    0
1503  drivers/media/{video => i2c}/adv7343.c             |    0
1504  drivers/media/{video => i2c}/adv7343_regs.h        |    0
1505  drivers/media/{video => i2c}/adv7393.c             |    0
1506  drivers/media/{video => i2c}/adv7393_regs.h        |    0
1507  drivers/media/{video => i2c}/ak881x.c              |    0
1508  drivers/media/{video => i2c}/aptina-pll.c          |    0
1509  drivers/media/{video => i2c}/aptina-pll.h          |    0
1510  drivers/media/{video => i2c}/as3645a.c             |    2 +-
1511  drivers/media/{video => i2c}/bt819.c               |    0
1512  drivers/media/{video => i2c}/bt856.c               |    0
1513  drivers/media/{video => i2c}/bt866.c               |    0
1514  drivers/media/{video => i2c}/btcx-risc.c           |    0
1515  drivers/media/{video => i2c}/btcx-risc.h           |    0
1516  drivers/media/{video => i2c}/cs5345.c              |    0
1517  drivers/media/{video => i2c}/cs53l32a.c            |    0
1518  drivers/media/{video => i2c}/cx2341x.c             |    0
1519  drivers/media/{video => i2c}/cx25840/Kconfig       |    0
1520  drivers/media/{video => i2c}/cx25840/Makefile      |    2 +-
1521  .../media/{video => i2c}/cx25840/cx25840-audio.c   |    0
1522  .../media/{video => i2c}/cx25840/cx25840-core.c    |    0
1523  .../media/{video => i2c}/cx25840/cx25840-core.h    |    0
1524  .../{video => i2c}/cx25840/cx25840-firmware.c      |   15 +-
1525  drivers/media/{video => i2c}/cx25840/cx25840-ir.c  |    0
1526  drivers/media/{video => i2c}/cx25840/cx25840-vbi.c |    0
1527  drivers/media/{video => i2c}/ir-kbd-i2c.c          |    0
1528  drivers/media/{video => i2c}/ks0127.c              |    0
1529  drivers/media/{video => i2c}/ks0127.h              |    0
1530  drivers/media/{video => i2c}/m52790.c              |    0
1531  drivers/media/{video => i2c}/m5mols/Kconfig        |    0
1532  drivers/media/{video => i2c}/m5mols/Makefile       |    0
1533  drivers/media/{video => i2c}/m5mols/m5mols.h       |    0
1534  .../media/{video => i2c}/m5mols/m5mols_capture.c   |    0
1535  .../media/{video => i2c}/m5mols/m5mols_controls.c  |    0
1536  drivers/media/{video => i2c}/m5mols/m5mols_core.c  |    0
1537  drivers/media/{video => i2c}/m5mols/m5mols_reg.h   |    0
1538  drivers/media/{video => i2c}/msp3400-driver.c      |    0
1539  drivers/media/{video => i2c}/msp3400-driver.h      |    0
1540  drivers/media/{video => i2c}/msp3400-kthreads.c    |    0
1541  drivers/media/{video => i2c}/mt9m032.c             |    0
1542  drivers/media/{video => i2c}/mt9p031.c             |    0
1543  drivers/media/{video => i2c}/mt9t001.c             |    0
1544  drivers/media/{video => i2c}/mt9v011.c             |    0
1545  drivers/media/{video => i2c}/mt9v032.c             |    0
1546  drivers/media/{video => i2c}/noon010pc30.c         |    0
1547  drivers/media/{video => i2c}/ov7670.c              |    0
1548  drivers/media/{video => i2c}/s5k6aa.c              |    9 +-
1549  drivers/media/{video => i2c}/saa6588.c             |    0
1550  drivers/media/{video => i2c}/saa7110.c             |    0
1551  drivers/media/{video => i2c}/saa7115.c             |    0
1552  drivers/media/{video => i2c}/saa711x_regs.h        |    0
1553  drivers/media/{video => i2c}/saa7127.c             |    5 +-
1554  drivers/media/{video => i2c}/saa717x.c             |    0
1555  drivers/media/{video => i2c}/saa7185.c             |    0
1556  drivers/media/{video => i2c}/saa7191.c             |    0
1557  drivers/media/{video => i2c}/saa7191.h             |    0
1558  drivers/media/{video => i2c}/smiapp-pll.c          |    2 +-
1559  drivers/media/{video => i2c}/smiapp-pll.h          |    2 +-
1560  drivers/media/{video => i2c}/smiapp/Kconfig        |    0
1561  drivers/media/{video => i2c}/smiapp/Makefile       |    2 +-
1562  drivers/media/{video => i2c}/smiapp/smiapp-core.c  |    2 +-
1563  .../media/{video => i2c}/smiapp/smiapp-limits.c    |    2 +-
1564  .../media/{video => i2c}/smiapp/smiapp-limits.h    |    2 +-
1565  drivers/media/{video => i2c}/smiapp/smiapp-quirk.c |    2 +-
1566  drivers/media/{video => i2c}/smiapp/smiapp-quirk.h |    2 +-
1567  .../media/{video => i2c}/smiapp/smiapp-reg-defs.h  |    2 +-
1568  drivers/media/{video => i2c}/smiapp/smiapp-reg.h   |    2 +-
1569  drivers/media/{video => i2c}/smiapp/smiapp-regs.c  |    2 +-
1570  drivers/media/{video => i2c}/smiapp/smiapp-regs.h  |    0
1571  drivers/media/{video => i2c}/smiapp/smiapp.h       |    2 +-
1572  drivers/media/i2c/soc_camera/Kconfig               |   89 +
1573  drivers/media/i2c/soc_camera/Makefile              |   14 +
1574  drivers/media/{video => i2c/soc_camera}/imx074.c   |   30 +-
1575  drivers/media/{video => i2c/soc_camera}/mt9m001.c  |   26 +-
1576  drivers/media/{video => i2c/soc_camera}/mt9m111.c  |  116 +-
1577  drivers/media/{video => i2c/soc_camera}/mt9t031.c  |   48 +-
1578  drivers/media/{video => i2c/soc_camera}/mt9t112.c  |   21 +-
1579  drivers/media/{video => i2c/soc_camera}/mt9v022.c  |   50 +-
1580  drivers/media/{video => i2c/soc_camera}/ov2640.c   |   20 +-
1581  drivers/media/{video => i2c/soc_camera}/ov5642.c   |   31 +-
1582  drivers/media/{video => i2c/soc_camera}/ov6650.c   |   28 +-
1583  drivers/media/{video => i2c/soc_camera}/ov772x.c   |  447 ++-
1584  drivers/media/{video => i2c/soc_camera}/ov9640.c   |   27 +-
1585  drivers/media/{video => i2c/soc_camera}/ov9640.h   |    0
1586  drivers/media/{video => i2c/soc_camera}/ov9740.c   |   47 +-
1587  .../media/{video => i2c/soc_camera}/rj54n1cb0c.c   |   27 +-
1588  .../{video => i2c/soc_camera}/sh_mobile_csi2.c     |    0
1589  drivers/media/{video => i2c/soc_camera}/tw9910.c   |   21 +-
1590  drivers/media/{video => i2c}/sr030pc30.c           |    0
1591  drivers/media/{video => i2c}/tcm825x.c             |    2 +-
1592  drivers/media/{video => i2c}/tcm825x.h             |    2 +-
1593  drivers/media/{video => i2c}/tda7432.c             |    0
1594  drivers/media/{video => i2c}/tda9840.c             |    0
1595  drivers/media/{video => i2c}/tea6415c.c            |    0
1596  drivers/media/{video => i2c}/tea6415c.h            |    0
1597  drivers/media/{video => i2c}/tea6420.c             |    0
1598  drivers/media/{video => i2c}/tea6420.h             |    0
1599  drivers/media/{video => i2c}/ths7303.c             |    0
1600  drivers/media/{video => i2c}/tlv320aic23b.c        |    0
1601  drivers/media/{video => i2c}/tvaudio.c             |    0
1602  drivers/media/{video => i2c}/tveeprom.c            |    0
1603  drivers/media/{video => i2c}/tvp514x.c             |    2 +-
1604  drivers/media/{video => i2c}/tvp514x_regs.h        |    2 +-
1605  drivers/media/{video => i2c}/tvp5150.c             |    0
1606  drivers/media/{video => i2c}/tvp5150_reg.h         |    0
1607  drivers/media/{video => i2c}/tvp7002.c             |    0
1608  drivers/media/{video => i2c}/tvp7002_reg.h         |    0
1609  drivers/media/{video => i2c}/upd64031a.c           |    0
1610  drivers/media/{video => i2c}/upd64083.c            |    0
1611  drivers/media/{video => i2c}/vp27smpx.c            |    0
1612  drivers/media/{video => i2c}/vpx3220.c             |    0
1613  drivers/media/{video => i2c}/vs6624.c              |    0
1614  drivers/media/{video => i2c}/vs6624_regs.h         |    0
1615  drivers/media/{video => i2c}/wm8739.c              |    0
1616  drivers/media/{video => i2c}/wm8775.c              |    0
1617  drivers/media/media-device.c                       |    4 +-
1618  drivers/media/mmc/Kconfig                          |    2 +
1619  drivers/media/mmc/Makefile                         |    1 +
1620  drivers/media/mmc/siano/Kconfig                    |   10 +
1621  drivers/media/mmc/siano/Makefile                   |    6 +
1622  drivers/media/{dvb => mmc}/siano/smssdio.c         |    0
1623  drivers/media/parport/Kconfig                      |   47 +
1624  drivers/media/parport/Makefile                     |    4 +
1625  drivers/media/{video => parport}/bw-qcam.c         |    0
1626  drivers/media/{video => parport}/c-qcam.c          |    0
1627  drivers/media/{video => parport}/pms.c             |    0
1628  drivers/media/{video => parport}/w9966.c           |    0
1629  drivers/media/pci/Kconfig                          |   45 +
1630  drivers/media/pci/Makefile                         |   26 +
1631  drivers/media/pci/b2c2/Kconfig                     |    6 +
1632  drivers/media/pci/b2c2/Makefile                    |    9 +
1633  drivers/media/{dvb => pci}/b2c2/flexcop-dma.c      |    0
1634  drivers/media/{dvb => pci}/b2c2/flexcop-pci.c      |    0
1635  drivers/media/{dvb => pci}/bt8xx/Kconfig           |   23 +-
1636  drivers/media/pci/bt8xx/Makefile                   |   11 +
1637  drivers/media/{video => pci}/bt8xx/bt848.h         |    0
1638  drivers/media/{dvb => pci}/bt8xx/bt878.c           |    0
1639  drivers/media/{dvb => pci}/bt8xx/bt878.h           |    0
1640  .../media/{video => pci}/bt8xx/bttv-audio-hook.c   |    0
1641  .../media/{video => pci}/bt8xx/bttv-audio-hook.h   |    0
1642  drivers/media/{video => pci}/bt8xx/bttv-cards.c    |    0
1643  drivers/media/{video => pci}/bt8xx/bttv-driver.c   |    0
1644  drivers/media/{video => pci}/bt8xx/bttv-gpio.c     |    0
1645  drivers/media/{video => pci}/bt8xx/bttv-i2c.c      |    0
1646  drivers/media/{video => pci}/bt8xx/bttv-if.c       |    0
1647  drivers/media/{video => pci}/bt8xx/bttv-input.c    |    0
1648  drivers/media/{video => pci}/bt8xx/bttv-risc.c     |    0
1649  drivers/media/{video => pci}/bt8xx/bttv-vbi.c      |    0
1650  drivers/media/{video => pci}/bt8xx/bttv.h          |    0
1651  drivers/media/{video => pci}/bt8xx/bttvp.h         |    0
1652  drivers/media/{dvb => pci}/bt8xx/dst.c             |    0
1653  drivers/media/{dvb => pci}/bt8xx/dst_ca.c          |    3 +-
1654  drivers/media/{dvb => pci}/bt8xx/dst_ca.h          |    0
1655  drivers/media/{dvb => pci}/bt8xx/dst_common.h      |    0
1656  drivers/media/{dvb => pci}/bt8xx/dst_priv.h        |    0
1657  drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c       |    0
1658  drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h       |    0
1659  drivers/media/{video => pci}/cx18/Kconfig          |    0
1660  drivers/media/{video => pci}/cx18/Makefile         |    6 +-
1661  drivers/media/{video => pci}/cx18/cx18-alsa-main.c |    0
1662  .../media/{video => pci}/cx18/cx18-alsa-mixer.c    |    0
1663  .../media/{video => pci}/cx18/cx18-alsa-mixer.h    |    0
1664  drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c  |    0
1665  drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h  |    0
1666  drivers/media/{video => pci}/cx18/cx18-alsa.h      |    0
1667  drivers/media/{video => pci}/cx18/cx18-audio.c     |    0
1668  drivers/media/{video => pci}/cx18/cx18-audio.h     |    0
1669  drivers/media/{video => pci}/cx18/cx18-av-audio.c  |    0
1670  drivers/media/{video => pci}/cx18/cx18-av-core.c   |    0
1671  drivers/media/{video => pci}/cx18/cx18-av-core.h   |    0
1672  .../media/{video => pci}/cx18/cx18-av-firmware.c   |    2 +
1673  drivers/media/{video => pci}/cx18/cx18-av-vbi.c    |    0
1674  drivers/media/{video => pci}/cx18/cx18-cards.c     |    0
1675  drivers/media/{video => pci}/cx18/cx18-cards.h     |    0
1676  drivers/media/{video => pci}/cx18/cx18-controls.c  |    0
1677  drivers/media/{video => pci}/cx18/cx18-controls.h  |    0
1678  drivers/media/{video => pci}/cx18/cx18-driver.c    |    1 +
1679  drivers/media/{video => pci}/cx18/cx18-driver.h    |    0
1680  drivers/media/{video => pci}/cx18/cx18-dvb.c       |    6 +-
1681  drivers/media/{video => pci}/cx18/cx18-dvb.h       |    0
1682  drivers/media/{video => pci}/cx18/cx18-fileops.c   |    0
1683  drivers/media/{video => pci}/cx18/cx18-fileops.h   |    0
1684  drivers/media/{video => pci}/cx18/cx18-firmware.c  |   10 +-
1685  drivers/media/{video => pci}/cx18/cx18-firmware.h  |    0
1686  drivers/media/{video => pci}/cx18/cx18-gpio.c      |    0
1687  drivers/media/{video => pci}/cx18/cx18-gpio.h      |    0
1688  drivers/media/{video => pci}/cx18/cx18-i2c.c       |    0
1689  drivers/media/{video => pci}/cx18/cx18-i2c.h       |    0
1690  drivers/media/{video => pci}/cx18/cx18-io.c        |    0
1691  drivers/media/{video => pci}/cx18/cx18-io.h        |    0
1692  drivers/media/{video => pci}/cx18/cx18-ioctl.c     |    0
1693  drivers/media/{video => pci}/cx18/cx18-ioctl.h     |    0
1694  drivers/media/{video => pci}/cx18/cx18-irq.c       |    0
1695  drivers/media/{video => pci}/cx18/cx18-irq.h       |    0
1696  drivers/media/{video => pci}/cx18/cx18-mailbox.c   |    0
1697  drivers/media/{video => pci}/cx18/cx18-mailbox.h   |    0
1698  drivers/media/{video => pci}/cx18/cx18-queue.c     |    0
1699  drivers/media/{video => pci}/cx18/cx18-queue.h     |    0
1700  drivers/media/{video => pci}/cx18/cx18-scb.c       |    0
1701  drivers/media/{video => pci}/cx18/cx18-scb.h       |    0
1702  drivers/media/{video => pci}/cx18/cx18-streams.c   |    0
1703  drivers/media/{video => pci}/cx18/cx18-streams.h   |    0
1704  drivers/media/{video => pci}/cx18/cx18-vbi.c       |    0
1705  drivers/media/{video => pci}/cx18/cx18-vbi.h       |    0
1706  drivers/media/{video => pci}/cx18/cx18-version.h   |    0
1707  drivers/media/{video => pci}/cx18/cx18-video.c     |    0
1708  drivers/media/{video => pci}/cx18/cx18-video.h     |    0
1709  drivers/media/{video => pci}/cx18/cx23418.h        |    0
1710  drivers/media/{video => pci}/cx23885/Kconfig       |    0
1711  drivers/media/{video => pci}/cx23885/Makefile      |    8 +-
1712  drivers/media/{video => pci}/cx23885/altera-ci.c   |    0
1713  drivers/media/{video => pci}/cx23885/altera-ci.h   |    0
1714  drivers/media/{video => pci}/cx23885/cimax2.c      |    0
1715  drivers/media/{video => pci}/cx23885/cimax2.h      |    0
1716  drivers/media/{video => pci}/cx23885/cx23885-417.c |    2 +
1717  .../media/{video => pci}/cx23885/cx23885-alsa.c    |    0
1718  drivers/media/{video => pci}/cx23885/cx23885-av.c  |    0
1719  drivers/media/{video => pci}/cx23885/cx23885-av.h  |    0
1720  .../media/{video => pci}/cx23885/cx23885-cards.c   |    4 +
1721  .../media/{video => pci}/cx23885/cx23885-core.c    |    0
1722  drivers/media/{video => pci}/cx23885/cx23885-dvb.c |    3 +-
1723  .../media/{video => pci}/cx23885/cx23885-f300.c    |    0
1724  .../media/{video => pci}/cx23885/cx23885-f300.h    |    0
1725  drivers/media/{video => pci}/cx23885/cx23885-i2c.c |    0
1726  .../media/{video => pci}/cx23885/cx23885-input.c   |    9 +
1727  .../media/{video => pci}/cx23885/cx23885-input.h   |    0
1728  .../media/{video => pci}/cx23885/cx23885-ioctl.c   |    0
1729  .../media/{video => pci}/cx23885/cx23885-ioctl.h   |    0
1730  drivers/media/{video => pci}/cx23885/cx23885-ir.c  |    0
1731  drivers/media/{video => pci}/cx23885/cx23885-ir.h  |    0
1732  drivers/media/{video => pci}/cx23885/cx23885-reg.h |    0
1733  drivers/media/{video => pci}/cx23885/cx23885-vbi.c |    0
1734  .../media/{video => pci}/cx23885/cx23885-video.c   |    0
1735  drivers/media/{video => pci}/cx23885/cx23885.h     |    0
1736  drivers/media/{video => pci}/cx23885/cx23888-ir.c  |    0
1737  drivers/media/{video => pci}/cx23885/cx23888-ir.h  |    0
1738  .../media/{video => pci}/cx23885/netup-eeprom.c    |    0
1739  .../media/{video => pci}/cx23885/netup-eeprom.h    |    0
1740  drivers/media/{video => pci}/cx23885/netup-init.c  |    0
1741  drivers/media/{video => pci}/cx23885/netup-init.h  |    0
1742  drivers/media/{video => pci}/cx25821/Kconfig       |    0
1743  drivers/media/{video => pci}/cx25821/Makefile      |    8 +-
1744  .../media/{video => pci}/cx25821/cx25821-alsa.c    |    0
1745  .../cx25821/cx25821-audio-upstream.c               |    0
1746  .../cx25821/cx25821-audio-upstream.h               |    0
1747  .../media/{video => pci}/cx25821/cx25821-audio.h   |    0
1748  .../{video => pci}/cx25821/cx25821-biffuncs.h      |    0
1749  .../media/{video => pci}/cx25821/cx25821-cards.c   |    0
1750  .../media/{video => pci}/cx25821/cx25821-core.c    |    0
1751  .../media/{video => pci}/cx25821/cx25821-gpio.c    |    0
1752  drivers/media/{video => pci}/cx25821/cx25821-i2c.c |    0
1753  .../cx25821/cx25821-medusa-defines.h               |    0
1754  .../{video => pci}/cx25821/cx25821-medusa-reg.h    |    0
1755  .../{video => pci}/cx25821/cx25821-medusa-video.c  |    0
1756  .../{video => pci}/cx25821/cx25821-medusa-video.h  |    0
1757  drivers/media/{video => pci}/cx25821/cx25821-reg.h |    0
1758  .../media/{video => pci}/cx25821/cx25821-sram.h    |    0
1759  .../cx25821/cx25821-video-upstream-ch2.c           |    0
1760  .../cx25821/cx25821-video-upstream-ch2.h           |    0
1761  .../cx25821/cx25821-video-upstream.c               |    0
1762  .../cx25821/cx25821-video-upstream.h               |    0
1763  .../media/{video => pci}/cx25821/cx25821-video.c   |    0
1764  .../media/{video => pci}/cx25821/cx25821-video.h   |    0
1765  drivers/media/{video => pci}/cx25821/cx25821.h     |    0
1766  drivers/media/{video => pci}/cx88/Kconfig          |    0
1767  drivers/media/{video => pci}/cx88/Makefile         |    8 +-
1768  drivers/media/{video => pci}/cx88/cx88-alsa.c      |    2 +-
1769  drivers/media/{video => pci}/cx88/cx88-blackbird.c |    0
1770  drivers/media/{video => pci}/cx88/cx88-cards.c     |    0
1771  drivers/media/{video => pci}/cx88/cx88-core.c      |    2 +-
1772  drivers/media/{video => pci}/cx88/cx88-dsp.c       |    0
1773  drivers/media/{video => pci}/cx88/cx88-dvb.c       |    2 +-
1774  drivers/media/{video => pci}/cx88/cx88-i2c.c       |    0
1775  drivers/media/{video => pci}/cx88/cx88-input.c     |    0
1776  drivers/media/{video => pci}/cx88/cx88-mpeg.c      |    0
1777  drivers/media/{video => pci}/cx88/cx88-reg.h       |    0
1778  drivers/media/{video => pci}/cx88/cx88-tvaudio.c   |    0
1779  drivers/media/{video => pci}/cx88/cx88-vbi.c       |    0
1780  drivers/media/{video => pci}/cx88/cx88-video.c     |    0
1781  .../media/{video => pci}/cx88/cx88-vp3054-i2c.c    |    0
1782  .../media/{video => pci}/cx88/cx88-vp3054-i2c.h    |    0
1783  drivers/media/{video => pci}/cx88/cx88.h           |    2 +-
1784  drivers/media/{dvb => pci}/ddbridge/Kconfig        |    0
1785  drivers/media/{dvb => pci}/ddbridge/Makefile       |    6 +-
1786  .../media/{dvb => pci}/ddbridge/ddbridge-core.c    |    0
1787  .../media/{dvb => pci}/ddbridge/ddbridge-regs.h    |    0
1788  drivers/media/{dvb => pci}/ddbridge/ddbridge.h     |    0
1789  drivers/media/{dvb => pci}/dm1105/Kconfig          |    0
1790  drivers/media/pci/dm1105/Makefile                  |    3 +
1791  drivers/media/{dvb => pci}/dm1105/dm1105.c         |    0
1792  drivers/media/{video => pci}/ivtv/Kconfig          |    0
1793  drivers/media/{video => pci}/ivtv/Makefile         |    8 +-
1794  drivers/media/{video => pci}/ivtv/ivtv-cards.c     |    0
1795  drivers/media/{video => pci}/ivtv/ivtv-cards.h     |    0
1796  drivers/media/{video => pci}/ivtv/ivtv-controls.c  |    0
1797  drivers/media/{video => pci}/ivtv/ivtv-controls.h  |    0
1798  drivers/media/{video => pci}/ivtv/ivtv-driver.c    |    0
1799  drivers/media/{video => pci}/ivtv/ivtv-driver.h    |    0
1800  drivers/media/{video => pci}/ivtv/ivtv-fileops.c   |   52 +-
1801  drivers/media/{video => pci}/ivtv/ivtv-fileops.h   |    0
1802  drivers/media/{video => pci}/ivtv/ivtv-firmware.c  |    4 +
1803  drivers/media/{video => pci}/ivtv/ivtv-firmware.h  |    0
1804  drivers/media/{video => pci}/ivtv/ivtv-gpio.c      |    0
1805  drivers/media/{video => pci}/ivtv/ivtv-gpio.h      |    0
1806  drivers/media/{video => pci}/ivtv/ivtv-i2c.c       |    0
1807  drivers/media/{video => pci}/ivtv/ivtv-i2c.h       |    0
1808  drivers/media/{video => pci}/ivtv/ivtv-ioctl.c     |    0
1809  drivers/media/{video => pci}/ivtv/ivtv-ioctl.h     |    0
1810  drivers/media/{video => pci}/ivtv/ivtv-irq.c       |    0
1811  drivers/media/{video => pci}/ivtv/ivtv-irq.h       |    0
1812  drivers/media/{video => pci}/ivtv/ivtv-mailbox.c   |    0
1813  drivers/media/{video => pci}/ivtv/ivtv-mailbox.h   |    0
1814  drivers/media/{video => pci}/ivtv/ivtv-queue.c     |    0
1815  drivers/media/{video => pci}/ivtv/ivtv-queue.h     |    0
1816  drivers/media/{video => pci}/ivtv/ivtv-routing.c   |    0
1817  drivers/media/{video => pci}/ivtv/ivtv-routing.h   |    0
1818  drivers/media/{video => pci}/ivtv/ivtv-streams.c   |    4 -
1819  drivers/media/{video => pci}/ivtv/ivtv-streams.h   |    0
1820  drivers/media/{video => pci}/ivtv/ivtv-udma.c      |    0
1821  drivers/media/{video => pci}/ivtv/ivtv-udma.h      |    0
1822  drivers/media/{video => pci}/ivtv/ivtv-vbi.c       |    0
1823  drivers/media/{video => pci}/ivtv/ivtv-vbi.h       |    0
1824  drivers/media/{video => pci}/ivtv/ivtv-version.h   |    0
1825  drivers/media/{video => pci}/ivtv/ivtv-yuv.c       |    0
1826  drivers/media/{video => pci}/ivtv/ivtv-yuv.h       |    0
1827  drivers/media/{video => pci}/ivtv/ivtvfb.c         |    0
1828  drivers/media/{dvb => pci}/mantis/Kconfig          |    0
1829  drivers/media/{dvb => pci}/mantis/Makefile         |    2 +-
1830  drivers/media/{dvb => pci}/mantis/hopper_cards.c   |    0
1831  drivers/media/{dvb => pci}/mantis/hopper_vp3028.c  |    0
1832  drivers/media/{dvb => pci}/mantis/hopper_vp3028.h  |    0
1833  drivers/media/{dvb => pci}/mantis/mantis_ca.c      |    0
1834  drivers/media/{dvb => pci}/mantis/mantis_ca.h      |    0
1835  drivers/media/{dvb => pci}/mantis/mantis_cards.c   |    2 +-
1836  drivers/media/{dvb => pci}/mantis/mantis_common.h  |    0
1837  drivers/media/{dvb => pci}/mantis/mantis_core.c    |    2 +-
1838  drivers/media/{dvb => pci}/mantis/mantis_core.h    |    0
1839  drivers/media/{dvb => pci}/mantis/mantis_dma.c     |    0
1840  drivers/media/{dvb => pci}/mantis/mantis_dma.h     |    0
1841  drivers/media/{dvb => pci}/mantis/mantis_dvb.c     |    6 +-
1842  drivers/media/{dvb => pci}/mantis/mantis_dvb.h     |    0
1843  drivers/media/{dvb => pci}/mantis/mantis_evm.c     |    0
1844  drivers/media/{dvb => pci}/mantis/mantis_hif.c     |    0
1845  drivers/media/{dvb => pci}/mantis/mantis_hif.h     |    0
1846  drivers/media/{dvb => pci}/mantis/mantis_i2c.c     |    0
1847  drivers/media/{dvb => pci}/mantis/mantis_i2c.h     |    0
1848  drivers/media/{dvb => pci}/mantis/mantis_input.c   |    0
1849  drivers/media/{dvb => pci}/mantis/mantis_ioc.c     |    0
1850  drivers/media/{dvb => pci}/mantis/mantis_ioc.h     |    0
1851  drivers/media/{dvb => pci}/mantis/mantis_link.h    |    0
1852  drivers/media/{dvb => pci}/mantis/mantis_pci.c     |    0
1853  drivers/media/{dvb => pci}/mantis/mantis_pci.h     |    0
1854  drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c  |    0
1855  drivers/media/{dvb => pci}/mantis/mantis_reg.h     |    0
1856  drivers/media/{dvb => pci}/mantis/mantis_uart.c    |    0
1857  drivers/media/{dvb => pci}/mantis/mantis_uart.h    |    0
1858  drivers/media/{dvb => pci}/mantis/mantis_vp1033.c  |    0
1859  drivers/media/{dvb => pci}/mantis/mantis_vp1033.h  |    0
1860  drivers/media/{dvb => pci}/mantis/mantis_vp1034.c  |    0
1861  drivers/media/{dvb => pci}/mantis/mantis_vp1034.h  |    0
1862  drivers/media/{dvb => pci}/mantis/mantis_vp1041.c  |    0
1863  drivers/media/{dvb => pci}/mantis/mantis_vp1041.h  |    0
1864  drivers/media/{dvb => pci}/mantis/mantis_vp2033.c  |    0
1865  drivers/media/{dvb => pci}/mantis/mantis_vp2033.h  |    0
1866  drivers/media/{dvb => pci}/mantis/mantis_vp2040.c  |    0
1867  drivers/media/{dvb => pci}/mantis/mantis_vp2040.h  |    0
1868  drivers/media/{dvb => pci}/mantis/mantis_vp3028.c  |    0
1869  drivers/media/{dvb => pci}/mantis/mantis_vp3028.h  |    0
1870  drivers/media/{dvb => pci}/mantis/mantis_vp3030.c  |    0
1871  drivers/media/{dvb => pci}/mantis/mantis_vp3030.h  |    0
1872  drivers/media/pci/meye/Kconfig                     |   13 +
1873  drivers/media/pci/meye/Makefile                    |    1 +
1874  drivers/media/{video => pci/meye}/meye.c           |    0
1875  drivers/media/{video => pci/meye}/meye.h           |    0
1876  drivers/media/{dvb => pci}/ngene/Kconfig           |    0
1877  drivers/media/{dvb => pci}/ngene/Makefile          |    6 +-
1878  drivers/media/{dvb => pci}/ngene/ngene-cards.c     |  263 ++
1879  drivers/media/{dvb => pci}/ngene/ngene-core.c      |   14 +-
1880  drivers/media/{dvb => pci}/ngene/ngene-dvb.c       |    0
1881  drivers/media/{dvb => pci}/ngene/ngene-i2c.c       |    0
1882  drivers/media/{dvb => pci}/ngene/ngene.h           |    0
1883  drivers/media/{dvb => pci}/pluto2/Kconfig          |    0
1884  drivers/media/pci/pluto2/Makefile                  |    3 +
1885  drivers/media/{dvb => pci}/pluto2/pluto2.c         |    0
1886  drivers/media/{dvb => pci}/pt1/Kconfig             |    0
1887  drivers/media/{dvb => pci}/pt1/Makefile            |    2 +-
1888  drivers/media/{dvb => pci}/pt1/pt1.c               |    0
1889  drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c      |    0
1890  drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h      |    0
1891  drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c      |    0
1892  drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h      |    0
1893  drivers/media/{video => pci}/saa7134/Kconfig       |    0
1894  drivers/media/{video => pci}/saa7134/Makefile      |    8 +-
1895  drivers/media/{video => pci}/saa7134/saa6752hs.c   |    0
1896  .../media/{video => pci}/saa7134/saa7134-alsa.c    |    0
1897  .../media/{video => pci}/saa7134/saa7134-cards.c   |    0
1898  .../media/{video => pci}/saa7134/saa7134-core.c    |    0
1899  drivers/media/{video => pci}/saa7134/saa7134-dvb.c |    4 +-
1900  .../media/{video => pci}/saa7134/saa7134-empress.c |    0
1901  drivers/media/{video => pci}/saa7134/saa7134-i2c.c |    0
1902  .../media/{video => pci}/saa7134/saa7134-input.c   |   10 +-
1903  drivers/media/{video => pci}/saa7134/saa7134-reg.h |    0
1904  drivers/media/{video => pci}/saa7134/saa7134-ts.c  |    0
1905  .../media/{video => pci}/saa7134/saa7134-tvaudio.c |    0
1906  drivers/media/{video => pci}/saa7134/saa7134-vbi.c |    0
1907  .../media/{video => pci}/saa7134/saa7134-video.c   |    0
1908  drivers/media/{video => pci}/saa7134/saa7134.h     |    1 -
1909  drivers/media/pci/saa7146/Kconfig                  |   38 +
1910  drivers/media/pci/saa7146/Makefile                 |    5 +
1911  .../media/{video => pci/saa7146}/hexium_gemini.c   |    0
1912  .../media/{video => pci/saa7146}/hexium_orion.c    |    0
1913  drivers/media/{video => pci/saa7146}/mxb.c         |    0
1914  drivers/media/{video => pci}/saa7164/Kconfig       |    0
1915  drivers/media/{video => pci}/saa7164/Makefile      |    8 +-
1916  drivers/media/{video => pci}/saa7164/saa7164-api.c |   15 +-
1917  .../media/{video => pci}/saa7164/saa7164-buffer.c  |    0
1918  drivers/media/{video => pci}/saa7164/saa7164-bus.c |    0
1919  .../media/{video => pci}/saa7164/saa7164-cards.c   |    0
1920  drivers/media/{video => pci}/saa7164/saa7164-cmd.c |    0
1921  .../media/{video => pci}/saa7164/saa7164-core.c    |   46 +-
1922  drivers/media/{video => pci}/saa7164/saa7164-dvb.c |    0
1923  .../media/{video => pci}/saa7164/saa7164-encoder.c |    0
1924  drivers/media/{video => pci}/saa7164/saa7164-fw.c  |    0
1925  drivers/media/{video => pci}/saa7164/saa7164-i2c.c |    0
1926  drivers/media/{video => pci}/saa7164/saa7164-reg.h |    0
1927  .../media/{video => pci}/saa7164/saa7164-types.h   |    0
1928  drivers/media/{video => pci}/saa7164/saa7164-vbi.c |    0
1929  drivers/media/{video => pci}/saa7164/saa7164.h     |    1 -
1930  drivers/media/pci/sta2x11/Kconfig                  |   12 +
1931  drivers/media/pci/sta2x11/Makefile                 |    1 +
1932  drivers/media/{video => pci/sta2x11}/sta2x11_vip.c |    0
1933  drivers/media/{video => pci/sta2x11}/sta2x11_vip.h |    0
1934  drivers/media/{dvb => pci}/ttpci/Kconfig           |    0
1935  drivers/media/{dvb => pci}/ttpci/Makefile          |    4 +-
1936  drivers/media/{dvb => pci}/ttpci/av7110.c          |    0
1937  drivers/media/{dvb => pci}/ttpci/av7110.h          |    0
1938  drivers/media/{dvb => pci}/ttpci/av7110_av.c       |    0
1939  drivers/media/{dvb => pci}/ttpci/av7110_av.h       |    0
1940  drivers/media/{dvb => pci}/ttpci/av7110_ca.c       |    0
1941  drivers/media/{dvb => pci}/ttpci/av7110_ca.h       |    0
1942  drivers/media/{dvb => pci}/ttpci/av7110_hw.c       |    0
1943  drivers/media/{dvb => pci}/ttpci/av7110_hw.h       |    0
1944  drivers/media/{dvb => pci}/ttpci/av7110_ipack.c    |    0
1945  drivers/media/{dvb => pci}/ttpci/av7110_ipack.h    |    0
1946  drivers/media/{dvb => pci}/ttpci/av7110_ir.c       |    0
1947  drivers/media/{dvb => pci}/ttpci/av7110_v4l.c      |    0
1948  drivers/media/{dvb => pci}/ttpci/budget-av.c       |    0
1949  drivers/media/{dvb => pci}/ttpci/budget-ci.c       |    0
1950  drivers/media/{dvb => pci}/ttpci/budget-core.c     |    0
1951  drivers/media/{dvb => pci}/ttpci/budget-patch.c    |    0
1952  drivers/media/{dvb => pci}/ttpci/budget.c          |   60 +
1953  drivers/media/{dvb => pci}/ttpci/budget.h          |    0
1954  drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c    |    0
1955  drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h    |    0
1956  drivers/media/{video => pci}/zoran/Kconfig         |    0
1957  drivers/media/{video => pci}/zoran/Makefile        |    0
1958  drivers/media/{video => pci}/zoran/videocodec.c    |    0
1959  drivers/media/{video => pci}/zoran/videocodec.h    |    0
1960  drivers/media/{video => pci}/zoran/zoran.h         |    0
1961  drivers/media/{video => pci}/zoran/zoran_card.c    |    0
1962  drivers/media/{video => pci}/zoran/zoran_card.h    |    0
1963  drivers/media/{video => pci}/zoran/zoran_device.c  |    0
1964  drivers/media/{video => pci}/zoran/zoran_device.h  |    0
1965  drivers/media/{video => pci}/zoran/zoran_driver.c  |    0
1966  drivers/media/{video => pci}/zoran/zoran_procfs.c  |    0
1967  drivers/media/{video => pci}/zoran/zoran_procfs.h  |    0
1968  drivers/media/{video => pci}/zoran/zr36016.c       |    0
1969  drivers/media/{video => pci}/zoran/zr36016.h       |    0
1970  drivers/media/{video => pci}/zoran/zr36050.c       |    0
1971  drivers/media/{video => pci}/zoran/zr36050.h       |    0
1972  drivers/media/{video => pci}/zoran/zr36057.h       |    0
1973  drivers/media/{video => pci}/zoran/zr36060.c       |    0
1974  drivers/media/{video => pci}/zoran/zr36060.h       |    0
1975  drivers/media/platform/Kconfig                     |  297 ++
1976  drivers/media/platform/Makefile                    |   66 +
1977  drivers/media/{video => platform}/arv.c            |    0
1978  drivers/media/{video => platform}/atmel-isi.c      |    0
1979  drivers/media/{video => platform}/blackfin/Kconfig |    0
1980  .../media/{video => platform}/blackfin/Makefile    |    0
1981  .../{video => platform}/blackfin/bfin_capture.c    |   17 +-
1982  drivers/media/{video => platform}/blackfin/ppi.c   |    0
1983  drivers/media/platform/coda.c                      | 1849 +++++++++
1984  drivers/media/platform/coda.h                      |  216 +
1985  drivers/media/{video => platform}/davinci/Kconfig  |    0
1986  drivers/media/{video => platform}/davinci/Makefile |    0
1987  .../{video => platform}/davinci/ccdc_hw_device.h   |    0
1988  .../media/{video => platform}/davinci/dm355_ccdc.c |    2 +-
1989  .../{video => platform}/davinci/dm355_ccdc_regs.h  |    0
1990  .../{video => platform}/davinci/dm644x_ccdc.c      |    2 +-
1991  .../{video => platform}/davinci/dm644x_ccdc_regs.h |    0
1992  drivers/media/{video => platform}/davinci/isif.c   |    2 +-
1993  .../media/{video => platform}/davinci/isif_regs.h  |    0
1994  drivers/media/{video => platform}/davinci/vpbe.c   |    0
1995  .../{video => platform}/davinci/vpbe_display.c     |   22 +-
1996  .../media/{video => platform}/davinci/vpbe_osd.c   |    0
1997  .../{video => platform}/davinci/vpbe_osd_regs.h    |    0
1998  .../media/{video => platform}/davinci/vpbe_venc.c  |    0
1999  .../{video => platform}/davinci/vpbe_venc_regs.h   |    0
2000  .../{video => platform}/davinci/vpfe_capture.c     |    2 +-
2001  drivers/media/{video => platform}/davinci/vpif.c   |    2 +-
2002  drivers/media/{video => platform}/davinci/vpif.h   |    0
2003  .../{video => platform}/davinci/vpif_capture.c     |   28 +-
2004  .../{video => platform}/davinci/vpif_capture.h     |    0
2005  .../{video => platform}/davinci/vpif_display.c     |   34 +-
2006  .../{video => platform}/davinci/vpif_display.h     |    0
2007  drivers/media/{video => platform}/davinci/vpss.c   |    2 +-
2008  drivers/media/{video => platform}/fsl-viu.c        |   27 +-
2009  drivers/media/{video => platform}/indycam.c        |    0
2010  drivers/media/{video => platform}/indycam.h        |    0
2011  drivers/media/platform/m2m-deinterlace.c           | 1120 ++++++
2012  .../media/{video => platform}/marvell-ccic/Kconfig |    0
2013  .../{video => platform}/marvell-ccic/Makefile      |    0
2014  .../{video => platform}/marvell-ccic/cafe-driver.c |    0
2015  .../{video => platform}/marvell-ccic/mcam-core.c   |    0
2016  .../{video => platform}/marvell-ccic/mcam-core.h   |    0
2017  .../{video => platform}/marvell-ccic/mmp-driver.c  |    0
2018  .../media/{video => platform}/mem2mem_testdev.c    |   38 +-
2019  drivers/media/{video => platform}/mx1_camera.c     |    4 +-
2020  drivers/media/{video => platform}/mx2_camera.c     |   87 +-
2021  drivers/media/{video => platform}/mx2_emmaprp.c    |   76 +-
2022  drivers/media/{video => platform}/mx3_camera.c     |   26 +-
2023  drivers/media/{video => platform}/omap/Kconfig     |    0
2024  drivers/media/{video => platform}/omap/Makefile    |    0
2025  drivers/media/{video => platform}/omap/omap_vout.c |    0
2026  .../{video => platform}/omap/omap_vout_vrfb.c      |    0
2027  .../{video => platform}/omap/omap_vout_vrfb.h      |    0
2028  .../media/{video => platform}/omap/omap_voutdef.h  |    0
2029  .../media/{video => platform}/omap/omap_voutlib.c  |    0
2030  .../media/{video => platform}/omap/omap_voutlib.h  |    0
2031  drivers/media/{video => platform}/omap1_camera.c   |    2 +-
2032  .../media/{video => platform}/omap24xxcam-dma.c    |    2 +-
2033  drivers/media/{video => platform}/omap24xxcam.c    |    2 +-
2034  drivers/media/{video => platform}/omap24xxcam.h    |    2 +-
2035  .../media/{video => platform}/omap3isp/Makefile    |    0
2036  .../{video => platform}/omap3isp/cfa_coef_table.h  |   16 +-
2037  .../{video => platform}/omap3isp/gamma_table.h     |    0
2038  drivers/media/{video => platform}/omap3isp/isp.c   |   51 +-
2039  drivers/media/{video => platform}/omap3isp/isp.h   |   11 +-
2040  .../media/{video => platform}/omap3isp/ispccdc.c   |  234 +-
2041  .../media/{video => platform}/omap3isp/ispccdc.h   |   37 -
2042  .../media/{video => platform}/omap3isp/ispccp2.c   |    0
2043  .../media/{video => platform}/omap3isp/ispccp2.h   |    0
2044  .../media/{video => platform}/omap3isp/ispcsi2.c   |   27 +-
2045  .../media/{video => platform}/omap3isp/ispcsi2.h   |    0
2046  .../media/{video => platform}/omap3isp/ispcsiphy.c |    0
2047  .../media/{video => platform}/omap3isp/ispcsiphy.h |    0
2048  .../media/{video => platform}/omap3isp/isph3a.h    |    0
2049  .../{video => platform}/omap3isp/isph3a_aewb.c     |   10 +-
2050  .../media/{video => platform}/omap3isp/isph3a_af.c |   10 +-
2051  .../media/{video => platform}/omap3isp/isphist.c   |    6 +-
2052  .../media/{video => platform}/omap3isp/isphist.h   |    0
2053  .../{video => platform}/omap3isp/isppreview.c      |  707 ++--
2054  .../{video => platform}/omap3isp/isppreview.h      |    1 +
2055  .../media/{video => platform}/omap3isp/ispqueue.c  |   15 +-
2056  .../media/{video => platform}/omap3isp/ispqueue.h  |    0
2057  .../media/{video => platform}/omap3isp/ispreg.h    |    0
2058  .../{video => platform}/omap3isp/ispresizer.c      |    8 +-
2059  .../{video => platform}/omap3isp/ispresizer.h      |    0
2060  .../media/{video => platform}/omap3isp/ispstat.c   |    0
2061  .../media/{video => platform}/omap3isp/ispstat.h   |    0
2062  .../media/{video => platform}/omap3isp/ispvideo.c  |   57 +-
2063  .../media/{video => platform}/omap3isp/ispvideo.h  |    6 +-
2064  .../omap3isp/luma_enhance_table.h                  |    0
2065  .../omap3isp/noise_filter_table.h                  |    0
2066  drivers/media/{video => platform}/pxa_camera.c     |    0
2067  drivers/media/{video => platform}/s5p-fimc/Kconfig |    0
2068  .../media/{video => platform}/s5p-fimc/Makefile    |    0
2069  .../{video => platform}/s5p-fimc/fimc-capture.c    |    0
2070  .../media/{video => platform}/s5p-fimc/fimc-core.c |    0
2071  .../media/{video => platform}/s5p-fimc/fimc-core.h |    0
2072  .../{video => platform}/s5p-fimc/fimc-lite-reg.c   |    0
2073  .../{video => platform}/s5p-fimc/fimc-lite-reg.h   |    0
2074  .../media/{video => platform}/s5p-fimc/fimc-lite.c |    0
2075  .../media/{video => platform}/s5p-fimc/fimc-lite.h |    0
2076  .../media/{video => platform}/s5p-fimc/fimc-m2m.c  |    0
2077  .../{video => platform}/s5p-fimc/fimc-mdevice.c    |    0
2078  .../{video => platform}/s5p-fimc/fimc-mdevice.h    |    0
2079  .../media/{video => platform}/s5p-fimc/fimc-reg.c  |    0
2080  .../media/{video => platform}/s5p-fimc/fimc-reg.h  |    0
2081  .../media/{video => platform}/s5p-fimc/mipi-csis.c |    0
2082  .../media/{video => platform}/s5p-fimc/mipi-csis.h |    0
2083  drivers/media/{video => platform}/s5p-g2d/Makefile |    0
2084  drivers/media/{video => platform}/s5p-g2d/g2d-hw.c |    0
2085  .../media/{video => platform}/s5p-g2d/g2d-regs.h   |    0
2086  drivers/media/{video => platform}/s5p-g2d/g2d.c    |   27 +-
2087  drivers/media/{video => platform}/s5p-g2d/g2d.h    |    0
2088  .../media/{video => platform}/s5p-jpeg/Makefile    |    0
2089  .../media/{video => platform}/s5p-jpeg/jpeg-core.c |   36 +-
2090  .../media/{video => platform}/s5p-jpeg/jpeg-core.h |    2 +-
2091  .../media/{video => platform}/s5p-jpeg/jpeg-hw.h   |    2 +-
2092  .../media/{video => platform}/s5p-jpeg/jpeg-regs.h |    2 +-
2093  drivers/media/{video => platform}/s5p-mfc/Makefile |    0
2094  .../media/{video => platform}/s5p-mfc/regs-mfc.h   |    0
2095  .../media/{video => platform}/s5p-mfc/s5p_mfc.c    |   19 +-
2096  .../{video => platform}/s5p-mfc/s5p_mfc_cmd.c      |    2 +-
2097  .../{video => platform}/s5p-mfc/s5p_mfc_cmd.h      |    2 +-
2098  .../{video => platform}/s5p-mfc/s5p_mfc_common.h   |    0
2099  .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.c     |    2 +-
2100  .../{video => platform}/s5p-mfc/s5p_mfc_ctrl.h     |    2 +-
2101  .../{video => platform}/s5p-mfc/s5p_mfc_debug.h    |    2 +-
2102  .../{video => platform}/s5p-mfc/s5p_mfc_dec.c      |    2 +-
2103  .../{video => platform}/s5p-mfc/s5p_mfc_dec.h      |    2 +-
2104  .../{video => platform}/s5p-mfc/s5p_mfc_enc.c      |    2 +-
2105  .../{video => platform}/s5p-mfc/s5p_mfc_enc.h      |    2 +-
2106  .../{video => platform}/s5p-mfc/s5p_mfc_intr.c     |    2 +-
2107  .../{video => platform}/s5p-mfc/s5p_mfc_intr.h     |    2 +-
2108  .../{video => platform}/s5p-mfc/s5p_mfc_opr.c      |    2 +-
2109  .../{video => platform}/s5p-mfc/s5p_mfc_opr.h      |    2 +-
2110  .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.c |    2 +-
2111  .../media/{video => platform}/s5p-mfc/s5p_mfc_pm.h |    2 +-
2112  .../{video => platform}/s5p-mfc/s5p_mfc_shm.c      |    2 +-
2113  .../{video => platform}/s5p-mfc/s5p_mfc_shm.h      |    2 +-
2114  drivers/media/{video => platform}/s5p-tv/Kconfig   |    2 +-
2115  drivers/media/{video => platform}/s5p-tv/Makefile  |    2 +-
2116  .../media/{video => platform}/s5p-tv/hdmi_drv.c    |    6 +-
2117  .../media/{video => platform}/s5p-tv/hdmiphy_drv.c |    0
2118  drivers/media/{video => platform}/s5p-tv/mixer.h   |    0
2119  .../media/{video => platform}/s5p-tv/mixer_drv.c   |    6 +-
2120  .../{video => platform}/s5p-tv/mixer_grp_layer.c   |    0
2121  .../media/{video => platform}/s5p-tv/mixer_reg.c   |    0
2122  .../media/{video => platform}/s5p-tv/mixer_video.c |   33 +-
2123  .../{video => platform}/s5p-tv/mixer_vp_layer.c    |    0
2124  .../media/{video => platform}/s5p-tv/regs-hdmi.h   |    0
2125  .../media/{video => platform}/s5p-tv/regs-mixer.h  |    0
2126  .../media/{video => platform}/s5p-tv/regs-sdo.h    |    2 +-
2127  drivers/media/{video => platform}/s5p-tv/regs-vp.h |    0
2128  drivers/media/{video => platform}/s5p-tv/sdo_drv.c |   10 +-
2129  .../media/{video => platform}/s5p-tv/sii9234_drv.c |   17 +-
2130  .../{video => platform}/sh_mobile_ceu_camera.c     |    0
2131  drivers/media/{video => platform}/sh_vou.c         |   25 +-
2132  drivers/media/{video => platform}/soc_camera.c     |  200 +-
2133  .../{video => platform}/soc_camera_platform.c      |   11 +-
2134  drivers/media/{video => platform}/soc_mediabus.c   |    6 +
2135  drivers/media/{video => platform}/timblogiw.c      |    0
2136  drivers/media/{video => platform}/via-camera.c     |    0
2137  drivers/media/{video => platform}/via-camera.h     |    0
2138  drivers/media/{video => platform}/vino.c           |    0
2139  drivers/media/{video => platform}/vino.h           |    0
2140  drivers/media/{video => platform}/vivi.c           |   48 +-
2141  drivers/media/radio/radio-shark.c                  |  151 +-
2142  drivers/media/radio/radio-shark2.c                 |  150 +-
2143  drivers/media/radio/radio-si4713.c                 |    7 +-
2144  drivers/media/radio/radio-timb.c                   |    8 +-
2145  drivers/media/radio/radio-wl1273.c                 |   23 +-
2146  drivers/media/radio/si470x/radio-si470x-common.c   |    3 +
2147  drivers/media/radio/si470x/radio-si470x-i2c.c      |    5 +-
2148  drivers/media/radio/si470x/radio-si470x-usb.c      |    2 +-
2149  drivers/media/radio/wl128x/fmdrv_v4l2.c            |   38 +-
2150  drivers/media/rc/Kconfig                           |   32 +-
2151  drivers/media/rc/Makefile                          |    2 +
2152  drivers/media/rc/ati_remote.c                      |   11 +-
2153  drivers/media/rc/fintek-cir.c                      |   11 +-
2154  drivers/media/rc/iguanair.c                        |  220 +-
2155  drivers/media/rc/ir-lirc-codec.c                   |   35 +-
2156  drivers/media/rc/ir-nec-decoder.c                  |    4 +-
2157  drivers/media/rc/ir-raw.c                          |    6 +-
2158  drivers/media/rc/ir-rx51.c                         |  496 +++
2159  drivers/media/rc/keymaps/rc-tt-1500.c              |    2 +-
2160  drivers/media/rc/mceusb.c                          |   28 +-
2161  drivers/media/rc/rc-loopback.c                     |   12 -
2162  drivers/media/rc/ttusbir.c                         |  407 ++
2163  drivers/media/{common => }/tuners/Kconfig          |    0
2164  drivers/media/{common => }/tuners/Makefile         |    4 +-
2165  drivers/media/{common => }/tuners/fc0011.c         |    0
2166  drivers/media/{common => }/tuners/fc0011.h         |    0
2167  drivers/media/{common => }/tuners/fc0012-priv.h    |    0
2168  drivers/media/{common => }/tuners/fc0012.c         |    0
2169  drivers/media/{common => }/tuners/fc0012.h         |    0
2170  drivers/media/{common => }/tuners/fc0013-priv.h    |    0
2171  drivers/media/{common => }/tuners/fc0013.c         |    0
2172  drivers/media/{common => }/tuners/fc0013.h         |    0
2173  drivers/media/{common => }/tuners/fc001x-common.h  |    0
2174  drivers/media/{common => }/tuners/max2165.c        |    0
2175  drivers/media/{common => }/tuners/max2165.h        |    0
2176  drivers/media/{common => }/tuners/max2165_priv.h   |    0
2177  drivers/media/{common => }/tuners/mc44s803.c       |    0
2178  drivers/media/{common => }/tuners/mc44s803.h       |    0
2179  drivers/media/{common => }/tuners/mc44s803_priv.h  |    0
2180  drivers/media/{common => }/tuners/mt2060.c         |    0
2181  drivers/media/{common => }/tuners/mt2060.h         |    0
2182  drivers/media/{common => }/tuners/mt2060_priv.h    |    0
2183  drivers/media/{common => }/tuners/mt2063.c         |    0
2184  drivers/media/{common => }/tuners/mt2063.h         |    0
2185  drivers/media/{common => }/tuners/mt20xx.c         |    0
2186  drivers/media/{common => }/tuners/mt20xx.h         |    0
2187  drivers/media/{common => }/tuners/mt2131.c         |    0
2188  drivers/media/{common => }/tuners/mt2131.h         |    0
2189  drivers/media/{common => }/tuners/mt2131_priv.h    |    0
2190  drivers/media/{common => }/tuners/mt2266.c         |    0
2191  drivers/media/{common => }/tuners/mt2266.h         |    0
2192  drivers/media/{common => }/tuners/mxl5005s.c       |    0
2193  drivers/media/{common => }/tuners/mxl5005s.h       |    0
2194  drivers/media/{common => }/tuners/mxl5007t.c       |    0
2195  drivers/media/{common => }/tuners/mxl5007t.h       |    0
2196  drivers/media/{common => }/tuners/qt1010.c         |    2 +-
2197  drivers/media/{common => }/tuners/qt1010.h         |    0
2198  drivers/media/{common => }/tuners/qt1010_priv.h    |    0
2199  drivers/media/{common => }/tuners/tda18212.c       |   37 +-
2200  drivers/media/{common => }/tuners/tda18212.h       |    0
2201  drivers/media/{common => }/tuners/tda18218.c       |    2 +-
2202  drivers/media/{common => }/tuners/tda18218.h       |    0
2203  drivers/media/{common => }/tuners/tda18218_priv.h  |    0
2204  .../media/{common => }/tuners/tda18271-common.c    |    0
2205  drivers/media/{common => }/tuners/tda18271-fe.c    |    0
2206  drivers/media/{common => }/tuners/tda18271-maps.c  |    0
2207  drivers/media/{common => }/tuners/tda18271-priv.h  |    0
2208  drivers/media/{common => }/tuners/tda18271.h       |    0
2209  drivers/media/{common => }/tuners/tda827x.c        |    0
2210  drivers/media/{common => }/tuners/tda827x.h        |    0
2211  drivers/media/{common => }/tuners/tda8290.c        |    0
2212  drivers/media/{common => }/tuners/tda8290.h        |    0
2213  drivers/media/{common => }/tuners/tda9887.c        |    0
2214  drivers/media/{common => }/tuners/tda9887.h        |    0
2215  drivers/media/{common => }/tuners/tea5761.c        |    0
2216  drivers/media/{common => }/tuners/tea5761.h        |    0
2217  drivers/media/{common => }/tuners/tea5767.c        |    0
2218  drivers/media/{common => }/tuners/tea5767.h        |    0
2219  drivers/media/{common => }/tuners/tua9001.c        |    0
2220  drivers/media/{common => }/tuners/tua9001.h        |    0
2221  drivers/media/{common => }/tuners/tua9001_priv.h   |    0
2222  drivers/media/{common => }/tuners/tuner-i2c.h      |    0
2223  drivers/media/{common => }/tuners/tuner-simple.c   |    0
2224  drivers/media/{common => }/tuners/tuner-simple.h   |    0
2225  drivers/media/{common => }/tuners/tuner-types.c    |    0
2226  .../media/{common => }/tuners/tuner-xc2028-types.h |    0
2227  drivers/media/{common => }/tuners/tuner-xc2028.c   |    7 +-
2228  drivers/media/{common => }/tuners/tuner-xc2028.h   |    0
2229  drivers/media/{common => }/tuners/xc4000.c         |    3 +-
2230  drivers/media/{common => }/tuners/xc4000.h         |    0
2231  drivers/media/{common => }/tuners/xc5000.c         |  161 +-
2232  drivers/media/{common => }/tuners/xc5000.h         |    0
2233  drivers/media/usb/Kconfig                          |   53 +
2234  drivers/media/usb/Makefile                         |   22 +
2235  drivers/media/{video => usb}/au0828/Kconfig        |    0
2236  drivers/media/{video => usb}/au0828/Makefile       |    6 +-
2237  drivers/media/{video => usb}/au0828/au0828-cards.c |    4 +-
2238  drivers/media/{video => usb}/au0828/au0828-cards.h |    0
2239  drivers/media/{video => usb}/au0828/au0828-core.c  |   59 +-
2240  drivers/media/{video => usb}/au0828/au0828-dvb.c   |   54 +-
2241  drivers/media/{video => usb}/au0828/au0828-i2c.c   |   21 +-
2242  drivers/media/{video => usb}/au0828/au0828-reg.h   |    1 +
2243  drivers/media/{video => usb}/au0828/au0828-vbi.c   |    0
2244  drivers/media/{video => usb}/au0828/au0828-video.c |   76 +-
2245  drivers/media/{video => usb}/au0828/au0828.h       |    2 +
2246  drivers/media/usb/b2c2/Kconfig                     |    6 +
2247  drivers/media/usb/b2c2/Makefile                    |    5 +
2248  drivers/media/{dvb => usb}/b2c2/flexcop-usb.c      |    5 +-
2249  drivers/media/{dvb => usb}/b2c2/flexcop-usb.h      |    0
2250  drivers/media/{video => usb}/cpia2/Kconfig         |    0
2251  drivers/media/{video => usb}/cpia2/Makefile        |    0
2252  drivers/media/{video => usb}/cpia2/cpia2.h         |    0
2253  drivers/media/{video => usb}/cpia2/cpia2_core.c    |    6 +-
2254  .../media/{video => usb}/cpia2/cpia2_registers.h   |    0
2255  drivers/media/{video => usb}/cpia2/cpia2_usb.c     |    0
2256  drivers/media/{video => usb}/cpia2/cpia2_v4l.c     |   39 +-
2257  drivers/media/{video => usb}/cx231xx/Kconfig       |    0
2258  drivers/media/{video => usb}/cx231xx/Makefile      |   11 +-
2259  drivers/media/{video => usb}/cx231xx/cx231xx-417.c |    2 +
2260  .../media/{video => usb}/cx231xx/cx231xx-audio.c   |    0
2261  .../media/{video => usb}/cx231xx/cx231xx-avcore.c  |    0
2262  .../media/{video => usb}/cx231xx/cx231xx-cards.c   |    0
2263  .../{video => usb}/cx231xx/cx231xx-conf-reg.h      |    0
2264  .../media/{video => usb}/cx231xx/cx231xx-core.c    |    0
2265  drivers/media/{video => usb}/cx231xx/cx231xx-dif.h |    0
2266  drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c |    0
2267  drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c |    0
2268  .../media/{video => usb}/cx231xx/cx231xx-input.c   |    0
2269  .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c |    0
2270  .../media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h |    0
2271  drivers/media/{video => usb}/cx231xx/cx231xx-reg.h |    0
2272  drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c |    0
2273  drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h |    0
2274  .../media/{video => usb}/cx231xx/cx231xx-video.c   |   47 +-
2275  drivers/media/{video => usb}/cx231xx/cx231xx.h     |    0
2276  drivers/media/usb/dvb-usb-v2/Kconfig               |  146 +
2277  drivers/media/usb/dvb-usb-v2/Makefile              |   48 +
2278  drivers/media/usb/dvb-usb-v2/af9015.c              | 1435 +++++++
2279  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h |   68 +-
2280  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c |  735 ++--
2281  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h |    6 +-
2282  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c |  663 ++-
2283  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h |    9 +-
2284  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c |  116 +-
2285  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h |   13 +-
2286  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c |  410 +-
2287  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c |  182 +-
2288  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h |   36 +-
2289  drivers/media/usb/dvb-usb-v2/cypress_firmware.c    |  125 +
2290  drivers/media/usb/dvb-usb-v2/cypress_firmware.h    |   31 +
2291  drivers/media/usb/dvb-usb-v2/dvb_usb.h             |  392 ++
2292  drivers/media/usb/dvb-usb-v2/dvb_usb_common.h      |   35 +
2293  drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        | 1046 +++++
2294  drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c         |   77 +
2295  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c  |  321 +-
2296  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h  |   26 +-
2297  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c  |  130 +-
2298  .../media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h  |    5 +-
2299  drivers/media/usb/dvb-usb-v2/it913x.c              |  799 ++++
2300  .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c      |  586 ++-
2301  .../{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h      |    0
2302  .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c    |    0
2303  .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h    |    0
2304  .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c     |    0
2305  .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h     |    0
2306  .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c |    0
2307  .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h |    0
2308  .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c |    0
2309  .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h |    0
2310  .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h |    0
2311  .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c    |    2 +
2312  .../dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h    |    0
2313  drivers/media/usb/dvb-usb-v2/mxl111sf.c            | 1431 +++++++
2314  .../{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h     |   22 +-
2315  .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c     |  594 +--
2316  .../{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h     |   26 +-
2317  drivers/media/usb/dvb-usb-v2/usb_urb.c             |  357 ++
2318  drivers/media/{dvb => usb}/dvb-usb/Kconfig         |  127 -
2319  drivers/media/{dvb => usb}/dvb-usb/Makefile        |   47 +-
2320  drivers/media/{dvb => usb}/dvb-usb/a800.c          |    0
2321  drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c     |    0
2322  drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c |    0
2323  drivers/media/{dvb => usb}/dvb-usb/af9005-script.h |    0
2324  drivers/media/{dvb => usb}/dvb-usb/af9005.c        |    0
2325  drivers/media/{dvb => usb}/dvb-usb/af9005.h        |    0
2326  drivers/media/{dvb => usb}/dvb-usb/az6027.c        |    0
2327  drivers/media/{dvb => usb}/dvb-usb/az6027.h        |    0
2328  .../media/{dvb => usb}/dvb-usb/cinergyT2-core.c    |    0
2329  drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c  |    0
2330  drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h     |    0
2331  drivers/media/{dvb => usb}/dvb-usb/cxusb.c         |    0
2332  drivers/media/{dvb => usb}/dvb-usb/cxusb.h         |    0
2333  drivers/media/{dvb => usb}/dvb-usb/dib0700.h       |    0
2334  drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c  |    6 +-
2335  .../media/{dvb => usb}/dvb-usb/dib0700_devices.c   |    0
2336  drivers/media/{dvb => usb}/dvb-usb/dib07x0.h       |    0
2337  drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c |    0
2338  drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c     |    0
2339  drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c     |    0
2340  drivers/media/{dvb => usb}/dvb-usb/dibusb.h        |    0
2341  drivers/media/{dvb => usb}/dvb-usb/digitv.c        |    0
2342  drivers/media/{dvb => usb}/dvb-usb/digitv.h        |    0
2343  drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c    |    0
2344  drivers/media/{dvb => usb}/dvb-usb/dtt200u.c       |    0
2345  drivers/media/{dvb => usb}/dvb-usb/dtt200u.h       |    0
2346  drivers/media/{dvb => usb}/dvb-usb/dtv5100.c       |    0
2347  drivers/media/{dvb => usb}/dvb-usb/dtv5100.h       |    0
2348  .../media/{dvb => usb}/dvb-usb/dvb-usb-common.h    |    0
2349  drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c   |    1 -
2350  .../media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c  |    0
2351  drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c   |    0
2352  drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c  |    0
2353  .../media/{dvb => usb}/dvb-usb/dvb-usb-remote.c    |    0
2354  drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c   |    0
2355  drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h       |    2 -
2356  drivers/media/usb/dvb-usb/dvb_usb_dvb.c            |  403 ++
2357  drivers/media/usb/dvb-usb/dvb_usb_remote.c         |  117 +
2358  drivers/media/{dvb => usb}/dvb-usb/dw2102.c        |    0
2359  drivers/media/{dvb => usb}/dvb-usb/dw2102.h        |    0
2360  drivers/media/{dvb => usb}/dvb-usb/friio-fe.c      |    0
2361  drivers/media/{dvb => usb}/dvb-usb/friio.c         |    0
2362  drivers/media/{dvb => usb}/dvb-usb/friio.h         |    0
2363  drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c     |    0
2364  drivers/media/{dvb => usb}/dvb-usb/gp8psk.c        |    0
2365  drivers/media/{dvb => usb}/dvb-usb/gp8psk.h        |    0
2366  drivers/media/{dvb => usb}/dvb-usb/m920x.c         |    0
2367  drivers/media/{dvb => usb}/dvb-usb/m920x.h         |    0
2368  drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c   |    0
2369  drivers/media/{dvb => usb}/dvb-usb/opera1.c        |    0
2370  drivers/media/{dvb => usb}/dvb-usb/pctv452e.c      |    7 +-
2371  .../media/{dvb => usb}/dvb-usb/technisat-usb2.c    |    0
2372  drivers/media/{dvb => usb}/dvb-usb/ttusb2.c        |    0
2373  drivers/media/{dvb => usb}/dvb-usb/ttusb2.h        |    0
2374  drivers/media/{dvb => usb}/dvb-usb/umt-010.c       |    0
2375  drivers/media/{dvb => usb}/dvb-usb/usb-urb.c       |    0
2376  drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c     |    0
2377  drivers/media/{dvb => usb}/dvb-usb/vp702x.c        |    0
2378  drivers/media/{dvb => usb}/dvb-usb/vp702x.h        |    0
2379  drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c     |    0
2380  drivers/media/{dvb => usb}/dvb-usb/vp7045.c        |    0
2381  drivers/media/{dvb => usb}/dvb-usb/vp7045.h        |    0
2382  drivers/media/{video => usb}/em28xx/Kconfig        |    0
2383  drivers/media/{video => usb}/em28xx/Makefile       |    8 +-
2384  drivers/media/{video => usb}/em28xx/em28xx-audio.c |    1 -
2385  drivers/media/{video => usb}/em28xx/em28xx-cards.c |    0
2386  drivers/media/{video => usb}/em28xx/em28xx-core.c  |    4 -
2387  drivers/media/{video => usb}/em28xx/em28xx-dvb.c   |    0
2388  drivers/media/{video => usb}/em28xx/em28xx-i2c.c   |    0
2389  drivers/media/{video => usb}/em28xx/em28xx-input.c |    0
2390  drivers/media/{video => usb}/em28xx/em28xx-reg.h   |    0
2391  drivers/media/{video => usb}/em28xx/em28xx-vbi.c   |    0
2392  drivers/media/{video => usb}/em28xx/em28xx-video.c |   52 +-
2393  drivers/media/{video => usb}/em28xx/em28xx.h       |    0
2394  drivers/media/{video => usb}/gspca/Kconfig         |    6 +-
2395  drivers/media/{video => usb}/gspca/Makefile        |    0
2396  .../{video => usb}/gspca/autogain_functions.c      |    0
2397  .../{video => usb}/gspca/autogain_functions.h      |    0
2398  drivers/media/{video => usb}/gspca/benq.c          |    0
2399  drivers/media/{video => usb}/gspca/conex.c         |    0
2400  drivers/media/{video => usb}/gspca/cpia1.c         |    0
2401  drivers/media/{video => usb}/gspca/etoms.c         |    0
2402  drivers/media/{video => usb}/gspca/finepix.c       |    0
2403  drivers/media/{video => usb}/gspca/gl860/Kconfig   |    0
2404  drivers/media/{video => usb}/gspca/gl860/Makefile  |    2 +-
2405  .../{video => usb}/gspca/gl860/gl860-mi1320.c      |    0
2406  .../{video => usb}/gspca/gl860/gl860-mi2020.c      |    0
2407  .../{video => usb}/gspca/gl860/gl860-ov2640.c      |    0
2408  .../{video => usb}/gspca/gl860/gl860-ov9655.c      |    0
2409  drivers/media/{video => usb}/gspca/gl860/gl860.c   |    0
2410  drivers/media/{video => usb}/gspca/gl860/gl860.h   |    0
2411  drivers/media/{video => usb}/gspca/gspca.c         |    0
2412  drivers/media/{video => usb}/gspca/gspca.h         |    0
2413  drivers/media/{video => usb}/gspca/jeilinj.c       |    0
2414  drivers/media/{video => usb}/gspca/jl2005bcd.c     |    0
2415  drivers/media/{video => usb}/gspca/jpeg.h          |    0
2416  drivers/media/{video => usb}/gspca/kinect.c        |    0
2417  drivers/media/{video => usb}/gspca/konica.c        |    0
2418  drivers/media/{video => usb}/gspca/m5602/Kconfig   |    0
2419  drivers/media/{video => usb}/gspca/m5602/Makefile  |    2 +-
2420  .../{video => usb}/gspca/m5602/m5602_bridge.h      |    0
2421  .../media/{video => usb}/gspca/m5602/m5602_core.c  |    0
2422  .../{video => usb}/gspca/m5602/m5602_mt9m111.c     |    0
2423  .../{video => usb}/gspca/m5602/m5602_mt9m111.h     |    0
2424  .../{video => usb}/gspca/m5602/m5602_ov7660.c      |    0
2425  .../{video => usb}/gspca/m5602/m5602_ov7660.h      |    0
2426  .../{video => usb}/gspca/m5602/m5602_ov9650.c      |    0
2427  .../{video => usb}/gspca/m5602/m5602_ov9650.h      |    0
2428  .../{video => usb}/gspca/m5602/m5602_po1030.c      |    0
2429  .../{video => usb}/gspca/m5602/m5602_po1030.h      |    0
2430  .../{video => usb}/gspca/m5602/m5602_s5k4aa.c      |    0
2431  .../{video => usb}/gspca/m5602/m5602_s5k4aa.h      |    0
2432  .../{video => usb}/gspca/m5602/m5602_s5k83a.c      |    0
2433  .../{video => usb}/gspca/m5602/m5602_s5k83a.h      |    0
2434  .../{video => usb}/gspca/m5602/m5602_sensor.h      |    0
2435  drivers/media/{video => usb}/gspca/mars.c          |    0
2436  drivers/media/{video => usb}/gspca/mr97310a.c      |    0
2437  drivers/media/{video => usb}/gspca/nw80x.c         |    0
2438  drivers/media/{video => usb}/gspca/ov519.c         |    0
2439  drivers/media/{video => usb}/gspca/ov534.c         |    0
2440  drivers/media/{video => usb}/gspca/ov534_9.c       |    0
2441  drivers/media/{video => usb}/gspca/pac207.c        |    0
2442  drivers/media/{video => usb}/gspca/pac7302.c       |    0
2443  drivers/media/{video => usb}/gspca/pac7311.c       |    0
2444  drivers/media/{video => usb}/gspca/pac_common.h    |    0
2445  drivers/media/{video => usb}/gspca/se401.c         |    0
2446  drivers/media/{video => usb}/gspca/se401.h         |    0
2447  drivers/media/{video => usb}/gspca/sn9c2028.c      |    0
2448  drivers/media/{video => usb}/gspca/sn9c2028.h      |    0
2449  drivers/media/{video => usb}/gspca/sn9c20x.c       |    0
2450  drivers/media/{video => usb}/gspca/sonixb.c        |    0
2451  drivers/media/{video => usb}/gspca/sonixj.c        |    0
2452  drivers/media/{video => usb}/gspca/spca1528.c      |    0
2453  drivers/media/{video => usb}/gspca/spca500.c       |    0
2454  drivers/media/{video => usb}/gspca/spca501.c       |    0
2455  drivers/media/{video => usb}/gspca/spca505.c       |    0
2456  drivers/media/{video => usb}/gspca/spca506.c       |    0
2457  drivers/media/{video => usb}/gspca/spca508.c       |    0
2458  drivers/media/{video => usb}/gspca/spca561.c       |    0
2459  drivers/media/{video => usb}/gspca/sq905.c         |    0
2460  drivers/media/{video => usb}/gspca/sq905c.c        |    7 +-
2461  drivers/media/{video => usb}/gspca/sq930x.c        |   10 +-
2462  drivers/media/{video => usb}/gspca/stk014.c        |    0
2463  drivers/media/{video => usb}/gspca/stv0680.c       |    0
2464  drivers/media/{video => usb}/gspca/stv06xx/Kconfig |    0
2465  .../media/{video => usb}/gspca/stv06xx/Makefile    |    2 +-
2466  .../media/{video => usb}/gspca/stv06xx/stv06xx.c   |    0
2467  .../media/{video => usb}/gspca/stv06xx/stv06xx.h   |    0
2468  .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.c    |    0
2469  .../{video => usb}/gspca/stv06xx/stv06xx_hdcs.h    |    0
2470  .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.c  |    0
2471  .../{video => usb}/gspca/stv06xx/stv06xx_pb0100.h  |    0
2472  .../{video => usb}/gspca/stv06xx/stv06xx_sensor.h  |    0
2473  .../{video => usb}/gspca/stv06xx/stv06xx_st6422.c  |    0
2474  .../{video => usb}/gspca/stv06xx/stv06xx_st6422.h  |    0
2475  .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.c  |    0
2476  .../{video => usb}/gspca/stv06xx/stv06xx_vv6410.h  |    0
2477  drivers/media/{video => usb}/gspca/sunplus.c       |    0
2478  drivers/media/{video => usb}/gspca/t613.c          |    0
2479  drivers/media/{video => usb}/gspca/topro.c         |    0
2480  drivers/media/{video => usb}/gspca/tv8532.c        |    0
2481  drivers/media/{video => usb}/gspca/vc032x.c        |    7 +-
2482  drivers/media/{video => usb}/gspca/vicam.c         |    0
2483  drivers/media/{video => usb}/gspca/w996Xcf.c       |    0
2484  drivers/media/{video => usb}/gspca/xirlink_cit.c   |    0
2485  drivers/media/{video => usb}/gspca/zc3xx-reg.h     |    0
2486  drivers/media/{video => usb}/gspca/zc3xx.c         |    0
2487  drivers/media/{video => usb}/hdpvr/Kconfig         |    0
2488  drivers/media/{video => usb}/hdpvr/Makefile        |    2 +-
2489  drivers/media/{video => usb}/hdpvr/hdpvr-control.c |    0
2490  drivers/media/{video => usb}/hdpvr/hdpvr-core.c    |    0
2491  drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c     |    0
2492  drivers/media/{video => usb}/hdpvr/hdpvr-video.c   |    0
2493  drivers/media/{video => usb}/hdpvr/hdpvr.h         |    0
2494  drivers/media/{video => usb}/pvrusb2/Kconfig       |    0
2495  drivers/media/{video => usb}/pvrusb2/Makefile      |    8 +-
2496  .../media/{video => usb}/pvrusb2/pvrusb2-audio.c   |    0
2497  .../media/{video => usb}/pvrusb2/pvrusb2-audio.h   |    0
2498  .../media/{video => usb}/pvrusb2/pvrusb2-context.c |    0
2499  .../media/{video => usb}/pvrusb2/pvrusb2-context.h |    0
2500  .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.c      |    0
2501  .../{video => usb}/pvrusb2/pvrusb2-cs53l32a.h      |    0
2502  .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.c    |    0
2503  .../media/{video => usb}/pvrusb2/pvrusb2-ctrl.h    |    0
2504  .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c   |    0
2505  .../{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h   |    0
2506  .../media/{video => usb}/pvrusb2/pvrusb2-debug.h   |    0
2507  .../{video => usb}/pvrusb2/pvrusb2-debugifc.c      |    0
2508  .../{video => usb}/pvrusb2/pvrusb2-debugifc.h      |    0
2509  .../media/{video => usb}/pvrusb2/pvrusb2-devattr.c |   17 +-
2510  .../media/{video => usb}/pvrusb2/pvrusb2-devattr.h |    0
2511  drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c |    0
2512  drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h |    0
2513  .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.c  |    0
2514  .../media/{video => usb}/pvrusb2/pvrusb2-eeprom.h  |    0
2515  .../media/{video => usb}/pvrusb2/pvrusb2-encoder.c |    0
2516  .../media/{video => usb}/pvrusb2/pvrusb2-encoder.h |    0
2517  .../media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h |    0
2518  .../{video => usb}/pvrusb2/pvrusb2-hdw-internal.h  |    0
2519  drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c |    0
2520  drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h |    0
2521  .../{video => usb}/pvrusb2/pvrusb2-i2c-core.c      |    0
2522  .../{video => usb}/pvrusb2/pvrusb2-i2c-core.h      |    0
2523  drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c  |    0
2524  drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h  |    0
2525  .../media/{video => usb}/pvrusb2/pvrusb2-ioread.c  |    0
2526  .../media/{video => usb}/pvrusb2/pvrusb2-ioread.h  |    0
2527  .../media/{video => usb}/pvrusb2/pvrusb2-main.c    |    0
2528  drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c |    0
2529  drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h |    0
2530  .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.c   |    0
2531  .../media/{video => usb}/pvrusb2/pvrusb2-sysfs.h   |    0
2532  .../media/{video => usb}/pvrusb2/pvrusb2-util.h    |    0
2533  .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.c    |    0
2534  .../media/{video => usb}/pvrusb2/pvrusb2-v4l2.h    |    0
2535  .../{video => usb}/pvrusb2/pvrusb2-video-v4l.c     |    0
2536  .../{video => usb}/pvrusb2/pvrusb2-video-v4l.h     |    0
2537  .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.c  |    0
2538  .../media/{video => usb}/pvrusb2/pvrusb2-wm8775.h  |    0
2539  drivers/media/{video => usb}/pvrusb2/pvrusb2.h     |    0
2540  drivers/media/{video => usb}/pwc/Kconfig           |    0
2541  drivers/media/{video => usb}/pwc/Makefile          |    0
2542  drivers/media/{video => usb}/pwc/philips.txt       |    0
2543  drivers/media/{video => usb}/pwc/pwc-ctrl.c        |    0
2544  drivers/media/{video => usb}/pwc/pwc-dec1.c        |    0
2545  drivers/media/{video => usb}/pwc/pwc-dec1.h        |    0
2546  drivers/media/{video => usb}/pwc/pwc-dec23.c       |    0
2547  drivers/media/{video => usb}/pwc/pwc-dec23.h       |    0
2548  drivers/media/{video => usb}/pwc/pwc-if.c          |    0
2549  drivers/media/{video => usb}/pwc/pwc-kiara.c       |    0
2550  drivers/media/{video => usb}/pwc/pwc-kiara.h       |    0
2551  drivers/media/{video => usb}/pwc/pwc-misc.c        |    0
2552  drivers/media/{video => usb}/pwc/pwc-nala.h        |    0
2553  drivers/media/{video => usb}/pwc/pwc-timon.c       |    0
2554  drivers/media/{video => usb}/pwc/pwc-timon.h       |    0
2555  drivers/media/{video => usb}/pwc/pwc-uncompress.c  |    0
2556  drivers/media/{video => usb}/pwc/pwc-v4l.c         |    0
2557  drivers/media/{video => usb}/pwc/pwc.h             |    0
2558  drivers/media/usb/s2255/Kconfig                    |    9 +
2559  drivers/media/usb/s2255/Makefile                   |    2 +
2560  drivers/media/{video => usb/s2255}/s2255drv.c      |   43 +-
2561  drivers/media/usb/siano/Kconfig                    |   10 +
2562  drivers/media/usb/siano/Makefile                   |    6 +
2563  drivers/media/{dvb => usb}/siano/smsusb.c          |    0
2564  drivers/media/{video => usb}/sn9c102/Kconfig       |    0
2565  drivers/media/{video => usb}/sn9c102/Makefile      |    0
2566  drivers/media/{video => usb}/sn9c102/sn9c102.h     |    0
2567  .../media/{video => usb}/sn9c102/sn9c102_config.h  |    0
2568  .../media/{video => usb}/sn9c102/sn9c102_core.c    |    0
2569  .../{video => usb}/sn9c102/sn9c102_devtable.h      |    0
2570  .../media/{video => usb}/sn9c102/sn9c102_hv7131d.c |    0
2571  .../media/{video => usb}/sn9c102/sn9c102_hv7131r.c |    0
2572  .../media/{video => usb}/sn9c102/sn9c102_mi0343.c  |    0
2573  .../media/{video => usb}/sn9c102/sn9c102_mi0360.c  |    0
2574  .../media/{video => usb}/sn9c102/sn9c102_mt9v111.c |    0
2575  .../media/{video => usb}/sn9c102/sn9c102_ov7630.c  |    0
2576  .../media/{video => usb}/sn9c102/sn9c102_ov7660.c  |    0
2577  .../media/{video => usb}/sn9c102/sn9c102_pas106b.c |    0
2578  .../{video => usb}/sn9c102/sn9c102_pas202bcb.c     |    0
2579  .../media/{video => usb}/sn9c102/sn9c102_sensor.h  |    0
2580  .../{video => usb}/sn9c102/sn9c102_tas5110c1b.c    |    0
2581  .../{video => usb}/sn9c102/sn9c102_tas5110d.c      |    0
2582  .../{video => usb}/sn9c102/sn9c102_tas5130d1b.c    |    0
2583  drivers/media/usb/stk1160/Kconfig                  |   20 +
2584  drivers/media/usb/stk1160/Makefile                 |   11 +
2585  drivers/media/usb/stk1160/stk1160-ac97.c           |  152 +
2586  drivers/media/usb/stk1160/stk1160-core.c           |  432 ++
2587  drivers/media/usb/stk1160/stk1160-i2c.c            |  294 ++
2588  drivers/media/usb/stk1160/stk1160-reg.h            |   93 +
2589  drivers/media/usb/stk1160/stk1160-v4l.c            |  740 ++++
2590  drivers/media/usb/stk1160/stk1160-video.c          |  518 +++
2591  drivers/media/usb/stk1160/stk1160.h                |  208 +
2592  drivers/media/usb/stkwebcam/Kconfig                |   13 +
2593  drivers/media/usb/stkwebcam/Makefile               |    4 +
2594  .../media/{video => usb/stkwebcam}/stk-sensor.c    |    0
2595  .../media/{video => usb/stkwebcam}/stk-webcam.c    |    0
2596  .../media/{video => usb/stkwebcam}/stk-webcam.h    |    0
2597  drivers/media/{video => usb}/tlg2300/Kconfig       |    0
2598  drivers/media/usb/tlg2300/Makefile                 |    9 +
2599  drivers/media/{video => usb}/tlg2300/pd-alsa.c     |    0
2600  drivers/media/{video => usb}/tlg2300/pd-common.h   |    0
2601  drivers/media/{video => usb}/tlg2300/pd-dvb.c      |    0
2602  drivers/media/{video => usb}/tlg2300/pd-main.c     |    0
2603  drivers/media/{video => usb}/tlg2300/pd-radio.c    |    0
2604  drivers/media/{video => usb}/tlg2300/pd-video.c    |    0
2605  drivers/media/{video => usb}/tlg2300/vendorcmds.h  |    0
2606  drivers/media/{video => usb}/tm6000/Kconfig        |    0
2607  drivers/media/{video => usb}/tm6000/Makefile       |    8 +-
2608  drivers/media/{video => usb}/tm6000/tm6000-alsa.c  |    3 +-
2609  drivers/media/{video => usb}/tm6000/tm6000-cards.c |    0
2610  drivers/media/{video => usb}/tm6000/tm6000-core.c  |    0
2611  drivers/media/{video => usb}/tm6000/tm6000-dvb.c   |    0
2612  drivers/media/{video => usb}/tm6000/tm6000-i2c.c   |    0
2613  drivers/media/{video => usb}/tm6000/tm6000-input.c |    3 +-
2614  drivers/media/{video => usb}/tm6000/tm6000-regs.h  |    0
2615  drivers/media/{video => usb}/tm6000/tm6000-stds.c  |    0
2616  .../media/{video => usb}/tm6000/tm6000-usb-isoc.h  |    0
2617  drivers/media/{video => usb}/tm6000/tm6000-video.c |   52 +-
2618  drivers/media/{video => usb}/tm6000/tm6000.h       |    0
2619  drivers/media/{dvb => usb}/ttusb-budget/Kconfig    |    0
2620  drivers/media/usb/ttusb-budget/Makefile            |    3 +
2621  .../{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c   |    0
2622  drivers/media/{dvb => usb}/ttusb-dec/Kconfig       |    0
2623  drivers/media/{dvb => usb}/ttusb-dec/Makefile      |    2 +-
2624  drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c   |    0
2625  drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c  |    0
2626  drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h  |    0
2627  drivers/media/{video => usb}/usbvision/Kconfig     |    0
2628  drivers/media/{video => usb}/usbvision/Makefile    |    4 +-
2629  .../{video => usb}/usbvision/usbvision-cards.c     |    0
2630  .../{video => usb}/usbvision/usbvision-cards.h     |    0
2631  .../{video => usb}/usbvision/usbvision-core.c      |    0
2632  .../media/{video => usb}/usbvision/usbvision-i2c.c |    0
2633  .../{video => usb}/usbvision/usbvision-video.c     |   42 +-
2634  drivers/media/{video => usb}/usbvision/usbvision.h |    0
2635  drivers/media/{video => usb}/uvc/Kconfig           |    0
2636  drivers/media/{video => usb}/uvc/Makefile          |    0
2637  drivers/media/{video => usb}/uvc/uvc_ctrl.c        |    0
2638  drivers/media/{video => usb}/uvc/uvc_debugfs.c     |    0
2639  drivers/media/{video => usb}/uvc/uvc_driver.c      |   28 +-
2640  drivers/media/{video => usb}/uvc/uvc_entity.c      |    0
2641  drivers/media/{video => usb}/uvc/uvc_isight.c      |    0
2642  drivers/media/{video => usb}/uvc/uvc_queue.c       |    1 +
2643  drivers/media/{video => usb}/uvc/uvc_status.c      |    0
2644  drivers/media/{video => usb}/uvc/uvc_v4l2.c        |    0
2645  drivers/media/{video => usb}/uvc/uvc_video.c       |   30 +-
2646  drivers/media/{video => usb}/uvc/uvcvideo.h        |    9 +
2647  drivers/media/usb/zr364xx/Kconfig                  |   14 +
2648  drivers/media/usb/zr364xx/Makefile                 |    2 +
2649  drivers/media/{video => usb/zr364xx}/zr364xx.c     |    0
2650  drivers/media/v4l2-core/Kconfig                    |   76 +
2651  drivers/media/v4l2-core/Makefile                   |   35 +
2652  drivers/media/{video => v4l2-core}/tuner-core.c    |    0
2653  drivers/media/{video => v4l2-core}/v4l2-common.c   |    2 +-
2654  .../{video => v4l2-core}/v4l2-compat-ioctl32.c     |    0
2655  drivers/media/{video => v4l2-core}/v4l2-ctrls.c    |    0
2656  drivers/media/{video => v4l2-core}/v4l2-dev.c      |   51 +-
2657  drivers/media/{video => v4l2-core}/v4l2-device.c   |    0
2658  drivers/media/{video => v4l2-core}/v4l2-event.c    |    0
2659  drivers/media/{video => v4l2-core}/v4l2-fh.c       |    0
2660  .../media/{video => v4l2-core}/v4l2-int-device.c   |    0
2661  drivers/media/{video => v4l2-core}/v4l2-ioctl.c    |   10 +-
2662  drivers/media/{video => v4l2-core}/v4l2-mem2mem.c  |    0
2663  drivers/media/{video => v4l2-core}/v4l2-subdev.c   |    0
2664  drivers/media/{video => v4l2-core}/videobuf-core.c |    0
2665  .../{video => v4l2-core}/videobuf-dma-contig.c     |    0
2666  .../media/{video => v4l2-core}/videobuf-dma-sg.c   |    0
2667  drivers/media/{video => v4l2-core}/videobuf-dvb.c  |   11 +-
2668  .../media/{video => v4l2-core}/videobuf-vmalloc.c  |    0
2669  .../media/{video => v4l2-core}/videobuf2-core.c    |   21 +-
2670  .../{video => v4l2-core}/videobuf2-dma-contig.c    |    0
2671  .../media/{video => v4l2-core}/videobuf2-dma-sg.c  |    0
2672  .../media/{video => v4l2-core}/videobuf2-memops.c  |    0
2673  .../media/{video => v4l2-core}/videobuf2-vmalloc.c |    1 +
2674  drivers/media/video/Kconfig                        | 1263 ------
2675  drivers/media/video/Makefile                       |  218 -
2676  drivers/media/video/bt8xx/Kconfig                  |   27 -
2677  drivers/media/video/bt8xx/Makefile                 |   13 -
2678  drivers/media/video/tlg2300/Makefile               |    9 -
2679  drivers/staging/media/Kconfig                      |    2 -
2680  drivers/staging/media/Makefile                     |    1 -
2681  drivers/staging/media/as102/Makefile               |    2 +-
2682  drivers/staging/media/cxd2099/Makefile             |    6 +-
2683  drivers/staging/media/cxd2099/cxd2099.c            |   13 +-
2684  drivers/staging/media/dt3155v4l/dt3155v4l.c        |   29 +-
2685  drivers/staging/media/easycap/Kconfig              |   30 -
2686  drivers/staging/media/easycap/Makefile             |   10 -
2687  drivers/staging/media/easycap/README               |  141 -
2688  drivers/staging/media/easycap/easycap.h            |  567 ---
2689  drivers/staging/media/easycap/easycap_ioctl.c      | 2443 -----------
2690  drivers/staging/media/easycap/easycap_low.c        |  968 -----
2691  drivers/staging/media/easycap/easycap_main.c       | 4239 --------------------
2692  drivers/staging/media/easycap/easycap_settings.c   |  696 ----
2693  drivers/staging/media/easycap/easycap_sound.c      |  750 ----
2694  drivers/staging/media/easycap/easycap_testcard.c   |  155 -
2695  drivers/staging/media/go7007/Makefile              |    6 +-
2696  drivers/staging/media/lirc/Kconfig                 |    6 -
2697  drivers/staging/media/lirc/Makefile                |    1 -
2698  drivers/staging/media/lirc/lirc_ene0100.h          |  169 -
2699  drivers/staging/media/lirc/lirc_igorplugusb.c      |    4 +-
2700  drivers/staging/media/lirc/lirc_ttusbir.c          |  376 --
2701  drivers/staging/media/lirc/lirc_zilog.c            |    3 +-
2702  include/linux/dvb/frontend.h                       |   51 +-
2703  include/linux/dvb/version.h                        |    2 +-
2704  include/linux/omap3isp.h                           |    6 +-
2705  include/linux/v4l2-common.h                        |    8 +-
2706  include/media/ir-rx51.h                            |   10 +
2707  include/media/omap3isp.h                           |   14 +-
2708  include/media/saa7146.h                            |    4 -
2709  include/media/soc_camera.h                         |   12 +
2710  include/media/v4l2-common.h                        |    4 +-
2711  include/media/v4l2-dev.h                           |    3 -
2712  include/media/v4l2-subdev.h                        |    2 +-
2713  include/media/videobuf-dvb.h                       |    4 +-
2714  1571 files changed, 21794 insertions(+), 22233 deletions(-)
2715  create mode 100644 arch/arm/plat-mxc/devices/platform-imx27-coda.c
2716  rename drivers/media/{dvb => common}/b2c2/Kconfig (64%)
2717  create mode 100644 drivers/media/common/b2c2/Makefile
2718  rename drivers/media/{dvb => common}/b2c2/flexcop-common.h (100%)
2719  rename drivers/media/{dvb => common}/b2c2/flexcop-eeprom.c (100%)
2720  rename drivers/media/{dvb => common}/b2c2/flexcop-fe-tuner.c (100%)
2721  rename drivers/media/{dvb => common}/b2c2/flexcop-hw-filter.c (100%)
2722  rename drivers/media/{dvb => common}/b2c2/flexcop-i2c.c (100%)
2723  rename drivers/media/{dvb => common}/b2c2/flexcop-misc.c (100%)
2724  rename drivers/media/{dvb => common}/b2c2/flexcop-reg.h (100%)
2725  rename drivers/media/{dvb => common}/b2c2/flexcop-sram.c (100%)
2726  rename drivers/media/{dvb => common}/b2c2/flexcop.c (100%)
2727  rename drivers/media/{dvb => common}/b2c2/flexcop.h (100%)
2728  rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_be.h (100%)
2729  rename drivers/media/{dvb => common}/b2c2/flexcop_ibi_value_le.h (100%)
2730  create mode 100644 drivers/media/common/saa7146/Kconfig
2731  create mode 100644 drivers/media/common/saa7146/Makefile
2732  rename drivers/media/common/{ => saa7146}/saa7146_core.c (98%)
2733  rename drivers/media/common/{ => saa7146}/saa7146_fops.c (94%)
2734  rename drivers/media/common/{ => saa7146}/saa7146_hlp.c (100%)
2735  rename drivers/media/common/{ => saa7146}/saa7146_i2c.c (100%)
2736  rename drivers/media/common/{ => saa7146}/saa7146_vbi.c (100%)
2737  rename drivers/media/common/{ => saa7146}/saa7146_video.c (100%)
2738  create mode 100644 drivers/media/common/siano/Kconfig
2739  rename drivers/media/{dvb => common}/siano/Makefile (57%)
2740  rename drivers/media/{dvb => common}/siano/sms-cards.c (100%)
2741  rename drivers/media/{dvb => common}/siano/sms-cards.h (100%)
2742  rename drivers/media/{dvb => common}/siano/smscoreapi.c (100%)
2743  rename drivers/media/{dvb => common}/siano/smscoreapi.h (100%)
2744  rename drivers/media/{dvb => common}/siano/smsdvb.c (100%)
2745  rename drivers/media/{dvb => common}/siano/smsendian.c (100%)
2746  rename drivers/media/{dvb => common}/siano/smsendian.h (100%)
2747  rename drivers/media/{dvb => common}/siano/smsir.c (100%)
2748  rename drivers/media/{dvb => common}/siano/smsir.h (100%)
2749  create mode 100644 drivers/media/dvb-core/Kconfig
2750  rename drivers/media/{dvb => }/dvb-core/Makefile (100%)
2751  rename drivers/media/{dvb => }/dvb-core/demux.h (100%)
2752  rename drivers/media/{dvb => }/dvb-core/dmxdev.c (99%)
2753  rename drivers/media/{dvb => }/dvb-core/dmxdev.h (100%)
2754  rename drivers/media/{dvb/dvb-usb => dvb-core}/dvb-usb-ids.h (100%)
2755  rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.c (100%)
2756  rename drivers/media/{dvb => }/dvb-core/dvb_ca_en50221.h (100%)
2757  rename drivers/media/{dvb => }/dvb-core/dvb_demux.c (98%)
2758  rename drivers/media/{dvb => }/dvb-core/dvb_demux.h (100%)
2759  rename drivers/media/{dvb => }/dvb-core/dvb_filter.c (100%)
2760  rename drivers/media/{dvb => }/dvb-core/dvb_filter.h (100%)
2761  rename drivers/media/{dvb => }/dvb-core/dvb_frontend.c (98%)
2762  rename drivers/media/{dvb => }/dvb-core/dvb_frontend.h (98%)
2763  rename drivers/media/{dvb => }/dvb-core/dvb_math.c (100%)
2764  rename drivers/media/{dvb => }/dvb-core/dvb_math.h (100%)
2765  rename drivers/media/{dvb => }/dvb-core/dvb_net.c (100%)
2766  rename drivers/media/{dvb => }/dvb-core/dvb_net.h (100%)
2767  rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.c (100%)
2768  rename drivers/media/{dvb => }/dvb-core/dvb_ringbuffer.h (100%)
2769  rename drivers/media/{dvb => }/dvb-core/dvbdev.c (100%)
2770  rename drivers/media/{dvb => }/dvb-core/dvbdev.h (80%)
2771  rename drivers/media/{dvb/frontends => dvb-frontends}/Kconfig (100%)
2772  rename drivers/media/{dvb/frontends => dvb-frontends}/Makefile (97%)
2773  rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.c (100%)
2774  rename drivers/media/{dvb/frontends => dvb-frontends}/a8293.h (100%)
2775  rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.c (100%)
2776  rename drivers/media/{dvb/frontends => dvb-frontends}/af9013.h (100%)
2777  rename drivers/media/{dvb/frontends => dvb-frontends}/af9013_priv.h (100%)
2778  rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.c (100%)
2779  rename drivers/media/{dvb/frontends => dvb-frontends}/af9033.h (100%)
2780  rename drivers/media/{dvb/frontends => dvb-frontends}/af9033_priv.h (100%)
2781  rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.c (99%)
2782  rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830.h (100%)
2783  rename drivers/media/{dvb/frontends => dvb-frontends}/atbm8830_priv.h (100%)
2784  rename drivers/media/{dvb/frontends => dvb-frontends}/au8522.h (100%)
2785  rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_common.c (93%)
2786  rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_decoder.c (98%)
2787  rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_dig.c (95%)
2788  rename drivers/media/{dvb/frontends => dvb-frontends}/au8522_priv.h (93%)
2789  rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.c (100%)
2790  rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510.h (100%)
2791  rename drivers/media/{dvb/frontends => dvb-frontends}/bcm3510_priv.h (100%)
2792  rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1-d01a.h (100%)
2793  rename drivers/media/{dvb/frontends => dvb-frontends}/bsbe1.h (100%)
2794  rename drivers/media/{dvb/frontends => dvb-frontends}/bsru6.h (100%)
2795  rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.c (100%)
2796  rename drivers/media/{dvb/frontends => dvb-frontends}/cx22700.h (100%)
2797  rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.c (100%)
2798  rename drivers/media/{dvb/frontends => dvb-frontends}/cx22702.h (100%)
2799  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.c (100%)
2800  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24110.h (100%)
2801  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.c (100%)
2802  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24113.h (100%)
2803  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.c (100%)
2804  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24116.h (100%)
2805  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.c (100%)
2806  rename drivers/media/{dvb/frontends => dvb-frontends}/cx24123.h (100%)
2807  rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r.h (100%)
2808  rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_c.c (100%)
2809  rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_core.c (100%)
2810  rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_priv.h (100%)
2811  rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t.c (99%)
2812  rename drivers/media/{dvb/frontends => dvb-frontends}/cxd2820r_t2.c (100%)
2813  rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.c (100%)
2814  rename drivers/media/{dvb/frontends => dvb-frontends}/dib0070.h (100%)
2815  rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.c (100%)
2816  rename drivers/media/{dvb/frontends => dvb-frontends}/dib0090.h (100%)
2817  rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000.h (100%)
2818  rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb.c (100%)
2819  rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mb_priv.h (100%)
2820  rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.c (100%)
2821  rename drivers/media/{dvb/frontends => dvb-frontends}/dib3000mc.h (100%)
2822  rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.c (100%)
2823  rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000m.h (100%)
2824  rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.c (100%)
2825  rename drivers/media/{dvb/frontends => dvb-frontends}/dib7000p.h (100%)
2826  rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.c (100%)
2827  rename drivers/media/{dvb/frontends => dvb-frontends}/dib8000.h (100%)
2828  rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.c (100%)
2829  rename drivers/media/{dvb/frontends => dvb-frontends}/dib9000.h (100%)
2830  rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.c (100%)
2831  rename drivers/media/{dvb/frontends => dvb-frontends}/dibx000_common.h (100%)
2832  rename drivers/media/{dvb/frontends => dvb-frontends}/drxd.h (100%)
2833  rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.c (100%)
2834  rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_firm.h (100%)
2835  rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_hard.c (100%)
2836  rename drivers/media/{dvb/frontends => dvb-frontends}/drxd_map_firm.h (100%)
2837  rename drivers/media/{dvb/frontends => dvb-frontends}/drxk.h (100%)
2838  rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.c (100%)
2839  rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_hard.h (100%)
2840  rename drivers/media/{dvb/frontends => dvb-frontends}/drxk_map.h (100%)
2841  rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.c (100%)
2842  rename drivers/media/{dvb/frontends => dvb-frontends}/ds3000.h (100%)
2843  rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.c (96%)
2844  rename drivers/media/{dvb/frontends => dvb-frontends}/dvb-pll.h (97%)
2845  rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.c (100%)
2846  rename drivers/media/{dvb/frontends => dvb-frontends}/dvb_dummy_fe.h (100%)
2847  rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.c (100%)
2848  rename drivers/media/{dvb/frontends => dvb-frontends}/ec100.h (100%)
2849  rename drivers/media/{dvb/frontends => dvb-frontends}/ec100_priv.h (100%)
2850  rename drivers/media/{dvb/frontends => dvb-frontends}/eds1547.h (100%)
2851  rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.c (100%)
2852  rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2.h (100%)
2853  rename drivers/media/{dvb/frontends => dvb-frontends}/hd29l2_priv.h (100%)
2854  rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.c (100%)
2855  rename drivers/media/{dvb/frontends => dvb-frontends}/isl6405.h (100%)
2856  rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.c (100%)
2857  rename drivers/media/{dvb/frontends => dvb-frontends}/isl6421.h (100%)
2858  rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.c (100%)
2859  rename drivers/media/{dvb/frontends => dvb-frontends}/isl6423.h (100%)
2860  rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe-priv.h (100%)
2861  rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.c (99%)
2862  rename drivers/media/{dvb/frontends => dvb-frontends}/it913x-fe.h (100%)
2863  rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.c (100%)
2864  rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000.h (100%)
2865  rename drivers/media/{dvb/frontends => dvb-frontends}/itd1000_priv.h (100%)
2866  rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.c (100%)
2867  rename drivers/media/{dvb/frontends => dvb-frontends}/ix2505v.h (100%)
2868  rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.c (100%)
2869  rename drivers/media/{dvb/frontends => dvb-frontends}/l64781.h (100%)
2870  rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.c (100%)
2871  rename drivers/media/{dvb/frontends => dvb-frontends}/lg2160.h (100%)
2872  rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.c (100%)
2873  rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt3305.h (100%)
2874  rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.c (100%)
2875  rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x.h (100%)
2876  rename drivers/media/{dvb/frontends => dvb-frontends}/lgdt330x_priv.h (100%)
2877  rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.c (99%)
2878  rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gl5.h (100%)
2879  rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.c (99%)
2880  rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx.h (100%)
2881  rename drivers/media/{dvb/frontends => dvb-frontends}/lgs8gxx_priv.h (100%)
2882  rename drivers/media/{dvb/frontends => dvb-frontends}/lnbh24.h (100%)
2883  rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.c (100%)
2884  rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp21.h (100%)
2885  rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.c (100%)
2886  rename drivers/media/{dvb/frontends => dvb-frontends}/lnbp22.h (100%)
2887  rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.c (99%)
2888  rename drivers/media/{dvb/frontends => dvb-frontends}/m88rs2000.h (100%)
2889  rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.c (100%)
2890  rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16.h (100%)
2891  rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a16_priv.h (100%)
2892  rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.c (100%)
2893  rename drivers/media/{dvb/frontends => dvb-frontends}/mb86a20s.h (100%)
2894  rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.c (100%)
2895  rename drivers/media/{dvb/frontends => dvb-frontends}/mt312.h (100%)
2896  rename drivers/media/{dvb/frontends => dvb-frontends}/mt312_priv.h (100%)
2897  rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.c (100%)
2898  rename drivers/media/{dvb/frontends => dvb-frontends}/mt352.h (100%)
2899  rename drivers/media/{dvb/frontends => dvb-frontends}/mt352_priv.h (100%)
2900  rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.c (93%)
2901  rename drivers/media/{dvb/frontends => dvb-frontends}/nxt200x.h (100%)
2902  rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.c (100%)
2903  rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000.h (100%)
2904  rename drivers/media/{dvb/frontends => dvb-frontends}/nxt6000_priv.h (100%)
2905  rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.c (100%)
2906  rename drivers/media/{dvb/frontends => dvb-frontends}/or51132.h (100%)
2907  rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.c (100%)
2908  rename drivers/media/{dvb/frontends => dvb-frontends}/or51211.h (100%)
2909  rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.c (99%)
2910  rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830.h (100%)
2911  rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2830_priv.h (100%)
2912  rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.c (100%)
2913  rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832.h (100%)
2914  rename drivers/media/{dvb/frontends => dvb-frontends}/rtl2832_priv.h (100%)
2915  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.c (100%)
2916  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1409.h (100%)
2917  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.c (100%)
2918  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1411.h (100%)
2919  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.c (100%)
2920  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420.h (100%)
2921  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1420_priv.h (100%)
2922  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.c (100%)
2923  rename drivers/media/{dvb/frontends => dvb-frontends}/s5h1432.h (100%)
2924  rename drivers/media/{dvb/frontends => dvb-frontends}/s921.c (100%)
2925  rename drivers/media/{dvb/frontends => dvb-frontends}/s921.h (100%)
2926  rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.c (100%)
2927  rename drivers/media/{dvb/frontends => dvb-frontends}/si21xx.h (100%)
2928  rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.c (100%)
2929  rename drivers/media/{dvb/frontends => dvb-frontends}/sp8870.h (100%)
2930  rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.c (100%)
2931  rename drivers/media/{dvb/frontends => dvb-frontends}/sp887x.h (100%)
2932  rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_algo.c (100%)
2933  rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_cfg.h (100%)
2934  rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.c (100%)
2935  rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_drv.h (100%)
2936  rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_priv.h (100%)
2937  rename drivers/media/{dvb/frontends => dvb-frontends}/stb0899_reg.h (100%)
2938  rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.c (100%)
2939  rename drivers/media/{dvb/frontends => dvb-frontends}/stb6000.h (100%)
2940  rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.c (100%)
2941  rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100.h (100%)
2942  rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_cfg.h (100%)
2943  rename drivers/media/{dvb/frontends => dvb-frontends}/stb6100_proc.h (100%)
2944  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.c (100%)
2945  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0288.h (100%)
2946  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.c (100%)
2947  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0297.h (100%)
2948  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.c (100%)
2949  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0299.h (100%)
2950  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.c (100%)
2951  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367.h (100%)
2952  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_priv.h (100%)
2953  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0367_regs.h (100%)
2954  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900.h (100%)
2955  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_core.c (100%)
2956  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_init.h (100%)
2957  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_priv.h (100%)
2958  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_reg.h (100%)
2959  rename drivers/media/{dvb/frontends => dvb-frontends}/stv0900_sw.c (100%)
2960  rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.c (100%)
2961  rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x.h (100%)
2962  rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_priv.h (100%)
2963  rename drivers/media/{dvb/frontends => dvb-frontends}/stv090x_reg.h (100%)
2964  rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.c (100%)
2965  rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110.h (100%)
2966  rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.c (100%)
2967  rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x.h (100%)
2968  rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_priv.h (100%)
2969  rename drivers/media/{dvb/frontends => dvb-frontends}/stv6110x_reg.h (100%)
2970  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10021.c (100%)
2971  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10023.c (100%)
2972  rename drivers/media/{dvb/frontends => dvb-frontends}/tda1002x.h (100%)
2973  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.c (100%)
2974  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10048.h (100%)
2975  rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.c (100%)
2976  rename drivers/media/{dvb/frontends => dvb-frontends}/tda1004x.h (100%)
2977  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.c (100%)
2978  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071.h (100%)
2979  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10071_priv.h (100%)
2980  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.c (100%)
2981  rename drivers/media/{dvb/frontends => dvb-frontends}/tda10086.h (100%)
2982  rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.c (100%)
2983  rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd.h (100%)
2984  rename drivers/media/{dvb/frontends => dvb-frontends}/tda18271c2dd_maps.h (100%)
2985  rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.c (100%)
2986  rename drivers/media/{dvb/frontends => dvb-frontends}/tda665x.h (100%)
2987  rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.c (100%)
2988  rename drivers/media/{dvb/frontends => dvb-frontends}/tda8083.h (100%)
2989  rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.c (100%)
2990  rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261.h (100%)
2991  rename drivers/media/{dvb/frontends => dvb-frontends}/tda8261_cfg.h (100%)
2992  rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.c (100%)
2993  rename drivers/media/{dvb/frontends => dvb-frontends}/tda826x.h (100%)
2994  rename drivers/media/{dvb/frontends => dvb-frontends}/tdhd1.h (100%)
2995  rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.c (100%)
2996  rename drivers/media/{dvb/frontends => dvb-frontends}/tua6100.h (100%)
2997  rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.c (100%)
2998  rename drivers/media/{dvb/frontends => dvb-frontends}/ves1820.h (100%)
2999  rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.c (100%)
3000  rename drivers/media/{dvb/frontends => dvb-frontends}/ves1x93.h (100%)
3001  rename drivers/media/{dvb/frontends => dvb-frontends}/z0194a.h (100%)
3002  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.c (100%)
3003  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10036.h (100%)
3004  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.c (100%)
3005  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10039.h (100%)
3006  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.c (100%)
3007  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353.h (100%)
3008  rename drivers/media/{dvb/frontends => dvb-frontends}/zl10353_priv.h (100%)
3009  delete mode 100644 drivers/media/dvb/Kconfig
3010  delete mode 100644 drivers/media/dvb/Makefile
3011  delete mode 100644 drivers/media/dvb/b2c2/Makefile
3012  delete mode 100644 drivers/media/dvb/bt8xx/Makefile
3013  delete mode 100644 drivers/media/dvb/dm1105/Makefile
3014  delete mode 100644 drivers/media/dvb/dvb-usb/af9015.c
3015  delete mode 100644 drivers/media/dvb/dvb-usb/it913x.c
3016  delete mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
3017  delete mode 100644 drivers/media/dvb/pluto2/Makefile
3018  delete mode 100644 drivers/media/dvb/siano/Kconfig
3019  delete mode 100644 drivers/media/dvb/ttusb-budget/Makefile
3020  rename drivers/media/{dvb => }/firewire/Kconfig (100%)
3021  rename drivers/media/{dvb => }/firewire/Makefile (80%)
3022  rename drivers/media/{dvb => }/firewire/firedtv-avc.c (100%)
3023  rename drivers/media/{dvb => }/firewire/firedtv-ci.c (100%)
3024  rename drivers/media/{dvb => }/firewire/firedtv-dvb.c (100%)
3025  rename drivers/media/{dvb => }/firewire/firedtv-fe.c (100%)
3026  rename drivers/media/{dvb => }/firewire/firedtv-fw.c (100%)
3027  rename drivers/media/{dvb => }/firewire/firedtv-rc.c (100%)
3028  rename drivers/media/{dvb => }/firewire/firedtv.h (100%)
3029  create mode 100644 drivers/media/i2c/Kconfig
3030  create mode 100644 drivers/media/i2c/Makefile
3031  rename drivers/media/{video => i2c}/adp1653.c (99%)
3032  rename drivers/media/{video => i2c}/adv7170.c (100%)
3033  rename drivers/media/{video => i2c}/adv7175.c (100%)
3034  rename drivers/media/{video => i2c}/adv7180.c (100%)
3035  rename drivers/media/{video => i2c}/adv7183.c (100%)
3036  rename drivers/media/{video => i2c}/adv7183_regs.h (100%)
3037  rename drivers/media/{video => i2c}/adv7343.c (100%)
3038  rename drivers/media/{video => i2c}/adv7343_regs.h (100%)
3039  rename drivers/media/{video => i2c}/adv7393.c (100%)
3040  rename drivers/media/{video => i2c}/adv7393_regs.h (100%)
3041  rename drivers/media/{video => i2c}/ak881x.c (100%)
3042  rename drivers/media/{video => i2c}/aptina-pll.c (100%)
3043  rename drivers/media/{video => i2c}/aptina-pll.h (100%)
3044  rename drivers/media/{video => i2c}/as3645a.c (99%)
3045  rename drivers/media/{video => i2c}/bt819.c (100%)
3046  rename drivers/media/{video => i2c}/bt856.c (100%)
3047  rename drivers/media/{video => i2c}/bt866.c (100%)
3048  rename drivers/media/{video => i2c}/btcx-risc.c (100%)
3049  rename drivers/media/{video => i2c}/btcx-risc.h (100%)
3050  rename drivers/media/{video => i2c}/cs5345.c (100%)
3051  rename drivers/media/{video => i2c}/cs53l32a.c (100%)
3052  rename drivers/media/{video => i2c}/cx2341x.c (100%)
3053  rename drivers/media/{video => i2c}/cx25840/Kconfig (100%)
3054  rename drivers/media/{video => i2c}/cx25840/Makefile (80%)
3055  rename drivers/media/{video => i2c}/cx25840/cx25840-audio.c (100%)
3056  rename drivers/media/{video => i2c}/cx25840/cx25840-core.c (100%)
3057  rename drivers/media/{video => i2c}/cx25840/cx25840-core.h (100%)
3058  rename drivers/media/{video => i2c}/cx25840/cx25840-firmware.c (92%)
3059  rename drivers/media/{video => i2c}/cx25840/cx25840-ir.c (100%)
3060  rename drivers/media/{video => i2c}/cx25840/cx25840-vbi.c (100%)
3061  rename drivers/media/{video => i2c}/ir-kbd-i2c.c (100%)
3062  rename drivers/media/{video => i2c}/ks0127.c (100%)
3063  rename drivers/media/{video => i2c}/ks0127.h (100%)
3064  rename drivers/media/{video => i2c}/m52790.c (100%)
3065  rename drivers/media/{video => i2c}/m5mols/Kconfig (100%)
3066  rename drivers/media/{video => i2c}/m5mols/Makefile (100%)
3067  rename drivers/media/{video => i2c}/m5mols/m5mols.h (100%)
3068  rename drivers/media/{video => i2c}/m5mols/m5mols_capture.c (100%)
3069  rename drivers/media/{video => i2c}/m5mols/m5mols_controls.c (100%)
3070  rename drivers/media/{video => i2c}/m5mols/m5mols_core.c (100%)
3071  rename drivers/media/{video => i2c}/m5mols/m5mols_reg.h (100%)
3072  rename drivers/media/{video => i2c}/msp3400-driver.c (100%)
3073  rename drivers/media/{video => i2c}/msp3400-driver.h (100%)
3074  rename drivers/media/{video => i2c}/msp3400-kthreads.c (100%)
3075  rename drivers/media/{video => i2c}/mt9m032.c (100%)
3076  rename drivers/media/{video => i2c}/mt9p031.c (100%)
3077  rename drivers/media/{video => i2c}/mt9t001.c (100%)
3078  rename drivers/media/{video => i2c}/mt9v011.c (100%)
3079  rename drivers/media/{video => i2c}/mt9v032.c (100%)
3080  rename drivers/media/{video => i2c}/noon010pc30.c (100%)
3081  rename drivers/media/{video => i2c}/ov7670.c (100%)
3082  rename drivers/media/{video => i2c}/s5k6aa.c (99%)
3083  rename drivers/media/{video => i2c}/saa6588.c (100%)
3084  rename drivers/media/{video => i2c}/saa7110.c (100%)
3085  rename drivers/media/{video => i2c}/saa7115.c (100%)
3086  rename drivers/media/{video => i2c}/saa711x_regs.h (100%)
3087  rename drivers/media/{video => i2c}/saa7127.c (99%)
3088  rename drivers/media/{video => i2c}/saa717x.c (100%)
3089  rename drivers/media/{video => i2c}/saa7185.c (100%)
3090  rename drivers/media/{video => i2c}/saa7191.c (100%)
3091  rename drivers/media/{video => i2c}/saa7191.h (100%)
3092  rename drivers/media/{video => i2c}/smiapp-pll.c (99%)
3093  rename drivers/media/{video => i2c}/smiapp-pll.h (98%)
3094  rename drivers/media/{video => i2c}/smiapp/Kconfig (100%)
3095  rename drivers/media/{video => i2c}/smiapp/Makefile (78%)
3096  rename drivers/media/{video => i2c}/smiapp/smiapp-core.c (99%)
3097  rename drivers/media/{video => i2c}/smiapp/smiapp-limits.c (99%)
3098  rename drivers/media/{video => i2c}/smiapp/smiapp-limits.h (99%)
3099  rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.c (99%)
3100  rename drivers/media/{video => i2c}/smiapp/smiapp-quirk.h (98%)
3101  rename drivers/media/{video => i2c}/smiapp/smiapp-reg-defs.h (99%)
3102  rename drivers/media/{video => i2c}/smiapp/smiapp-reg.h (98%)
3103  rename drivers/media/{video => i2c}/smiapp/smiapp-regs.c (99%)
3104  rename drivers/media/{video => i2c}/smiapp/smiapp-regs.h (100%)
3105  rename drivers/media/{video => i2c}/smiapp/smiapp.h (99%)
3106  create mode 100644 drivers/media/i2c/soc_camera/Kconfig
3107  create mode 100644 drivers/media/i2c/soc_camera/Makefile
3108  rename drivers/media/{video => i2c/soc_camera}/imx074.c (95%)
3109  rename drivers/media/{video => i2c/soc_camera}/mt9m001.c (97%)
3110  rename drivers/media/{video => i2c/soc_camera}/mt9m111.c (96%)
3111  rename drivers/media/{video => i2c/soc_camera}/mt9t031.c (98%)
3112  rename drivers/media/{video => i2c/soc_camera}/mt9t112.c (98%)
3113  rename drivers/media/{video => i2c/soc_camera}/mt9v022.c (94%)
3114  rename drivers/media/{video => i2c/soc_camera}/ov2640.c (98%)
3115  rename drivers/media/{video => i2c/soc_camera}/ov5642.c (98%)
3116  rename drivers/media/{video => i2c/soc_camera}/ov6650.c (98%)
3117  rename drivers/media/{video => i2c/soc_camera}/ov772x.c (81%)
3118  rename drivers/media/{video => i2c/soc_camera}/ov9640.c (97%)
3119  rename drivers/media/{video => i2c/soc_camera}/ov9640.h (100%)
3120  rename drivers/media/{video => i2c/soc_camera}/ov9740.c (97%)
3121  rename drivers/media/{video => i2c/soc_camera}/rj54n1cb0c.c (98%)
3122  rename drivers/media/{video => i2c/soc_camera}/sh_mobile_csi2.c (100%)
3123  rename drivers/media/{video => i2c/soc_camera}/tw9910.c (98%)
3124  rename drivers/media/{video => i2c}/sr030pc30.c (100%)
3125  rename drivers/media/{video => i2c}/tcm825x.c (99%)
3126  rename drivers/media/{video => i2c}/tcm825x.h (99%)
3127  rename drivers/media/{video => i2c}/tda7432.c (100%)
3128  rename drivers/media/{video => i2c}/tda9840.c (100%)
3129  rename drivers/media/{video => i2c}/tea6415c.c (100%)
3130  rename drivers/media/{video => i2c}/tea6415c.h (100%)
3131  rename drivers/media/{video => i2c}/tea6420.c (100%)
3132  rename drivers/media/{video => i2c}/tea6420.h (100%)
3133  rename drivers/media/{video => i2c}/ths7303.c (100%)
3134  rename drivers/media/{video => i2c}/tlv320aic23b.c (100%)
3135  rename drivers/media/{video => i2c}/tvaudio.c (100%)
3136  rename drivers/media/{video => i2c}/tveeprom.c (100%)
3137  rename drivers/media/{video => i2c}/tvp514x.c (99%)
3138  rename drivers/media/{video => i2c}/tvp514x_regs.h (99%)
3139  rename drivers/media/{video => i2c}/tvp5150.c (100%)
3140  rename drivers/media/{video => i2c}/tvp5150_reg.h (100%)
3141  rename drivers/media/{video => i2c}/tvp7002.c (100%)
3142  rename drivers/media/{video => i2c}/tvp7002_reg.h (100%)
3143  rename drivers/media/{video => i2c}/upd64031a.c (100%)
3144  rename drivers/media/{video => i2c}/upd64083.c (100%)
3145  rename drivers/media/{video => i2c}/vp27smpx.c (100%)
3146  rename drivers/media/{video => i2c}/vpx3220.c (100%)
3147  rename drivers/media/{video => i2c}/vs6624.c (100%)
3148  rename drivers/media/{video => i2c}/vs6624_regs.h (100%)
3149  rename drivers/media/{video => i2c}/wm8739.c (100%)
3150  rename drivers/media/{video => i2c}/wm8775.c (100%)
3151  create mode 100644 drivers/media/mmc/Kconfig
3152  create mode 100644 drivers/media/mmc/Makefile
3153  create mode 100644 drivers/media/mmc/siano/Kconfig
3154  create mode 100644 drivers/media/mmc/siano/Makefile
3155  rename drivers/media/{dvb => mmc}/siano/smssdio.c (100%)
3156  create mode 100644 drivers/media/parport/Kconfig
3157  create mode 100644 drivers/media/parport/Makefile
3158  rename drivers/media/{video => parport}/bw-qcam.c (100%)
3159  rename drivers/media/{video => parport}/c-qcam.c (100%)
3160  rename drivers/media/{video => parport}/pms.c (100%)
3161  rename drivers/media/{video => parport}/w9966.c (100%)
3162  create mode 100644 drivers/media/pci/Kconfig
3163  create mode 100644 drivers/media/pci/Makefile
3164  create mode 100644 drivers/media/pci/b2c2/Kconfig
3165  create mode 100644 drivers/media/pci/b2c2/Makefile
3166  rename drivers/media/{dvb => pci}/b2c2/flexcop-dma.c (100%)
3167  rename drivers/media/{dvb => pci}/b2c2/flexcop-pci.c (100%)
3168  rename drivers/media/{dvb => pci}/bt8xx/Kconfig (52%)
3169  create mode 100644 drivers/media/pci/bt8xx/Makefile
3170  rename drivers/media/{video => pci}/bt8xx/bt848.h (100%)
3171  rename drivers/media/{dvb => pci}/bt8xx/bt878.c (100%)
3172  rename drivers/media/{dvb => pci}/bt8xx/bt878.h (100%)
3173  rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.c (100%)
3174  rename drivers/media/{video => pci}/bt8xx/bttv-audio-hook.h (100%)
3175  rename drivers/media/{video => pci}/bt8xx/bttv-cards.c (100%)
3176  rename drivers/media/{video => pci}/bt8xx/bttv-driver.c (100%)
3177  rename drivers/media/{video => pci}/bt8xx/bttv-gpio.c (100%)
3178  rename drivers/media/{video => pci}/bt8xx/bttv-i2c.c (100%)
3179  rename drivers/media/{video => pci}/bt8xx/bttv-if.c (100%)
3180  rename drivers/media/{video => pci}/bt8xx/bttv-input.c (100%)
3181  rename drivers/media/{video => pci}/bt8xx/bttv-risc.c (100%)
3182  rename drivers/media/{video => pci}/bt8xx/bttv-vbi.c (100%)
3183  rename drivers/media/{video => pci}/bt8xx/bttv.h (100%)
3184  rename drivers/media/{video => pci}/bt8xx/bttvp.h (100%)
3185  rename drivers/media/{dvb => pci}/bt8xx/dst.c (100%)
3186  rename drivers/media/{dvb => pci}/bt8xx/dst_ca.c (99%)
3187  rename drivers/media/{dvb => pci}/bt8xx/dst_ca.h (100%)
3188  rename drivers/media/{dvb => pci}/bt8xx/dst_common.h (100%)
3189  rename drivers/media/{dvb => pci}/bt8xx/dst_priv.h (100%)
3190  rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.c (100%)
3191  rename drivers/media/{dvb => pci}/bt8xx/dvb-bt8xx.h (100%)
3192  rename drivers/media/{video => pci}/cx18/Kconfig (100%)
3193  rename drivers/media/{video => pci}/cx18/Makefile (78%)
3194  rename drivers/media/{video => pci}/cx18/cx18-alsa-main.c (100%)
3195  rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.c (100%)
3196  rename drivers/media/{video => pci}/cx18/cx18-alsa-mixer.h (100%)
3197  rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.c (100%)
3198  rename drivers/media/{video => pci}/cx18/cx18-alsa-pcm.h (100%)
3199  rename drivers/media/{video => pci}/cx18/cx18-alsa.h (100%)
3200  rename drivers/media/{video => pci}/cx18/cx18-audio.c (100%)
3201  rename drivers/media/{video => pci}/cx18/cx18-audio.h (100%)
3202  rename drivers/media/{video => pci}/cx18/cx18-av-audio.c (100%)
3203  rename drivers/media/{video => pci}/cx18/cx18-av-core.c (100%)
3204  rename drivers/media/{video => pci}/cx18/cx18-av-core.h (100%)
3205  rename drivers/media/{video => pci}/cx18/cx18-av-firmware.c (99%)
3206  rename drivers/media/{video => pci}/cx18/cx18-av-vbi.c (100%)
3207  rename drivers/media/{video => pci}/cx18/cx18-cards.c (100%)
3208  rename drivers/media/{video => pci}/cx18/cx18-cards.h (100%)
3209  rename drivers/media/{video => pci}/cx18/cx18-controls.c (100%)
3210  rename drivers/media/{video => pci}/cx18/cx18-controls.h (100%)
3211  rename drivers/media/{video => pci}/cx18/cx18-driver.c (99%)
3212  rename drivers/media/{video => pci}/cx18/cx18-driver.h (100%)
3213  rename drivers/media/{video => pci}/cx18/cx18-dvb.c (99%)
3214  rename drivers/media/{video => pci}/cx18/cx18-dvb.h (100%)
3215  rename drivers/media/{video => pci}/cx18/cx18-fileops.c (100%)
3216  rename drivers/media/{video => pci}/cx18/cx18-fileops.h (100%)
3217  rename drivers/media/{video => pci}/cx18/cx18-firmware.c (98%)
3218  rename drivers/media/{video => pci}/cx18/cx18-firmware.h (100%)
3219  rename drivers/media/{video => pci}/cx18/cx18-gpio.c (100%)
3220  rename drivers/media/{video => pci}/cx18/cx18-gpio.h (100%)
3221  rename drivers/media/{video => pci}/cx18/cx18-i2c.c (100%)
3222  rename drivers/media/{video => pci}/cx18/cx18-i2c.h (100%)
3223  rename drivers/media/{video => pci}/cx18/cx18-io.c (100%)
3224  rename drivers/media/{video => pci}/cx18/cx18-io.h (100%)
3225  rename drivers/media/{video => pci}/cx18/cx18-ioctl.c (100%)
3226  rename drivers/media/{video => pci}/cx18/cx18-ioctl.h (100%)
3227  rename drivers/media/{video => pci}/cx18/cx18-irq.c (100%)
3228  rename drivers/media/{video => pci}/cx18/cx18-irq.h (100%)
3229  rename drivers/media/{video => pci}/cx18/cx18-mailbox.c (100%)
3230  rename drivers/media/{video => pci}/cx18/cx18-mailbox.h (100%)
3231  rename drivers/media/{video => pci}/cx18/cx18-queue.c (100%)
3232  rename drivers/media/{video => pci}/cx18/cx18-queue.h (100%)
3233  rename drivers/media/{video => pci}/cx18/cx18-scb.c (100%)
3234  rename drivers/media/{video => pci}/cx18/cx18-scb.h (100%)
3235  rename drivers/media/{video => pci}/cx18/cx18-streams.c (100%)
3236  rename drivers/media/{video => pci}/cx18/cx18-streams.h (100%)
3237  rename drivers/media/{video => pci}/cx18/cx18-vbi.c (100%)
3238  rename drivers/media/{video => pci}/cx18/cx18-vbi.h (100%)
3239  rename drivers/media/{video => pci}/cx18/cx18-version.h (100%)
3240  rename drivers/media/{video => pci}/cx18/cx18-video.c (100%)
3241  rename drivers/media/{video => pci}/cx18/cx18-video.h (100%)
3242  rename drivers/media/{video => pci}/cx18/cx23418.h (100%)
3243  rename drivers/media/{video => pci}/cx23885/Kconfig (100%)
3244  rename drivers/media/{video => pci}/cx23885/Makefile (72%)
3245  rename drivers/media/{video => pci}/cx23885/altera-ci.c (100%)
3246  rename drivers/media/{video => pci}/cx23885/altera-ci.h (100%)
3247  rename drivers/media/{video => pci}/cx23885/cimax2.c (100%)
3248  rename drivers/media/{video => pci}/cx23885/cimax2.h (100%)
3249  rename drivers/media/{video => pci}/cx23885/cx23885-417.c (99%)
3250  rename drivers/media/{video => pci}/cx23885/cx23885-alsa.c (100%)
3251  rename drivers/media/{video => pci}/cx23885/cx23885-av.c (100%)
3252  rename drivers/media/{video => pci}/cx23885/cx23885-av.h (100%)
3253  rename drivers/media/{video => pci}/cx23885/cx23885-cards.c (99%)
3254  rename drivers/media/{video => pci}/cx23885/cx23885-core.c (100%)
3255  rename drivers/media/{video => pci}/cx23885/cx23885-dvb.c (99%)
3256  rename drivers/media/{video => pci}/cx23885/cx23885-f300.c (100%)
3257  rename drivers/media/{video => pci}/cx23885/cx23885-f300.h (100%)
3258  rename drivers/media/{video => pci}/cx23885/cx23885-i2c.c (100%)
3259  rename drivers/media/{video => pci}/cx23885/cx23885-input.c (96%)
3260  rename drivers/media/{video => pci}/cx23885/cx23885-input.h (100%)
3261  rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.c (100%)
3262  rename drivers/media/{video => pci}/cx23885/cx23885-ioctl.h (100%)
3263  rename drivers/media/{video => pci}/cx23885/cx23885-ir.c (100%)
3264  rename drivers/media/{video => pci}/cx23885/cx23885-ir.h (100%)
3265  rename drivers/media/{video => pci}/cx23885/cx23885-reg.h (100%)
3266  rename drivers/media/{video => pci}/cx23885/cx23885-vbi.c (100%)
3267  rename drivers/media/{video => pci}/cx23885/cx23885-video.c (100%)
3268  rename drivers/media/{video => pci}/cx23885/cx23885.h (100%)
3269  rename drivers/media/{video => pci}/cx23885/cx23888-ir.c (100%)
3270  rename drivers/media/{video => pci}/cx23885/cx23888-ir.h (100%)
3271  rename drivers/media/{video => pci}/cx23885/netup-eeprom.c (100%)
3272  rename drivers/media/{video => pci}/cx23885/netup-eeprom.h (100%)
3273  rename drivers/media/{video => pci}/cx23885/netup-init.c (100%)
3274  rename drivers/media/{video => pci}/cx23885/netup-init.h (100%)
3275  rename drivers/media/{video => pci}/cx25821/Kconfig (100%)
3276  rename drivers/media/{video => pci}/cx25821/Makefile (67%)
3277  rename drivers/media/{video => pci}/cx25821/cx25821-alsa.c (100%)
3278  rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.c (100%)
3279  rename drivers/media/{video => pci}/cx25821/cx25821-audio-upstream.h (100%)
3280  rename drivers/media/{video => pci}/cx25821/cx25821-audio.h (100%)
3281  rename drivers/media/{video => pci}/cx25821/cx25821-biffuncs.h (100%)
3282  rename drivers/media/{video => pci}/cx25821/cx25821-cards.c (100%)
3283  rename drivers/media/{video => pci}/cx25821/cx25821-core.c (100%)
3284  rename drivers/media/{video => pci}/cx25821/cx25821-gpio.c (100%)
3285  rename drivers/media/{video => pci}/cx25821/cx25821-i2c.c (100%)
3286  rename drivers/media/{video => pci}/cx25821/cx25821-medusa-defines.h (100%)
3287  rename drivers/media/{video => pci}/cx25821/cx25821-medusa-reg.h (100%)
3288  rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.c (100%)
3289  rename drivers/media/{video => pci}/cx25821/cx25821-medusa-video.h (100%)
3290  rename drivers/media/{video => pci}/cx25821/cx25821-reg.h (100%)
3291  rename drivers/media/{video => pci}/cx25821/cx25821-sram.h (100%)
3292  rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.c (100%)
3293  rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream-ch2.h (100%)
3294  rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.c (100%)
3295  rename drivers/media/{video => pci}/cx25821/cx25821-video-upstream.h (100%)
3296  rename drivers/media/{video => pci}/cx25821/cx25821-video.c (100%)
3297  rename drivers/media/{video => pci}/cx25821/cx25821-video.h (100%)
3298  rename drivers/media/{video => pci}/cx25821/cx25821.h (100%)
3299  rename drivers/media/{video => pci}/cx88/Kconfig (100%)
3300  rename drivers/media/{video => pci}/cx88/Makefile (73%)
3301  rename drivers/media/{video => pci}/cx88/cx88-alsa.c (99%)
3302  rename drivers/media/{video => pci}/cx88/cx88-blackbird.c (100%)
3303  rename drivers/media/{video => pci}/cx88/cx88-cards.c (100%)
3304  rename drivers/media/{video => pci}/cx88/cx88-core.c (99%)
3305  rename drivers/media/{video => pci}/cx88/cx88-dsp.c (100%)
3306  rename drivers/media/{video => pci}/cx88/cx88-dvb.c (99%)
3307  rename drivers/media/{video => pci}/cx88/cx88-i2c.c (100%)
3308  rename drivers/media/{video => pci}/cx88/cx88-input.c (100%)
3309  rename drivers/media/{video => pci}/cx88/cx88-mpeg.c (100%)
3310  rename drivers/media/{video => pci}/cx88/cx88-reg.h (100%)
3311  rename drivers/media/{video => pci}/cx88/cx88-tvaudio.c (100%)
3312  rename drivers/media/{video => pci}/cx88/cx88-vbi.c (100%)
3313  rename drivers/media/{video => pci}/cx88/cx88-video.c (100%)
3314  rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.c (100%)
3315  rename drivers/media/{video => pci}/cx88/cx88-vp3054-i2c.h (100%)
3316  rename drivers/media/{video => pci}/cx88/cx88.h (99%)
3317  rename drivers/media/{dvb => pci}/ddbridge/Kconfig (100%)
3318  rename drivers/media/{dvb => pci}/ddbridge/Makefile (61%)
3319  rename drivers/media/{dvb => pci}/ddbridge/ddbridge-core.c (100%)
3320  rename drivers/media/{dvb => pci}/ddbridge/ddbridge-regs.h (100%)
3321  rename drivers/media/{dvb => pci}/ddbridge/ddbridge.h (100%)
3322  rename drivers/media/{dvb => pci}/dm1105/Kconfig (100%)
3323  create mode 100644 drivers/media/pci/dm1105/Makefile
3324  rename drivers/media/{dvb => pci}/dm1105/dm1105.c (100%)
3325  rename drivers/media/{video => pci}/ivtv/Kconfig (100%)
3326  rename drivers/media/{video => pci}/ivtv/Makefile (61%)
3327  rename drivers/media/{video => pci}/ivtv/ivtv-cards.c (100%)
3328  rename drivers/media/{video => pci}/ivtv/ivtv-cards.h (100%)
3329  rename drivers/media/{video => pci}/ivtv/ivtv-controls.c (100%)
3330  rename drivers/media/{video => pci}/ivtv/ivtv-controls.h (100%)
3331  rename drivers/media/{video => pci}/ivtv/ivtv-driver.c (100%)
3332  rename drivers/media/{video => pci}/ivtv/ivtv-driver.h (100%)
3333  rename drivers/media/{video => pci}/ivtv/ivtv-fileops.c (96%)
3334  rename drivers/media/{video => pci}/ivtv/ivtv-fileops.h (100%)
3335  rename drivers/media/{video => pci}/ivtv/ivtv-firmware.c (98%)
3336  rename drivers/media/{video => pci}/ivtv/ivtv-firmware.h (100%)
3337  rename drivers/media/{video => pci}/ivtv/ivtv-gpio.c (100%)
3338  rename drivers/media/{video => pci}/ivtv/ivtv-gpio.h (100%)
3339  rename drivers/media/{video => pci}/ivtv/ivtv-i2c.c (100%)
3340  rename drivers/media/{video => pci}/ivtv/ivtv-i2c.h (100%)
3341  rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.c (100%)
3342  rename drivers/media/{video => pci}/ivtv/ivtv-ioctl.h (100%)
3343  rename drivers/media/{video => pci}/ivtv/ivtv-irq.c (100%)
3344  rename drivers/media/{video => pci}/ivtv/ivtv-irq.h (100%)
3345  rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.c (100%)
3346  rename drivers/media/{video => pci}/ivtv/ivtv-mailbox.h (100%)
3347  rename drivers/media/{video => pci}/ivtv/ivtv-queue.c (100%)
3348  rename drivers/media/{video => pci}/ivtv/ivtv-queue.h (100%)
3349  rename drivers/media/{video => pci}/ivtv/ivtv-routing.c (100%)
3350  rename drivers/media/{video => pci}/ivtv/ivtv-routing.h (100%)
3351  rename drivers/media/{video => pci}/ivtv/ivtv-streams.c (99%)
3352  rename drivers/media/{video => pci}/ivtv/ivtv-streams.h (100%)
3353  rename drivers/media/{video => pci}/ivtv/ivtv-udma.c (100%)
3354  rename drivers/media/{video => pci}/ivtv/ivtv-udma.h (100%)
3355  rename drivers/media/{video => pci}/ivtv/ivtv-vbi.c (100%)
3356  rename drivers/media/{video => pci}/ivtv/ivtv-vbi.h (100%)
3357  rename drivers/media/{video => pci}/ivtv/ivtv-version.h (100%)
3358  rename drivers/media/{video => pci}/ivtv/ivtv-yuv.c (100%)
3359  rename drivers/media/{video => pci}/ivtv/ivtv-yuv.h (100%)
3360  rename drivers/media/{video => pci}/ivtv/ivtvfb.c (100%)
3361  rename drivers/media/{dvb => pci}/mantis/Kconfig (100%)
3362  rename drivers/media/{dvb => pci}/mantis/Makefile (88%)
3363  rename drivers/media/{dvb => pci}/mantis/hopper_cards.c (100%)
3364  rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.c (100%)
3365  rename drivers/media/{dvb => pci}/mantis/hopper_vp3028.h (100%)
3366  rename drivers/media/{dvb => pci}/mantis/mantis_ca.c (100%)
3367  rename drivers/media/{dvb => pci}/mantis/mantis_ca.h (100%)
3368  rename drivers/media/{dvb => pci}/mantis/mantis_cards.c (99%)
3369  rename drivers/media/{dvb => pci}/mantis/mantis_common.h (100%)
3370  rename drivers/media/{dvb => pci}/mantis/mantis_core.c (99%)
3371  rename drivers/media/{dvb => pci}/mantis/mantis_core.h (100%)
3372  rename drivers/media/{dvb => pci}/mantis/mantis_dma.c (100%)
3373  rename drivers/media/{dvb => pci}/mantis/mantis_dma.h (100%)
3374  rename drivers/media/{dvb => pci}/mantis/mantis_dvb.c (98%)
3375  rename drivers/media/{dvb => pci}/mantis/mantis_dvb.h (100%)
3376  rename drivers/media/{dvb => pci}/mantis/mantis_evm.c (100%)
3377  rename drivers/media/{dvb => pci}/mantis/mantis_hif.c (100%)
3378  rename drivers/media/{dvb => pci}/mantis/mantis_hif.h (100%)
3379  rename drivers/media/{dvb => pci}/mantis/mantis_i2c.c (100%)
3380  rename drivers/media/{dvb => pci}/mantis/mantis_i2c.h (100%)
3381  rename drivers/media/{dvb => pci}/mantis/mantis_input.c (100%)
3382  rename drivers/media/{dvb => pci}/mantis/mantis_ioc.c (100%)
3383  rename drivers/media/{dvb => pci}/mantis/mantis_ioc.h (100%)
3384  rename drivers/media/{dvb => pci}/mantis/mantis_link.h (100%)
3385  rename drivers/media/{dvb => pci}/mantis/mantis_pci.c (100%)
3386  rename drivers/media/{dvb => pci}/mantis/mantis_pci.h (100%)
3387  rename drivers/media/{dvb => pci}/mantis/mantis_pcmcia.c (100%)
3388  rename drivers/media/{dvb => pci}/mantis/mantis_reg.h (100%)
3389  rename drivers/media/{dvb => pci}/mantis/mantis_uart.c (100%)
3390  rename drivers/media/{dvb => pci}/mantis/mantis_uart.h (100%)
3391  rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.c (100%)
3392  rename drivers/media/{dvb => pci}/mantis/mantis_vp1033.h (100%)
3393  rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.c (100%)
3394  rename drivers/media/{dvb => pci}/mantis/mantis_vp1034.h (100%)
3395  rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.c (100%)
3396  rename drivers/media/{dvb => pci}/mantis/mantis_vp1041.h (100%)
3397  rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.c (100%)
3398  rename drivers/media/{dvb => pci}/mantis/mantis_vp2033.h (100%)
3399  rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.c (100%)
3400  rename drivers/media/{dvb => pci}/mantis/mantis_vp2040.h (100%)
3401  rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.c (100%)
3402  rename drivers/media/{dvb => pci}/mantis/mantis_vp3028.h (100%)
3403  rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.c (100%)
3404  rename drivers/media/{dvb => pci}/mantis/mantis_vp3030.h (100%)
3405  create mode 100644 drivers/media/pci/meye/Kconfig
3406  create mode 100644 drivers/media/pci/meye/Makefile
3407  rename drivers/media/{video => pci/meye}/meye.c (100%)
3408  rename drivers/media/{video => pci/meye}/meye.h (100%)
3409  rename drivers/media/{dvb => pci}/ngene/Kconfig (100%)
3410  rename drivers/media/{dvb => pci}/ngene/Makefile (63%)
3411  rename drivers/media/{dvb => pci}/ngene/ngene-cards.c (71%)
3412  rename drivers/media/{dvb => pci}/ngene/ngene-core.c (98%)
3413  rename drivers/media/{dvb => pci}/ngene/ngene-dvb.c (100%)
3414  rename drivers/media/{dvb => pci}/ngene/ngene-i2c.c (100%)
3415  rename drivers/media/{dvb => pci}/ngene/ngene.h (100%)
3416  rename drivers/media/{dvb => pci}/pluto2/Kconfig (100%)
3417  create mode 100644 drivers/media/pci/pluto2/Makefile
3418  rename drivers/media/{dvb => pci}/pluto2/pluto2.c (100%)
3419  rename drivers/media/{dvb => pci}/pt1/Kconfig (100%)
3420  rename drivers/media/{dvb => pci}/pt1/Makefile (56%)
3421  rename drivers/media/{dvb => pci}/pt1/pt1.c (100%)
3422  rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.c (100%)
3423  rename drivers/media/{dvb => pci}/pt1/va1j5jf8007s.h (100%)
3424  rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.c (100%)
3425  rename drivers/media/{dvb => pci}/pt1/va1j5jf8007t.h (100%)
3426  rename drivers/media/{video => pci}/saa7134/Kconfig (100%)
3427  rename drivers/media/{video => pci}/saa7134/Makefile (64%)
3428  rename drivers/media/{video => pci}/saa7134/saa6752hs.c (100%)
3429  rename drivers/media/{video => pci}/saa7134/saa7134-alsa.c (100%)
3430  rename drivers/media/{video => pci}/saa7134/saa7134-cards.c (100%)
3431  rename drivers/media/{video => pci}/saa7134/saa7134-core.c (100%)
3432  rename drivers/media/{video => pci}/saa7134/saa7134-dvb.c (99%)
3433  rename drivers/media/{video => pci}/saa7134/saa7134-empress.c (100%)
3434  rename drivers/media/{video => pci}/saa7134/saa7134-i2c.c (100%)
3435  rename drivers/media/{video => pci}/saa7134/saa7134-input.c (99%)
3436  rename drivers/media/{video => pci}/saa7134/saa7134-reg.h (100%)
3437  rename drivers/media/{video => pci}/saa7134/saa7134-ts.c (100%)
3438  rename drivers/media/{video => pci}/saa7134/saa7134-tvaudio.c (100%)
3439  rename drivers/media/{video => pci}/saa7134/saa7134-vbi.c (100%)
3440  rename drivers/media/{video => pci}/saa7134/saa7134-video.c (100%)
3441  rename drivers/media/{video => pci}/saa7134/saa7134.h (99%)
3442  create mode 100644 drivers/media/pci/saa7146/Kconfig
3443  create mode 100644 drivers/media/pci/saa7146/Makefile
3444  rename drivers/media/{video => pci/saa7146}/hexium_gemini.c (100%)
3445  rename drivers/media/{video => pci/saa7146}/hexium_orion.c (100%)
3446  rename drivers/media/{video => pci/saa7146}/mxb.c (100%)
3447  rename drivers/media/{video => pci}/saa7164/Kconfig (100%)
3448  rename drivers/media/{video => pci}/saa7164/Makefile (57%)
3449  rename drivers/media/{video => pci}/saa7164/saa7164-api.c (98%)
3450  rename drivers/media/{video => pci}/saa7164/saa7164-buffer.c (100%)
3451  rename drivers/media/{video => pci}/saa7164/saa7164-bus.c (100%)
3452  rename drivers/media/{video => pci}/saa7164/saa7164-cards.c (100%)
3453  rename drivers/media/{video => pci}/saa7164/saa7164-cmd.c (100%)
3454  rename drivers/media/{video => pci}/saa7164/saa7164-core.c (96%)
3455  rename drivers/media/{video => pci}/saa7164/saa7164-dvb.c (100%)
3456  rename drivers/media/{video => pci}/saa7164/saa7164-encoder.c (100%)
3457  rename drivers/media/{video => pci}/saa7164/saa7164-fw.c (100%)
3458  rename drivers/media/{video => pci}/saa7164/saa7164-i2c.c (100%)
3459  rename drivers/media/{video => pci}/saa7164/saa7164-reg.h (100%)
3460  rename drivers/media/{video => pci}/saa7164/saa7164-types.h (100%)
3461  rename drivers/media/{video => pci}/saa7164/saa7164-vbi.c (100%)
3462  rename drivers/media/{video => pci}/saa7164/saa7164.h (99%)
3463  create mode 100644 drivers/media/pci/sta2x11/Kconfig
3464  create mode 100644 drivers/media/pci/sta2x11/Makefile
3465  rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.c (100%)
3466  rename drivers/media/{video => pci/sta2x11}/sta2x11_vip.h (100%)
3467  rename drivers/media/{dvb => pci}/ttpci/Kconfig (100%)
3468  rename drivers/media/{dvb => pci}/ttpci/Makefile (82%)
3469  rename drivers/media/{dvb => pci}/ttpci/av7110.c (100%)
3470  rename drivers/media/{dvb => pci}/ttpci/av7110.h (100%)
3471  rename drivers/media/{dvb => pci}/ttpci/av7110_av.c (100%)
3472  rename drivers/media/{dvb => pci}/ttpci/av7110_av.h (100%)
3473  rename drivers/media/{dvb => pci}/ttpci/av7110_ca.c (100%)
3474  rename drivers/media/{dvb => pci}/ttpci/av7110_ca.h (100%)
3475  rename drivers/media/{dvb => pci}/ttpci/av7110_hw.c (100%)
3476  rename drivers/media/{dvb => pci}/ttpci/av7110_hw.h (100%)
3477  rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.c (100%)
3478  rename drivers/media/{dvb => pci}/ttpci/av7110_ipack.h (100%)
3479  rename drivers/media/{dvb => pci}/ttpci/av7110_ir.c (100%)
3480  rename drivers/media/{dvb => pci}/ttpci/av7110_v4l.c (100%)
3481  rename drivers/media/{dvb => pci}/ttpci/budget-av.c (100%)
3482  rename drivers/media/{dvb => pci}/ttpci/budget-ci.c (100%)
3483  rename drivers/media/{dvb => pci}/ttpci/budget-core.c (100%)
3484  rename drivers/media/{dvb => pci}/ttpci/budget-patch.c (100%)
3485  rename drivers/media/{dvb => pci}/ttpci/budget.c (91%)
3486  rename drivers/media/{dvb => pci}/ttpci/budget.h (100%)
3487  rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.c (100%)
3488  rename drivers/media/{dvb => pci}/ttpci/ttpci-eeprom.h (100%)
3489  rename drivers/media/{video => pci}/zoran/Kconfig (100%)
3490  rename drivers/media/{video => pci}/zoran/Makefile (100%)
3491  rename drivers/media/{video => pci}/zoran/videocodec.c (100%)
3492  rename drivers/media/{video => pci}/zoran/videocodec.h (100%)
3493  rename drivers/media/{video => pci}/zoran/zoran.h (100%)
3494  rename drivers/media/{video => pci}/zoran/zoran_card.c (100%)
3495  rename drivers/media/{video => pci}/zoran/zoran_card.h (100%)
3496  rename drivers/media/{video => pci}/zoran/zoran_device.c (100%)
3497  rename drivers/media/{video => pci}/zoran/zoran_device.h (100%)
3498  rename drivers/media/{video => pci}/zoran/zoran_driver.c (100%)
3499  rename drivers/media/{video => pci}/zoran/zoran_procfs.c (100%)
3500  rename drivers/media/{video => pci}/zoran/zoran_procfs.h (100%)
3501  rename drivers/media/{video => pci}/zoran/zr36016.c (100%)
3502  rename drivers/media/{video => pci}/zoran/zr36016.h (100%)
3503  rename drivers/media/{video => pci}/zoran/zr36050.c (100%)
3504  rename drivers/media/{video => pci}/zoran/zr36050.h (100%)
3505  rename drivers/media/{video => pci}/zoran/zr36057.h (100%)
3506  rename drivers/media/{video => pci}/zoran/zr36060.c (100%)
3507  rename drivers/media/{video => pci}/zoran/zr36060.h (100%)
3508  create mode 100644 drivers/media/platform/Kconfig
3509  create mode 100644 drivers/media/platform/Makefile
3510  rename drivers/media/{video => platform}/arv.c (100%)
3511  rename drivers/media/{video => platform}/atmel-isi.c (100%)
3512  rename drivers/media/{video => platform}/blackfin/Kconfig (100%)
3513  rename drivers/media/{video => platform}/blackfin/Makefile (100%)
3514  rename drivers/media/{video => platform}/blackfin/bfin_capture.c (98%)
3515  rename drivers/media/{video => platform}/blackfin/ppi.c (100%)
3516  create mode 100644 drivers/media/platform/coda.c
3517  create mode 100644 drivers/media/platform/coda.h
3518  rename drivers/media/{video => platform}/davinci/Kconfig (100%)
3519  rename drivers/media/{video => platform}/davinci/Makefile (100%)
3520  rename drivers/media/{video => platform}/davinci/ccdc_hw_device.h (100%)
3521  rename drivers/media/{video => platform}/davinci/dm355_ccdc.c (99%)
3522  rename drivers/media/{video => platform}/davinci/dm355_ccdc_regs.h (100%)
3523  rename drivers/media/{video => platform}/davinci/dm644x_ccdc.c (99%)
3524  rename drivers/media/{video => platform}/davinci/dm644x_ccdc_regs.h (100%)
3525  rename drivers/media/{video => platform}/davinci/isif.c (99%)
3526  rename drivers/media/{video => platform}/davinci/isif_regs.h (100%)
3527  rename drivers/media/{video => platform}/davinci/vpbe.c (100%)
3528  rename drivers/media/{video => platform}/davinci/vpbe_display.c (99%)
3529  rename drivers/media/{video => platform}/davinci/vpbe_osd.c (100%)
3530  rename drivers/media/{video => platform}/davinci/vpbe_osd_regs.h (100%)
3531  rename drivers/media/{video => platform}/davinci/vpbe_venc.c (100%)
3532  rename drivers/media/{video => platform}/davinci/vpbe_venc_regs.h (100%)
3533  rename drivers/media/{video => platform}/davinci/vpfe_capture.c (99%)
3534  rename drivers/media/{video => platform}/davinci/vpif.c (99%)
3535  rename drivers/media/{video => platform}/davinci/vpif.h (100%)
3536  rename drivers/media/{video => platform}/davinci/vpif_capture.c (99%)
3537  rename drivers/media/{video => platform}/davinci/vpif_capture.h (100%)
3538  rename drivers/media/{video => platform}/davinci/vpif_display.c (98%)
3539  rename drivers/media/{video => platform}/davinci/vpif_display.h (100%)
3540  rename drivers/media/{video => platform}/davinci/vpss.c (99%)
3541  rename drivers/media/{video => platform}/fsl-viu.c (98%)
3542  rename drivers/media/{video => platform}/indycam.c (100%)
3543  rename drivers/media/{video => platform}/indycam.h (100%)
3544  create mode 100644 drivers/media/platform/m2m-deinterlace.c
3545  rename drivers/media/{video => platform}/marvell-ccic/Kconfig (100%)
3546  rename drivers/media/{video => platform}/marvell-ccic/Makefile (100%)
3547  rename drivers/media/{video => platform}/marvell-ccic/cafe-driver.c (100%)
3548  rename drivers/media/{video => platform}/marvell-ccic/mcam-core.c (100%)
3549  rename drivers/media/{video => platform}/marvell-ccic/mcam-core.h (100%)
3550  rename drivers/media/{video => platform}/marvell-ccic/mmp-driver.c (100%)
3551  rename drivers/media/{video => platform}/mem2mem_testdev.c (97%)
3552  rename drivers/media/{video => platform}/mx1_camera.c (99%)
3553  rename drivers/media/{video => platform}/mx2_camera.c (95%)
3554  rename drivers/media/{video => platform}/mx2_emmaprp.c (94%)
3555  rename drivers/media/{video => platform}/mx3_camera.c (98%)
3556  rename drivers/media/{video => platform}/omap/Kconfig (100%)
3557  rename drivers/media/{video => platform}/omap/Makefile (100%)
3558  rename drivers/media/{video => platform}/omap/omap_vout.c (100%)
3559  rename drivers/media/{video => platform}/omap/omap_vout_vrfb.c (100%)
3560  rename drivers/media/{video => platform}/omap/omap_vout_vrfb.h (100%)
3561  rename drivers/media/{video => platform}/omap/omap_voutdef.h (100%)
3562  rename drivers/media/{video => platform}/omap/omap_voutlib.c (100%)
3563  rename drivers/media/{video => platform}/omap/omap_voutlib.h (100%)
3564  rename drivers/media/{video => platform}/omap1_camera.c (99%)
3565  rename drivers/media/{video => platform}/omap24xxcam-dma.c (99%)
3566  rename drivers/media/{video => platform}/omap24xxcam.c (99%)
3567  rename drivers/media/{video => platform}/omap24xxcam.h (99%)
3568  rename drivers/media/{video => platform}/omap3isp/Makefile (100%)
3569  rename drivers/media/{video => platform}/omap3isp/cfa_coef_table.h (91%)
3570  rename drivers/media/{video => platform}/omap3isp/gamma_table.h (100%)
3571  rename drivers/media/{video => platform}/omap3isp/isp.c (98%)
3572  rename drivers/media/{video => platform}/omap3isp/isp.h (97%)
3573  rename drivers/media/{video => platform}/omap3isp/ispccdc.c (94%)
3574  rename drivers/media/{video => platform}/omap3isp/ispccdc.h (83%)
3575  rename drivers/media/{video => platform}/omap3isp/ispccp2.c (100%)
3576  rename drivers/media/{video => platform}/omap3isp/ispccp2.h (100%)
3577  rename drivers/media/{video => platform}/omap3isp/ispcsi2.c (98%)
3578  rename drivers/media/{video => platform}/omap3isp/ispcsi2.h (100%)
3579  rename drivers/media/{video => platform}/omap3isp/ispcsiphy.c (100%)
3580  rename drivers/media/{video => platform}/omap3isp/ispcsiphy.h (100%)
3581  rename drivers/media/{video => platform}/omap3isp/isph3a.h (100%)
3582  rename drivers/media/{video => platform}/omap3isp/isph3a_aewb.c (96%)
3583  rename drivers/media/{video => platform}/omap3isp/isph3a_af.c (96%)
3584  rename drivers/media/{video => platform}/omap3isp/isphist.c (98%)
3585  rename drivers/media/{video => platform}/omap3isp/isphist.h (100%)
3586  rename drivers/media/{video => platform}/omap3isp/isppreview.c (89%)
3587  rename drivers/media/{video => platform}/omap3isp/isppreview.h (99%)
3588  rename drivers/media/{video => platform}/omap3isp/ispqueue.c (98%)
3589  rename drivers/media/{video => platform}/omap3isp/ispqueue.h (100%)
3590  rename drivers/media/{video => platform}/omap3isp/ispreg.h (100%)
3591  rename drivers/media/{video => platform}/omap3isp/ispresizer.c (99%)
3592  rename drivers/media/{video => platform}/omap3isp/ispresizer.h (100%)
3593  rename drivers/media/{video => platform}/omap3isp/ispstat.c (100%)
3594  rename drivers/media/{video => platform}/omap3isp/ispstat.h (100%)
3595  rename drivers/media/{video => platform}/omap3isp/ispvideo.c (96%)
3596  rename drivers/media/{video => platform}/omap3isp/ispvideo.h (97%)
3597  rename drivers/media/{video => platform}/omap3isp/luma_enhance_table.h (100%)
3598  rename drivers/media/{video => platform}/omap3isp/noise_filter_table.h (100%)
3599  rename drivers/media/{video => platform}/pxa_camera.c (100%)
3600  rename drivers/media/{video => platform}/s5p-fimc/Kconfig (100%)
3601  rename drivers/media/{video => platform}/s5p-fimc/Makefile (100%)
3602  rename drivers/media/{video => platform}/s5p-fimc/fimc-capture.c (100%)
3603  rename drivers/media/{video => platform}/s5p-fimc/fimc-core.c (100%)
3604  rename drivers/media/{video => platform}/s5p-fimc/fimc-core.h (100%)
3605  rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.c (100%)
3606  rename drivers/media/{video => platform}/s5p-fimc/fimc-lite-reg.h (100%)
3607  rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.c (100%)
3608  rename drivers/media/{video => platform}/s5p-fimc/fimc-lite.h (100%)
3609  rename drivers/media/{video => platform}/s5p-fimc/fimc-m2m.c (100%)
3610  rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.c (100%)
3611  rename drivers/media/{video => platform}/s5p-fimc/fimc-mdevice.h (100%)
3612  rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.c (100%)
3613  rename drivers/media/{video => platform}/s5p-fimc/fimc-reg.h (100%)
3614  rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.c (100%)
3615  rename drivers/media/{video => platform}/s5p-fimc/mipi-csis.h (100%)
3616  rename drivers/media/{video => platform}/s5p-g2d/Makefile (100%)
3617  rename drivers/media/{video => platform}/s5p-g2d/g2d-hw.c (100%)
3618  rename drivers/media/{video => platform}/s5p-g2d/g2d-regs.h (100%)
3619  rename drivers/media/{video => platform}/s5p-g2d/g2d.c (97%)
3620  rename drivers/media/{video => platform}/s5p-g2d/g2d.h (100%)
3621  rename drivers/media/{video => platform}/s5p-jpeg/Makefile (100%)
3622  rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.c (98%)
3623  rename drivers/media/{video => platform}/s5p-jpeg/jpeg-core.h (98%)
3624  rename drivers/media/{video => platform}/s5p-jpeg/jpeg-hw.h (99%)
3625  rename drivers/media/{video => platform}/s5p-jpeg/jpeg-regs.h (98%)
3626  rename drivers/media/{video => platform}/s5p-mfc/Makefile (100%)
3627  rename drivers/media/{video => platform}/s5p-mfc/regs-mfc.h (100%)
3628  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc.c (98%)
3629  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.c (98%)
3630  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_cmd.h (93%)
3631  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_common.h (100%)
3632  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.c (99%)
3633  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_ctrl.h (93%)
3634  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_debug.h (95%)
3635  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.c (99%)
3636  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_dec.h (93%)
3637  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.c (99%)
3638  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_enc.h (93%)
3639  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.c (97%)
3640  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_intr.h (93%)
3641  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.c (99%)
3642  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_opr.h (98%)
3643  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.c (98%)
3644  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_pm.h (92%)
3645  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.c (96%)
3646  rename drivers/media/{video => platform}/s5p-mfc/s5p_mfc_shm.h (98%)
3647  rename drivers/media/{video => platform}/s5p-tv/Kconfig (98%)
3648  rename drivers/media/{video => platform}/s5p-tv/Makefile (92%)
3649  rename drivers/media/{video => platform}/s5p-tv/hdmi_drv.c (99%)
3650  rename drivers/media/{video => platform}/s5p-tv/hdmiphy_drv.c (100%)
3651  rename drivers/media/{video => platform}/s5p-tv/mixer.h (100%)
3652  rename drivers/media/{video => platform}/s5p-tv/mixer_drv.c (98%)
3653  rename drivers/media/{video => platform}/s5p-tv/mixer_grp_layer.c (100%)
3654  rename drivers/media/{video => platform}/s5p-tv/mixer_reg.c (100%)
3655  rename drivers/media/{video => platform}/s5p-tv/mixer_video.c (97%)
3656  rename drivers/media/{video => platform}/s5p-tv/mixer_vp_layer.c (100%)
3657  rename drivers/media/{video => platform}/s5p-tv/regs-hdmi.h (100%)
3658  rename drivers/media/{video => platform}/s5p-tv/regs-mixer.h (100%)
3659  rename drivers/media/{video => platform}/s5p-tv/regs-sdo.h (97%)
3660  rename drivers/media/{video => platform}/s5p-tv/regs-vp.h (100%)
3661  rename drivers/media/{video => platform}/s5p-tv/sdo_drv.c (98%)
3662  rename drivers/media/{video => platform}/s5p-tv/sii9234_drv.c (97%)
3663  rename drivers/media/{video => platform}/sh_mobile_ceu_camera.c (100%)
3664  rename drivers/media/{video => platform}/sh_vou.c (98%)
3665  rename drivers/media/{video => platform}/soc_camera.c (92%)
3666  rename drivers/media/{video => platform}/soc_camera_platform.c (94%)
3667  rename drivers/media/{video => platform}/soc_mediabus.c (99%)
3668  rename drivers/media/{video => platform}/timblogiw.c (100%)
3669  rename drivers/media/{video => platform}/via-camera.c (100%)
3670  rename drivers/media/{video => platform}/via-camera.h (100%)
3671  rename drivers/media/{video => platform}/vino.c (100%)
3672  rename drivers/media/{video => platform}/vino.h (100%)
3673  rename drivers/media/{video => platform}/vivi.c (97%)
3674  create mode 100644 drivers/media/rc/ir-rx51.c
3675  create mode 100644 drivers/media/rc/ttusbir.c
3676  rename drivers/media/{common => }/tuners/Kconfig (100%)
3677  rename drivers/media/{common => }/tuners/Makefile (93%)
3678  rename drivers/media/{common => }/tuners/fc0011.c (100%)
3679  rename drivers/media/{common => }/tuners/fc0011.h (100%)
3680  rename drivers/media/{common => }/tuners/fc0012-priv.h (100%)
3681  rename drivers/media/{common => }/tuners/fc0012.c (100%)
3682  rename drivers/media/{common => }/tuners/fc0012.h (100%)
3683  rename drivers/media/{common => }/tuners/fc0013-priv.h (100%)
3684  rename drivers/media/{common => }/tuners/fc0013.c (100%)
3685  rename drivers/media/{common => }/tuners/fc0013.h (100%)
3686  rename drivers/media/{common => }/tuners/fc001x-common.h (100%)
3687  rename drivers/media/{common => }/tuners/max2165.c (100%)
3688  rename drivers/media/{common => }/tuners/max2165.h (100%)
3689  rename drivers/media/{common => }/tuners/max2165_priv.h (100%)
3690  rename drivers/media/{common => }/tuners/mc44s803.c (100%)
3691  rename drivers/media/{common => }/tuners/mc44s803.h (100%)
3692  rename drivers/media/{common => }/tuners/mc44s803_priv.h (100%)
3693  rename drivers/media/{common => }/tuners/mt2060.c (100%)
3694  rename drivers/media/{common => }/tuners/mt2060.h (100%)
3695  rename drivers/media/{common => }/tuners/mt2060_priv.h (100%)
3696  rename drivers/media/{common => }/tuners/mt2063.c (100%)
3697  rename drivers/media/{common => }/tuners/mt2063.h (100%)
3698  rename drivers/media/{common => }/tuners/mt20xx.c (100%)
3699  rename drivers/media/{common => }/tuners/mt20xx.h (100%)
3700  rename drivers/media/{common => }/tuners/mt2131.c (100%)
3701  rename drivers/media/{common => }/tuners/mt2131.h (100%)
3702  rename drivers/media/{common => }/tuners/mt2131_priv.h (100%)
3703  rename drivers/media/{common => }/tuners/mt2266.c (100%)
3704  rename drivers/media/{common => }/tuners/mt2266.h (100%)
3705  rename drivers/media/{common => }/tuners/mxl5005s.c (100%)
3706  rename drivers/media/{common => }/tuners/mxl5005s.h (100%)
3707  rename drivers/media/{common => }/tuners/mxl5007t.c (100%)
3708  rename drivers/media/{common => }/tuners/mxl5007t.h (100%)
3709  rename drivers/media/{common => }/tuners/qt1010.c (99%)
3710  rename drivers/media/{common => }/tuners/qt1010.h (100%)
3711  rename drivers/media/{common => }/tuners/qt1010_priv.h (100%)
3712  rename drivers/media/{common => }/tuners/tda18212.c (91%)
3713  rename drivers/media/{common => }/tuners/tda18212.h (100%)
3714  rename drivers/media/{common => }/tuners/tda18218.c (99%)
3715  rename drivers/media/{common => }/tuners/tda18218.h (100%)
3716  rename drivers/media/{common => }/tuners/tda18218_priv.h (100%)
3717  rename drivers/media/{common => }/tuners/tda18271-common.c (100%)
3718  rename drivers/media/{common => }/tuners/tda18271-fe.c (100%)
3719  rename drivers/media/{common => }/tuners/tda18271-maps.c (100%)
3720  rename drivers/media/{common => }/tuners/tda18271-priv.h (100%)
3721  rename drivers/media/{common => }/tuners/tda18271.h (100%)
3722  rename drivers/media/{common => }/tuners/tda827x.c (100%)
3723  rename drivers/media/{common => }/tuners/tda827x.h (100%)
3724  rename drivers/media/{common => }/tuners/tda8290.c (100%)
3725  rename drivers/media/{common => }/tuners/tda8290.h (100%)
3726  rename drivers/media/{common => }/tuners/tda9887.c (100%)
3727  rename drivers/media/{common => }/tuners/tda9887.h (100%)
3728  rename drivers/media/{common => }/tuners/tea5761.c (100%)
3729  rename drivers/media/{common => }/tuners/tea5761.h (100%)
3730  rename drivers/media/{common => }/tuners/tea5767.c (100%)
3731  rename drivers/media/{common => }/tuners/tea5767.h (100%)
3732  rename drivers/media/{common => }/tuners/tua9001.c (100%)
3733  rename drivers/media/{common => }/tuners/tua9001.h (100%)
3734  rename drivers/media/{common => }/tuners/tua9001_priv.h (100%)
3735  rename drivers/media/{common => }/tuners/tuner-i2c.h (100%)
3736  rename drivers/media/{common => }/tuners/tuner-simple.c (100%)
3737  rename drivers/media/{common => }/tuners/tuner-simple.h (100%)
3738  rename drivers/media/{common => }/tuners/tuner-types.c (100%)
3739  rename drivers/media/{common => }/tuners/tuner-xc2028-types.h (100%)
3740  rename drivers/media/{common => }/tuners/tuner-xc2028.c (99%)
3741  rename drivers/media/{common => }/tuners/tuner-xc2028.h (100%)
3742  rename drivers/media/{common => }/tuners/xc4000.c (99%)
3743  rename drivers/media/{common => }/tuners/xc4000.h (100%)
3744  rename drivers/media/{common => }/tuners/xc5000.c (88%)
3745  rename drivers/media/{common => }/tuners/xc5000.h (100%)
3746  create mode 100644 drivers/media/usb/Kconfig
3747  create mode 100644 drivers/media/usb/Makefile
3748  rename drivers/media/{video => usb}/au0828/Kconfig (100%)
3749  rename drivers/media/{video => usb}/au0828/Makefile (59%)
3750  rename drivers/media/{video => usb}/au0828/au0828-cards.c (99%)
3751  rename drivers/media/{video => usb}/au0828/au0828-cards.h (100%)
3752  rename drivers/media/{video => usb}/au0828/au0828-core.c (85%)
3753  rename drivers/media/{video => usb}/au0828/au0828-dvb.c (90%)
3754  rename drivers/media/{video => usb}/au0828/au0828-i2c.c (93%)
3755  rename drivers/media/{video => usb}/au0828/au0828-reg.h (98%)
3756  rename drivers/media/{video => usb}/au0828/au0828-vbi.c (100%)
3757  rename drivers/media/{video => usb}/au0828/au0828-video.c (96%)
3758  rename drivers/media/{video => usb}/au0828/au0828.h (98%)
3759  create mode 100644 drivers/media/usb/b2c2/Kconfig
3760  create mode 100644 drivers/media/usb/b2c2/Makefile
3761  rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.c (99%)
3762  rename drivers/media/{dvb => usb}/b2c2/flexcop-usb.h (100%)
3763  rename drivers/media/{video => usb}/cpia2/Kconfig (100%)
3764  rename drivers/media/{video => usb}/cpia2/Makefile (100%)
3765  rename drivers/media/{video => usb}/cpia2/cpia2.h (100%)
3766  rename drivers/media/{video => usb}/cpia2/cpia2_core.c (99%)
3767  rename drivers/media/{video => usb}/cpia2/cpia2_registers.h (100%)
3768  rename drivers/media/{video => usb}/cpia2/cpia2_usb.c (100%)
3769  rename drivers/media/{video => usb}/cpia2/cpia2_v4l.c (97%)
3770  rename drivers/media/{video => usb}/cx231xx/Kconfig (100%)
3771  rename drivers/media/{video => usb}/cx231xx/Makefile (65%)
3772  rename drivers/media/{video => usb}/cx231xx/cx231xx-417.c (99%)
3773  rename drivers/media/{video => usb}/cx231xx/cx231xx-audio.c (100%)
3774  rename drivers/media/{video => usb}/cx231xx/cx231xx-avcore.c (100%)
3775  rename drivers/media/{video => usb}/cx231xx/cx231xx-cards.c (100%)
3776  rename drivers/media/{video => usb}/cx231xx/cx231xx-conf-reg.h (100%)
3777  rename drivers/media/{video => usb}/cx231xx/cx231xx-core.c (100%)
3778  rename drivers/media/{video => usb}/cx231xx/cx231xx-dif.h (100%)
3779  rename drivers/media/{video => usb}/cx231xx/cx231xx-dvb.c (100%)
3780  rename drivers/media/{video => usb}/cx231xx/cx231xx-i2c.c (100%)
3781  rename drivers/media/{video => usb}/cx231xx/cx231xx-input.c (100%)
3782  rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.c (100%)
3783  rename drivers/media/{video => usb}/cx231xx/cx231xx-pcb-cfg.h (100%)
3784  rename drivers/media/{video => usb}/cx231xx/cx231xx-reg.h (100%)
3785  rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.c (100%)
3786  rename drivers/media/{video => usb}/cx231xx/cx231xx-vbi.h (100%)
3787  rename drivers/media/{video => usb}/cx231xx/cx231xx-video.c (98%)
3788  rename drivers/media/{video => usb}/cx231xx/cx231xx.h (100%)
3789  create mode 100644 drivers/media/usb/dvb-usb-v2/Kconfig
3790  create mode 100644 drivers/media/usb/dvb-usb-v2/Makefile
3791  create mode 100644 drivers/media/usb/dvb-usb-v2/af9015.c
3792  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9015.h (72%)
3793  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.c (62%)
3794  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/af9035.h (96%)
3795  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.c (67%)
3796  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/anysee.h (97%)
3797  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.c (64%)
3798  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/au6610.h (80%)
3799  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/az6007.c (63%)
3800  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.c (59%)
3801  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ce6230.h (60%)
3802  create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.c
3803  create mode 100644 drivers/media/usb/dvb-usb-v2/cypress_firmware.h
3804  create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb.h
3805  create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_common.h
3806  create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_core.c
3807  create mode 100644 drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c
3808  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.c (58%)
3809  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/ec168.h (65%)
3810  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.c (54%)
3811  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/gl861.h (59%)
3812  create mode 100644 drivers/media/usb/dvb-usb-v2/it913x.c
3813  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.c (69%)
3814  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/lmedm04.h (100%)
3815  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.c (100%)
3816  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-demod.h (100%)
3817  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.c (100%)
3818  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-gpio.h (100%)
3819  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.c (100%)
3820  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-i2c.h (100%)
3821  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.c (100%)
3822  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-phy.h (100%)
3823  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-reg.h (100%)
3824  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.c (99%)
3825  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf-tuner.h (100%)
3826  create mode 100644 drivers/media/usb/dvb-usb-v2/mxl111sf.c
3827  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/mxl111sf.h (98%)
3828  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.c (68%)
3829  rename drivers/media/{dvb/dvb-usb => usb/dvb-usb-v2}/rtl28xxu.h (92%)
3830  create mode 100644 drivers/media/usb/dvb-usb-v2/usb_urb.c
3831  rename drivers/media/{dvb => usb}/dvb-usb/Kconfig (71%)
3832  rename drivers/media/{dvb => usb}/dvb-usb/Makefile (65%)
3833  rename drivers/media/{dvb => usb}/dvb-usb/a800.c (100%)
3834  rename drivers/media/{dvb => usb}/dvb-usb/af9005-fe.c (100%)
3835  rename drivers/media/{dvb => usb}/dvb-usb/af9005-remote.c (100%)
3836  rename drivers/media/{dvb => usb}/dvb-usb/af9005-script.h (100%)
3837  rename drivers/media/{dvb => usb}/dvb-usb/af9005.c (100%)
3838  rename drivers/media/{dvb => usb}/dvb-usb/af9005.h (100%)
3839  rename drivers/media/{dvb => usb}/dvb-usb/az6027.c (100%)
3840  rename drivers/media/{dvb => usb}/dvb-usb/az6027.h (100%)
3841  rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-core.c (100%)
3842  rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2-fe.c (100%)
3843  rename drivers/media/{dvb => usb}/dvb-usb/cinergyT2.h (100%)
3844  rename drivers/media/{dvb => usb}/dvb-usb/cxusb.c (100%)
3845  rename drivers/media/{dvb => usb}/dvb-usb/cxusb.h (100%)
3846  rename drivers/media/{dvb => usb}/dvb-usb/dib0700.h (100%)
3847  rename drivers/media/{dvb => usb}/dvb-usb/dib0700_core.c (99%)
3848  rename drivers/media/{dvb => usb}/dvb-usb/dib0700_devices.c (100%)
3849  rename drivers/media/{dvb => usb}/dvb-usb/dib07x0.h (100%)
3850  rename drivers/media/{dvb => usb}/dvb-usb/dibusb-common.c (100%)
3851  rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mb.c (100%)
3852  rename drivers/media/{dvb => usb}/dvb-usb/dibusb-mc.c (100%)
3853  rename drivers/media/{dvb => usb}/dvb-usb/dibusb.h (100%)
3854  rename drivers/media/{dvb => usb}/dvb-usb/digitv.c (100%)
3855  rename drivers/media/{dvb => usb}/dvb-usb/digitv.h (100%)
3856  rename drivers/media/{dvb => usb}/dvb-usb/dtt200u-fe.c (100%)
3857  rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.c (100%)
3858  rename drivers/media/{dvb => usb}/dvb-usb/dtt200u.h (100%)
3859  rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.c (100%)
3860  rename drivers/media/{dvb => usb}/dvb-usb/dtv5100.h (100%)
3861  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-common.h (100%)
3862  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-dvb.c (99%)
3863  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-firmware.c (100%)
3864  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-i2c.c (100%)
3865  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-init.c (100%)
3866  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-remote.c (100%)
3867  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb-urb.c (100%)
3868  rename drivers/media/{dvb => usb}/dvb-usb/dvb-usb.h (99%)
3869  create mode 100644 drivers/media/usb/dvb-usb/dvb_usb_dvb.c
3870  create mode 100644 drivers/media/usb/dvb-usb/dvb_usb_remote.c
3871  rename drivers/media/{dvb => usb}/dvb-usb/dw2102.c (100%)
3872  rename drivers/media/{dvb => usb}/dvb-usb/dw2102.h (100%)
3873  rename drivers/media/{dvb => usb}/dvb-usb/friio-fe.c (100%)
3874  rename drivers/media/{dvb => usb}/dvb-usb/friio.c (100%)
3875  rename drivers/media/{dvb => usb}/dvb-usb/friio.h (100%)
3876  rename drivers/media/{dvb => usb}/dvb-usb/gp8psk-fe.c (100%)
3877  rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.c (100%)
3878  rename drivers/media/{dvb => usb}/dvb-usb/gp8psk.h (100%)
3879  rename drivers/media/{dvb => usb}/dvb-usb/m920x.c (100%)
3880  rename drivers/media/{dvb => usb}/dvb-usb/m920x.h (100%)
3881  rename drivers/media/{dvb => usb}/dvb-usb/nova-t-usb2.c (100%)
3882  rename drivers/media/{dvb => usb}/dvb-usb/opera1.c (100%)
3883  rename drivers/media/{dvb => usb}/dvb-usb/pctv452e.c (99%)
3884  rename drivers/media/{dvb => usb}/dvb-usb/technisat-usb2.c (100%)
3885  rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.c (100%)
3886  rename drivers/media/{dvb => usb}/dvb-usb/ttusb2.h (100%)
3887  rename drivers/media/{dvb => usb}/dvb-usb/umt-010.c (100%)
3888  rename drivers/media/{dvb => usb}/dvb-usb/usb-urb.c (100%)
3889  rename drivers/media/{dvb => usb}/dvb-usb/vp702x-fe.c (100%)
3890  rename drivers/media/{dvb => usb}/dvb-usb/vp702x.c (100%)
3891  rename drivers/media/{dvb => usb}/dvb-usb/vp702x.h (100%)
3892  rename drivers/media/{dvb => usb}/dvb-usb/vp7045-fe.c (100%)
3893  rename drivers/media/{dvb => usb}/dvb-usb/vp7045.c (100%)
3894  rename drivers/media/{dvb => usb}/dvb-usb/vp7045.h (100%)
3895  rename drivers/media/{video => usb}/em28xx/Kconfig (100%)
3896  rename drivers/media/{video => usb}/em28xx/Makefile (67%)
3897  rename drivers/media/{video => usb}/em28xx/em28xx-audio.c (99%)
3898  rename drivers/media/{video => usb}/em28xx/em28xx-cards.c (100%)
3899  rename drivers/media/{video => usb}/em28xx/em28xx-core.c (99%)
3900  rename drivers/media/{video => usb}/em28xx/em28xx-dvb.c (100%)
3901  rename drivers/media/{video => usb}/em28xx/em28xx-i2c.c (100%)
3902  rename drivers/media/{video => usb}/em28xx/em28xx-input.c (100%)
3903  rename drivers/media/{video => usb}/em28xx/em28xx-reg.h (100%)
3904  rename drivers/media/{video => usb}/em28xx/em28xx-vbi.c (100%)
3905  rename drivers/media/{video => usb}/em28xx/em28xx-video.c (98%)
3906  rename drivers/media/{video => usb}/em28xx/em28xx.h (100%)
3907  rename drivers/media/{video => usb}/gspca/Kconfig (98%)
3908  rename drivers/media/{video => usb}/gspca/Makefile (100%)
3909  rename drivers/media/{video => usb}/gspca/autogain_functions.c (100%)
3910  rename drivers/media/{video => usb}/gspca/autogain_functions.h (100%)
3911  rename drivers/media/{video => usb}/gspca/benq.c (100%)
3912  rename drivers/media/{video => usb}/gspca/conex.c (100%)
3913  rename drivers/media/{video => usb}/gspca/cpia1.c (100%)
3914  rename drivers/media/{video => usb}/gspca/etoms.c (100%)
3915  rename drivers/media/{video => usb}/gspca/finepix.c (100%)
3916  rename drivers/media/{video => usb}/gspca/gl860/Kconfig (100%)
3917  rename drivers/media/{video => usb}/gspca/gl860/Makefile (75%)
3918  rename drivers/media/{video => usb}/gspca/gl860/gl860-mi1320.c (100%)
3919  rename drivers/media/{video => usb}/gspca/gl860/gl860-mi2020.c (100%)
3920  rename drivers/media/{video => usb}/gspca/gl860/gl860-ov2640.c (100%)
3921  rename drivers/media/{video => usb}/gspca/gl860/gl860-ov9655.c (100%)
3922  rename drivers/media/{video => usb}/gspca/gl860/gl860.c (100%)
3923  rename drivers/media/{video => usb}/gspca/gl860/gl860.h (100%)
3924  rename drivers/media/{video => usb}/gspca/gspca.c (100%)
3925  rename drivers/media/{video => usb}/gspca/gspca.h (100%)
3926  rename drivers/media/{video => usb}/gspca/jeilinj.c (100%)
3927  rename drivers/media/{video => usb}/gspca/jl2005bcd.c (100%)
3928  rename drivers/media/{video => usb}/gspca/jpeg.h (100%)
3929  rename drivers/media/{video => usb}/gspca/kinect.c (100%)
3930  rename drivers/media/{video => usb}/gspca/konica.c (100%)
3931  rename drivers/media/{video => usb}/gspca/m5602/Kconfig (100%)
3932  rename drivers/media/{video => usb}/gspca/m5602/Makefile (80%)
3933  rename drivers/media/{video => usb}/gspca/m5602/m5602_bridge.h (100%)
3934  rename drivers/media/{video => usb}/gspca/m5602/m5602_core.c (100%)
3935  rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.c (100%)
3936  rename drivers/media/{video => usb}/gspca/m5602/m5602_mt9m111.h (100%)
3937  rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.c (100%)
3938  rename drivers/media/{video => usb}/gspca/m5602/m5602_ov7660.h (100%)
3939  rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.c (100%)
3940  rename drivers/media/{video => usb}/gspca/m5602/m5602_ov9650.h (100%)
3941  rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.c (100%)
3942  rename drivers/media/{video => usb}/gspca/m5602/m5602_po1030.h (100%)
3943  rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.c (100%)
3944  rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k4aa.h (100%)
3945  rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.c (100%)
3946  rename drivers/media/{video => usb}/gspca/m5602/m5602_s5k83a.h (100%)
3947  rename drivers/media/{video => usb}/gspca/m5602/m5602_sensor.h (100%)
3948  rename drivers/media/{video => usb}/gspca/mars.c (100%)
3949  rename drivers/media/{video => usb}/gspca/mr97310a.c (100%)
3950  rename drivers/media/{video => usb}/gspca/nw80x.c (100%)
3951  rename drivers/media/{video => usb}/gspca/ov519.c (100%)
3952  rename drivers/media/{video => usb}/gspca/ov534.c (100%)
3953  rename drivers/media/{video => usb}/gspca/ov534_9.c (100%)
3954  rename drivers/media/{video => usb}/gspca/pac207.c (100%)
3955  rename drivers/media/{video => usb}/gspca/pac7302.c (100%)
3956  rename drivers/media/{video => usb}/gspca/pac7311.c (100%)
3957  rename drivers/media/{video => usb}/gspca/pac_common.h (100%)
3958  rename drivers/media/{video => usb}/gspca/se401.c (100%)
3959  rename drivers/media/{video => usb}/gspca/se401.h (100%)
3960  rename drivers/media/{video => usb}/gspca/sn9c2028.c (100%)
3961  rename drivers/media/{video => usb}/gspca/sn9c2028.h (100%)
3962  rename drivers/media/{video => usb}/gspca/sn9c20x.c (100%)
3963  rename drivers/media/{video => usb}/gspca/sonixb.c (100%)
3964  rename drivers/media/{video => usb}/gspca/sonixj.c (100%)
3965  rename drivers/media/{video => usb}/gspca/spca1528.c (100%)
3966  rename drivers/media/{video => usb}/gspca/spca500.c (100%)
3967  rename drivers/media/{video => usb}/gspca/spca501.c (100%)
3968  rename drivers/media/{video => usb}/gspca/spca505.c (100%)
3969  rename drivers/media/{video => usb}/gspca/spca506.c (100%)
3970  rename drivers/media/{video => usb}/gspca/spca508.c (100%)
3971  rename drivers/media/{video => usb}/gspca/spca561.c (100%)
3972  rename drivers/media/{video => usb}/gspca/sq905.c (100%)
3973  rename drivers/media/{video => usb}/gspca/sq905c.c (97%)
3974  rename drivers/media/{video => usb}/gspca/sq930x.c (99%)
3975  rename drivers/media/{video => usb}/gspca/stk014.c (100%)
3976  rename drivers/media/{video => usb}/gspca/stv0680.c (100%)
3977  rename drivers/media/{video => usb}/gspca/stv06xx/Kconfig (100%)
3978  rename drivers/media/{video => usb}/gspca/stv06xx/Makefile (78%)
3979  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.c (100%)
3980  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx.h (100%)
3981  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.c (100%)
3982  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_hdcs.h (100%)
3983  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.c (100%)
3984  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_pb0100.h (100%)
3985  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_sensor.h (100%)
3986  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.c (100%)
3987  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_st6422.h (100%)
3988  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.c (100%)
3989  rename drivers/media/{video => usb}/gspca/stv06xx/stv06xx_vv6410.h (100%)
3990  rename drivers/media/{video => usb}/gspca/sunplus.c (100%)
3991  rename drivers/media/{video => usb}/gspca/t613.c (100%)
3992  rename drivers/media/{video => usb}/gspca/topro.c (100%)
3993  rename drivers/media/{video => usb}/gspca/tv8532.c (100%)
3994  rename drivers/media/{video => usb}/gspca/vc032x.c (99%)
3995  rename drivers/media/{video => usb}/gspca/vicam.c (100%)
3996  rename drivers/media/{video => usb}/gspca/w996Xcf.c (100%)
3997  rename drivers/media/{video => usb}/gspca/xirlink_cit.c (100%)
3998  rename drivers/media/{video => usb}/gspca/zc3xx-reg.h (100%)
3999  rename drivers/media/{video => usb}/gspca/zc3xx.c (100%)
4000  rename drivers/media/{video => usb}/hdpvr/Kconfig (100%)
4001  rename drivers/media/{video => usb}/hdpvr/Makefile (81%)
4002  rename drivers/media/{video => usb}/hdpvr/hdpvr-control.c (100%)
4003  rename drivers/media/{video => usb}/hdpvr/hdpvr-core.c (100%)
4004  rename drivers/media/{video => usb}/hdpvr/hdpvr-i2c.c (100%)
4005  rename drivers/media/{video => usb}/hdpvr/hdpvr-video.c (100%)
4006  rename drivers/media/{video => usb}/hdpvr/hdpvr.h (100%)
4007  rename drivers/media/{video => usb}/pvrusb2/Kconfig (100%)
4008  rename drivers/media/{video => usb}/pvrusb2/Makefile (80%)
4009  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.c (100%)
4010  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-audio.h (100%)
4011  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.c (100%)
4012  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-context.h (100%)
4013  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.c (100%)
4014  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cs53l32a.h (100%)
4015  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.c (100%)
4016  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ctrl.h (100%)
4017  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.c (100%)
4018  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-cx2584x-v4l.h (100%)
4019  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debug.h (100%)
4020  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.c (100%)
4021  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-debugifc.h (100%)
4022  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.c (97%)
4023  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-devattr.h (100%)
4024  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.c (100%)
4025  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-dvb.h (100%)
4026  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.c (100%)
4027  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-eeprom.h (100%)
4028  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.c (100%)
4029  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-encoder.h (100%)
4030  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-fx2-cmd.h (100%)
4031  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw-internal.h (100%)
4032  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.c (100%)
4033  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-hdw.h (100%)
4034  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.c (100%)
4035  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-i2c-core.h (100%)
4036  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.c (100%)
4037  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-io.h (100%)
4038  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.c (100%)
4039  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-ioread.h (100%)
4040  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-main.c (100%)
4041  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.c (100%)
4042  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-std.h (100%)
4043  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.c (100%)
4044  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-sysfs.h (100%)
4045  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-util.h (100%)
4046  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.c (100%)
4047  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-v4l2.h (100%)
4048  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.c (100%)
4049  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-video-v4l.h (100%)
4050  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.c (100%)
4051  rename drivers/media/{video => usb}/pvrusb2/pvrusb2-wm8775.h (100%)
4052  rename drivers/media/{video => usb}/pvrusb2/pvrusb2.h (100%)
4053  rename drivers/media/{video => usb}/pwc/Kconfig (100%)
4054  rename drivers/media/{video => usb}/pwc/Makefile (100%)
4055  rename drivers/media/{video => usb}/pwc/philips.txt (100%)
4056  rename drivers/media/{video => usb}/pwc/pwc-ctrl.c (100%)
4057  rename drivers/media/{video => usb}/pwc/pwc-dec1.c (100%)
4058  rename drivers/media/{video => usb}/pwc/pwc-dec1.h (100%)
4059  rename drivers/media/{video => usb}/pwc/pwc-dec23.c (100%)
4060  rename drivers/media/{video => usb}/pwc/pwc-dec23.h (100%)
4061  rename drivers/media/{video => usb}/pwc/pwc-if.c (100%)
4062  rename drivers/media/{video => usb}/pwc/pwc-kiara.c (100%)
4063  rename drivers/media/{video => usb}/pwc/pwc-kiara.h (100%)
4064  rename drivers/media/{video => usb}/pwc/pwc-misc.c (100%)
4065  rename drivers/media/{video => usb}/pwc/pwc-nala.h (100%)
4066  rename drivers/media/{video => usb}/pwc/pwc-timon.c (100%)
4067  rename drivers/media/{video => usb}/pwc/pwc-timon.h (100%)
4068  rename drivers/media/{video => usb}/pwc/pwc-uncompress.c (100%)
4069  rename drivers/media/{video => usb}/pwc/pwc-v4l.c (100%)
4070  rename drivers/media/{video => usb}/pwc/pwc.h (100%)
4071  create mode 100644 drivers/media/usb/s2255/Kconfig
4072  create mode 100644 drivers/media/usb/s2255/Makefile
4073  rename drivers/media/{video => usb/s2255}/s2255drv.c (99%)
4074  create mode 100644 drivers/media/usb/siano/Kconfig
4075  create mode 100644 drivers/media/usb/siano/Makefile
4076  rename drivers/media/{dvb => usb}/siano/smsusb.c (100%)
4077  rename drivers/media/{video => usb}/sn9c102/Kconfig (100%)
4078  rename drivers/media/{video => usb}/sn9c102/Makefile (100%)
4079  rename drivers/media/{video => usb}/sn9c102/sn9c102.h (100%)
4080  rename drivers/media/{video => usb}/sn9c102/sn9c102_config.h (100%)
4081  rename drivers/media/{video => usb}/sn9c102/sn9c102_core.c (100%)
4082  rename drivers/media/{video => usb}/sn9c102/sn9c102_devtable.h (100%)
4083  rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131d.c (100%)
4084  rename drivers/media/{video => usb}/sn9c102/sn9c102_hv7131r.c (100%)
4085  rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0343.c (100%)
4086  rename drivers/media/{video => usb}/sn9c102/sn9c102_mi0360.c (100%)
4087  rename drivers/media/{video => usb}/sn9c102/sn9c102_mt9v111.c (100%)
4088  rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7630.c (100%)
4089  rename drivers/media/{video => usb}/sn9c102/sn9c102_ov7660.c (100%)
4090  rename drivers/media/{video => usb}/sn9c102/sn9c102_pas106b.c (100%)
4091  rename drivers/media/{video => usb}/sn9c102/sn9c102_pas202bcb.c (100%)
4092  rename drivers/media/{video => usb}/sn9c102/sn9c102_sensor.h (100%)
4093  rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110c1b.c (100%)
4094  rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5110d.c (100%)
4095  rename drivers/media/{video => usb}/sn9c102/sn9c102_tas5130d1b.c (100%)
4096  create mode 100644 drivers/media/usb/stk1160/Kconfig
4097  create mode 100644 drivers/media/usb/stk1160/Makefile
4098  create mode 100644 drivers/media/usb/stk1160/stk1160-ac97.c
4099  create mode 100644 drivers/media/usb/stk1160/stk1160-core.c
4100  create mode 100644 drivers/media/usb/stk1160/stk1160-i2c.c
4101  create mode 100644 drivers/media/usb/stk1160/stk1160-reg.h
4102  create mode 100644 drivers/media/usb/stk1160/stk1160-v4l.c
4103  create mode 100644 drivers/media/usb/stk1160/stk1160-video.c
4104  create mode 100644 drivers/media/usb/stk1160/stk1160.h
4105  create mode 100644 drivers/media/usb/stkwebcam/Kconfig
4106  create mode 100644 drivers/media/usb/stkwebcam/Makefile
4107  rename drivers/media/{video => usb/stkwebcam}/stk-sensor.c (100%)
4108  rename drivers/media/{video => usb/stkwebcam}/stk-webcam.c (100%)
4109  rename drivers/media/{video => usb/stkwebcam}/stk-webcam.h (100%)
4110  rename drivers/media/{video => usb}/tlg2300/Kconfig (100%)
4111  create mode 100644 drivers/media/usb/tlg2300/Makefile
4112  rename drivers/media/{video => usb}/tlg2300/pd-alsa.c (100%)
4113  rename drivers/media/{video => usb}/tlg2300/pd-common.h (100%)
4114  rename drivers/media/{video => usb}/tlg2300/pd-dvb.c (100%)
4115  rename drivers/media/{video => usb}/tlg2300/pd-main.c (100%)
4116  rename drivers/media/{video => usb}/tlg2300/pd-radio.c (100%)
4117  rename drivers/media/{video => usb}/tlg2300/pd-video.c (100%)
4118  rename drivers/media/{video => usb}/tlg2300/vendorcmds.h (100%)
4119  rename drivers/media/{video => usb}/tm6000/Kconfig (100%)
4120  rename drivers/media/{video => usb}/tm6000/Makefile (62%)
4121  rename drivers/media/{video => usb}/tm6000/tm6000-alsa.c (99%)
4122  rename drivers/media/{video => usb}/tm6000/tm6000-cards.c (100%)
4123  rename drivers/media/{video => usb}/tm6000/tm6000-core.c (100%)
4124  rename drivers/media/{video => usb}/tm6000/tm6000-dvb.c (100%)
4125  rename drivers/media/{video => usb}/tm6000/tm6000-i2c.c (100%)
4126  rename drivers/media/{video => usb}/tm6000/tm6000-input.c (99%)
4127  rename drivers/media/{video => usb}/tm6000/tm6000-regs.h (100%)
4128  rename drivers/media/{video => usb}/tm6000/tm6000-stds.c (100%)
4129  rename drivers/media/{video => usb}/tm6000/tm6000-usb-isoc.h (100%)
4130  rename drivers/media/{video => usb}/tm6000/tm6000-video.c (97%)
4131  rename drivers/media/{video => usb}/tm6000/tm6000.h (100%)
4132  rename drivers/media/{dvb => usb}/ttusb-budget/Kconfig (100%)
4133  create mode 100644 drivers/media/usb/ttusb-budget/Makefile
4134  rename drivers/media/{dvb => usb}/ttusb-budget/dvb-ttusb-budget.c (100%)
4135  rename drivers/media/{dvb => usb}/ttusb-dec/Kconfig (100%)
4136  rename drivers/media/{dvb => usb}/ttusb-dec/Makefile (57%)
4137  rename drivers/media/{dvb => usb}/ttusb-dec/ttusb_dec.c (100%)
4138  rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.c (100%)
4139  rename drivers/media/{dvb => usb}/ttusb-dec/ttusbdecfe.h (100%)
4140  rename drivers/media/{video => usb}/usbvision/Kconfig (100%)
4141  rename drivers/media/{video => usb}/usbvision/Makefile (63%)
4142  rename drivers/media/{video => usb}/usbvision/usbvision-cards.c (100%)
4143  rename drivers/media/{video => usb}/usbvision/usbvision-cards.h (100%)
4144  rename drivers/media/{video => usb}/usbvision/usbvision-core.c (100%)
4145  rename drivers/media/{video => usb}/usbvision/usbvision-i2c.c (100%)
4146  rename drivers/media/{video => usb}/usbvision/usbvision-video.c (97%)
4147  rename drivers/media/{video => usb}/usbvision/usbvision.h (100%)
4148  rename drivers/media/{video => usb}/uvc/Kconfig (100%)
4149  rename drivers/media/{video => usb}/uvc/Makefile (100%)
4150  rename drivers/media/{video => usb}/uvc/uvc_ctrl.c (100%)
4151  rename drivers/media/{video => usb}/uvc/uvc_debugfs.c (100%)
4152  rename drivers/media/{video => usb}/uvc/uvc_driver.c (98%)
4153  rename drivers/media/{video => usb}/uvc/uvc_entity.c (100%)
4154  rename drivers/media/{video => usb}/uvc/uvc_isight.c (100%)
4155  rename drivers/media/{video => usb}/uvc/uvc_queue.c (99%)
4156  rename drivers/media/{video => usb}/uvc/uvc_status.c (100%)
4157  rename drivers/media/{video => usb}/uvc/uvc_v4l2.c (100%)
4158  rename drivers/media/{video => usb}/uvc/uvc_video.c (98%)
4159  rename drivers/media/{video => usb}/uvc/uvcvideo.h (98%)
4160  create mode 100644 drivers/media/usb/zr364xx/Kconfig
4161  create mode 100644 drivers/media/usb/zr364xx/Makefile
4162  rename drivers/media/{video => usb/zr364xx}/zr364xx.c (100%)
4163  create mode 100644 drivers/media/v4l2-core/Kconfig
4164  create mode 100644 drivers/media/v4l2-core/Makefile
4165  rename drivers/media/{video => v4l2-core}/tuner-core.c (100%)
4166  rename drivers/media/{video => v4l2-core}/v4l2-common.c (99%)
4167  rename drivers/media/{video => v4l2-core}/v4l2-compat-ioctl32.c (100%)
4168  rename drivers/media/{video => v4l2-core}/v4l2-ctrls.c (100%)
4169  rename drivers/media/{video => v4l2-core}/v4l2-dev.c (95%)
4170  rename drivers/media/{video => v4l2-core}/v4l2-device.c (100%)
4171  rename drivers/media/{video => v4l2-core}/v4l2-event.c (100%)
4172  rename drivers/media/{video => v4l2-core}/v4l2-fh.c (100%)
4173  rename drivers/media/{video => v4l2-core}/v4l2-int-device.c (100%)
4174  rename drivers/media/{video => v4l2-core}/v4l2-ioctl.c (99%)
4175  rename drivers/media/{video => v4l2-core}/v4l2-mem2mem.c (100%)
4176  rename drivers/media/{video => v4l2-core}/v4l2-subdev.c (100%)
4177  rename drivers/media/{video => v4l2-core}/videobuf-core.c (100%)
4178  rename drivers/media/{video => v4l2-core}/videobuf-dma-contig.c (100%)
4179  rename drivers/media/{video => v4l2-core}/videobuf-dma-sg.c (100%)
4180  rename drivers/media/{video => v4l2-core}/videobuf-dvb.c (96%)
4181  rename drivers/media/{video => v4l2-core}/videobuf-vmalloc.c (100%)
4182  rename drivers/media/{video => v4l2-core}/videobuf2-core.c (98%)
4183  rename drivers/media/{video => v4l2-core}/videobuf2-dma-contig.c (100%)
4184  rename drivers/media/{video => v4l2-core}/videobuf2-dma-sg.c (100%)
4185  rename drivers/media/{video => v4l2-core}/videobuf2-memops.c (100%)
4186  rename drivers/media/{video => v4l2-core}/videobuf2-vmalloc.c (99%)
4187  delete mode 100644 drivers/media/video/Kconfig
4188  delete mode 100644 drivers/media/video/Makefile
4189  delete mode 100644 drivers/media/video/bt8xx/Kconfig
4190  delete mode 100644 drivers/media/video/bt8xx/Makefile
4191  delete mode 100644 drivers/media/video/tlg2300/Makefile
4192  delete mode 100644 drivers/staging/media/easycap/Kconfig
4193  delete mode 100644 drivers/staging/media/easycap/Makefile
4194  delete mode 100644 drivers/staging/media/easycap/README
4195  delete mode 100644 drivers/staging/media/easycap/easycap.h
4196  delete mode 100644 drivers/staging/media/easycap/easycap_ioctl.c
4197  delete mode 100644 drivers/staging/media/easycap/easycap_low.c
4198  delete mode 100644 drivers/staging/media/easycap/easycap_main.c
4199  delete mode 100644 drivers/staging/media/easycap/easycap_settings.c
4200  delete mode 100644 drivers/staging/media/easycap/easycap_sound.c
4201  delete mode 100644 drivers/staging/media/easycap/easycap_testcard.c
4202  delete mode 100644 drivers/staging/media/lirc/lirc_ene0100.h
4203  delete mode 100644 drivers/staging/media/lirc/lirc_ttusbir.c
4204  create mode 100644 include/media/ir-rx51.h
4205 $ git reset --hard HEAD^
4206 HEAD is now at ccb8e04 Merge remote-tracking branch 'hwmon-staging/hwmon-next'
4207 Merging refs/next/20120816/v4l-dvb
4208 $ git merge refs/next/20120816/v4l-dvb
4209 Removing drivers/staging/media/easycap/easycap_testcard.c
4210 Removing drivers/staging/media/easycap/easycap_sound.c
4211 Removing drivers/staging/media/easycap/easycap_settings.c
4212 Removing drivers/staging/media/easycap/easycap_main.c
4213 Removing drivers/staging/media/easycap/easycap_low.c
4214 Removing drivers/staging/media/easycap/easycap_ioctl.c
4215 Removing drivers/staging/media/easycap/easycap.h
4216 Removing drivers/staging/media/easycap/README
4217 Removing drivers/staging/media/easycap/Makefile
4218 Removing drivers/staging/media/easycap/Kconfig
4219 Removing drivers/media/dvb/dvb-usb/mxl111sf.c
4220 Removing drivers/media/dvb/dvb-usb/af9015.c
4221 Auto-merging drivers/media/dvb/dvb-usb-v2/mxl111sf.h
4222 Auto-merging drivers/media/dvb/dvb-usb-v2/mxl111sf-tuner.c
4223 Auto-merging drivers/media/dvb/dvb-usb-v2/lmedm04.c
4224 Auto-merging drivers/media/dvb/dvb-usb-v2/gl861.h
4225 Auto-merging drivers/media/dvb/dvb-usb-v2/gl861.c
4226 Auto-merging drivers/media/dvb/dvb-usb-v2/ec168.h
4227 Auto-merging drivers/media/dvb/dvb-usb-v2/ec168.c
4228 Auto-merging drivers/media/dvb/dvb-usb-v2/ce6230.h
4229 Auto-merging drivers/media/dvb/dvb-usb-v2/ce6230.c
4230 Auto-merging drivers/media/dvb/dvb-usb-v2/az6007.c
4231 Auto-merging drivers/media/dvb/dvb-usb-v2/au6610.h
4232 Auto-merging drivers/media/dvb/dvb-usb-v2/au6610.c
4233 Auto-merging drivers/media/dvb/dvb-usb-v2/anysee.h
4234 Auto-merging drivers/media/dvb/dvb-usb-v2/anysee.c
4235 Auto-merging drivers/media/dvb/dvb-usb-v2/af9035.h
4236 Auto-merging drivers/media/dvb/dvb-usb-v2/af9035.c
4237 Auto-merging drivers/media/dvb/dvb-usb-v2/af9015.h
4238 Auto-merging arch/arm/mach-imx/clk-imx27.c
4239 Merge made by the 'recursive' strategy.
4240  Documentation/DocBook/media/dvb/audio.xml          |  113 +-
4241  Documentation/DocBook/media/dvb/ca.xml             |  353 ++
4242  Documentation/DocBook/media/dvb/demux.xml          |  230 +-
4243  Documentation/DocBook/media/dvb/dvbapi.xml         |    2 +-
4244  Documentation/DocBook/media/dvb/dvbproperty.xml    |   24 +-
4245  Documentation/DocBook/media/dvb/frontend.xml       |    2 +-
4246  Documentation/DocBook/media/dvb/net.xml            |  127 +
4247  Documentation/DocBook/media/dvb/video.xml          |  333 +-
4248  Documentation/DocBook/media/v4l/compat.xml         |   16 -
4249  Documentation/DocBook/media/v4l/v4l2.xml           |   14 +-
4250  Documentation/DocBook/media/v4l/vidioc-g-tuner.xml |    2 +-
4251  Documentation/DocBook/media_api.tmpl               |    9 +-
4252  arch/arm/mach-imx/clk-imx27.c                      |    4 +-
4253  arch/arm/mach-imx/devices-imx27.h                  |    4 +
4254  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |   49 +-
4255  arch/arm/plat-mxc/devices/Kconfig                  |    6 +-
4256  arch/arm/plat-mxc/devices/Makefile                 |    1 +
4257  arch/arm/plat-mxc/devices/platform-imx27-coda.c    |   37 +
4258  arch/arm/plat-mxc/include/mach/devices-common.h    |    8 +
4259  drivers/media/common/saa7146_core.c                |    8 -
4260  drivers/media/common/saa7146_fops.c                |   55 +-
4261  drivers/media/common/tuners/qt1010.c               |    2 +-
4262  drivers/media/common/tuners/tda18212.c             |   37 +-
4263  drivers/media/common/tuners/tda18218.c             |    2 +-
4264  drivers/media/common/tuners/tuner-xc2028.c         |    4 +-
4265  drivers/media/common/tuners/xc5000.c               |  161 +-
4266  drivers/media/dvb/Kconfig                          |    1 +
4267  drivers/media/dvb/Makefile                         |    1 +
4268  .../media/dvb/{dvb-usb => dvb-core}/dvb-usb-ids.h  |    0
4269  drivers/media/dvb/dvb-core/dvb_frontend.c          |    7 -
4270  drivers/media/dvb/dvb-core/dvbdev.h                |    9 +-
4271  drivers/media/dvb/dvb-usb-v2/Kconfig               |  126 +
4272  drivers/media/dvb/dvb-usb-v2/Makefile              |   42 +
4273  drivers/media/dvb/dvb-usb-v2/af9015.c              | 1435 +++++++
4274  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/af9015.h |   68 +-
4275  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/af9035.c |  731 ++--
4276  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/af9035.h |    6 +-
4277  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/anysee.c |  612 ++-
4278  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/anysee.h |   26 +-
4279  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/au6610.c |  116 +-
4280  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/au6610.h |   13 +-
4281  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/az6007.c |  410 +-
4282  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ce6230.c |  181 +-
4283  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ce6230.h |   36 +-
4284  drivers/media/dvb/dvb-usb-v2/cypress_firmware.c    |  125 +
4285  drivers/media/dvb/dvb-usb-v2/cypress_firmware.h    |   31 +
4286  drivers/media/dvb/dvb-usb-v2/dvb_usb.h             |  392 ++
4287  drivers/media/dvb/dvb-usb-v2/dvb_usb_common.h      |   35 +
4288  drivers/media/dvb/dvb-usb-v2/dvb_usb_core.c        |  999 +++++
4289  drivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c         |   83 +
4290  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ec168.c  |  321 +-
4291  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ec168.h  |   26 +-
4292  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/gl861.c  |  130 +-
4293  drivers/media/dvb/{dvb-usb => dvb-usb-v2}/gl861.h  |    5 +-
4294  .../media/dvb/{dvb-usb => dvb-usb-v2}/lmedm04.c    |  584 ++-
4295  .../media/dvb/{dvb-usb => dvb-usb-v2}/lmedm04.h    |    0
4296  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-demod.c   |    0
4297  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-demod.h   |    0
4298  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-gpio.c    |    0
4299  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-gpio.h    |    0
4300  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-i2c.c     |    0
4301  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-i2c.h     |    0
4302  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-phy.c     |    0
4303  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-phy.h     |    0
4304  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-reg.h     |    0
4305  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-tuner.c   |    2 +
4306  .../dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-tuner.h   |    0
4307  drivers/media/dvb/dvb-usb-v2/mxl111sf.c            | 1459 +++++++
4308  .../media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf.h   |   22 +-
4309  drivers/media/dvb/dvb-usb-v2/usb_urb.c             |  357 ++
4310  drivers/media/dvb/dvb-usb/Kconfig                  |  106 -
4311  drivers/media/dvb/dvb-usb/Makefile                 |   33 -
4312  drivers/media/dvb/dvb-usb/af9015.c                 | 1952 ---------
4313  drivers/media/dvb/dvb-usb/dib0700_core.c           |    6 +-
4314  drivers/media/dvb/dvb-usb/dvb_usb_dvb.c            |  403 ++
4315  drivers/media/dvb/dvb-usb/dvb_usb_remote.c         |  117 +
4316  drivers/media/dvb/dvb-usb/mxl111sf.c               | 1835 ---------
4317  drivers/media/dvb/frontends/au8522_common.c        |   22 +-
4318  drivers/media/dvb/frontends/au8522_decoder.c       |   11 +-
4319  drivers/media/dvb/frontends/au8522_dig.c           |   98 +-
4320  drivers/media/dvb/frontends/au8522_priv.h          |   29 +-
4321  drivers/media/dvb/frontends/dvb-pll.c              |   26 +
4322  drivers/media/dvb/frontends/dvb-pll.h              |    1 +
4323  drivers/media/dvb/frontends/m88rs2000.c            |    2 +-
4324  drivers/media/dvb/frontends/nxt200x.c              |   56 +-
4325  drivers/media/dvb/mantis/mantis_cards.c            |    2 +-
4326  drivers/media/dvb/mantis/mantis_core.c             |    2 +-
4327  drivers/media/dvb/mantis/mantis_dvb.c              |    6 +-
4328  drivers/media/dvb/ngene/ngene-cards.c              |  263 ++
4329  drivers/media/dvb/ttpci/budget.c                   |   60 +
4330  drivers/media/media-device.c                       |    4 +-
4331  drivers/media/radio/radio-shark.c                  |  151 +-
4332  drivers/media/radio/radio-shark2.c                 |  137 +-
4333  drivers/media/radio/si470x/radio-si470x-common.c   |    3 +
4334  drivers/media/radio/si470x/radio-si470x-i2c.c      |    5 +-
4335  drivers/media/radio/si470x/radio-si470x-usb.c      |    2 +-
4336  drivers/media/radio/wl128x/fmdrv_v4l2.c            |   38 +-
4337  drivers/media/rc/Kconfig                           |    1 +
4338  drivers/media/rc/ir-nec-decoder.c                  |    4 +-
4339  drivers/media/video/Kconfig                        |   19 +
4340  drivers/media/video/Makefile                       |    4 +
4341  drivers/media/video/au0828/au0828-cards.c          |    4 +-
4342  drivers/media/video/au0828/au0828-core.c           |   59 +-
4343  drivers/media/video/au0828/au0828-dvb.c            |   54 +-
4344  drivers/media/video/au0828/au0828-i2c.c            |   21 +-
4345  drivers/media/video/au0828/au0828-reg.h            |    1 +
4346  drivers/media/video/au0828/au0828-video.c          |   76 +-
4347  drivers/media/video/au0828/au0828.h                |    2 +
4348  drivers/media/video/blackfin/bfin_capture.c        |   17 +-
4349  drivers/media/video/coda.c                         | 1849 +++++++++
4350  drivers/media/video/coda.h                         |  216 +
4351  drivers/media/video/cpia2/cpia2_core.c             |    6 +-
4352  drivers/media/video/cpia2/cpia2_v4l.c              |   39 +-
4353  drivers/media/video/cx18/cx18-av-firmware.c        |    2 +
4354  drivers/media/video/cx18/cx18-driver.c             |    1 +
4355  drivers/media/video/cx18/cx18-dvb.c                |    6 +-
4356  drivers/media/video/cx18/cx18-firmware.c           |   10 +-
4357  drivers/media/video/cx231xx/Makefile               |    1 -
4358  drivers/media/video/cx231xx/cx231xx-417.c          |    2 +
4359  drivers/media/video/cx231xx/cx231xx-video.c        |   47 +-
4360  drivers/media/video/cx23885/cx23885-417.c          |    2 +
4361  drivers/media/video/cx23885/cx23885-cards.c        |    4 +
4362  drivers/media/video/cx23885/cx23885-input.c        |    9 +
4363  drivers/media/video/cx25840/cx25840-firmware.c     |   15 +-
4364  drivers/media/video/davinci/vpbe_display.c         |   22 +-
4365  drivers/media/video/davinci/vpif_capture.c         |   28 +-
4366  drivers/media/video/davinci/vpif_display.c         |   34 +-
4367  drivers/media/video/em28xx/em28xx-audio.c          |    1 -
4368  drivers/media/video/em28xx/em28xx-core.c           |    4 -
4369  drivers/media/video/em28xx/em28xx-video.c          |   52 +-
4370  drivers/media/video/fsl-viu.c                      |   27 +-
4371  drivers/media/video/ivtv/ivtv-fileops.c            |   52 +-
4372  drivers/media/video/ivtv/ivtv-firmware.c           |    4 +
4373  drivers/media/video/ivtv/ivtv-streams.c            |    4 -
4374  drivers/media/video/m2m-deinterlace.c              | 1120 ++++++
4375  drivers/media/video/mem2mem_testdev.c              |   31 +-
4376  drivers/media/video/mx2_emmaprp.c                  |   55 +-
4377  drivers/media/video/omap3isp/cfa_coef_table.h      |   16 +-
4378  drivers/media/video/omap3isp/isp.c                 |   51 +-
4379  drivers/media/video/omap3isp/isp.h                 |   11 +-
4380  drivers/media/video/omap3isp/ispccdc.c             |  234 +-
4381  drivers/media/video/omap3isp/ispccdc.h             |   37 -
4382  drivers/media/video/omap3isp/ispcsi2.c             |   27 +-
4383  drivers/media/video/omap3isp/isph3a_aewb.c         |   10 +-
4384  drivers/media/video/omap3isp/isph3a_af.c           |   10 +-
4385  drivers/media/video/omap3isp/isphist.c             |    6 +-
4386  drivers/media/video/omap3isp/isppreview.c          |  707 ++--
4387  drivers/media/video/omap3isp/isppreview.h          |    1 +
4388  drivers/media/video/omap3isp/ispqueue.c            |   15 +-
4389  drivers/media/video/omap3isp/ispresizer.c          |    8 +-
4390  drivers/media/video/omap3isp/ispvideo.c            |   57 +-
4391  drivers/media/video/omap3isp/ispvideo.h            |    6 +-
4392  drivers/media/video/pvrusb2/pvrusb2-devattr.c      |   17 +-
4393  drivers/media/video/s2255drv.c                     |   42 +-
4394  drivers/media/video/s5k6aa.c                       |    2 +-
4395  drivers/media/video/s5p-g2d/g2d.c                  |   27 +-
4396  drivers/media/video/s5p-jpeg/jpeg-core.c           |   34 +-
4397  drivers/media/video/s5p-mfc/s5p_mfc.c              |   19 +-
4398  drivers/media/video/s5p-tv/mixer_video.c           |   29 +-
4399  drivers/media/video/saa7164/saa7164-api.c          |   15 +-
4400  drivers/media/video/saa7164/saa7164-core.c         |   46 +-
4401  drivers/media/video/saa7164/saa7164.h              |    1 -
4402  drivers/media/video/sh_vou.c                       |   25 +-
4403  drivers/media/video/soc_camera.c                   |   31 +-
4404  drivers/media/video/stk1160/Kconfig                |   20 +
4405  drivers/media/video/stk1160/Makefile               |   11 +
4406  drivers/media/video/stk1160/stk1160-ac97.c         |  153 +
4407  drivers/media/video/stk1160/stk1160-core.c         |  432 ++
4408  drivers/media/video/stk1160/stk1160-i2c.c          |  294 ++
4409  drivers/media/video/stk1160/stk1160-reg.h          |   93 +
4410  drivers/media/video/stk1160/stk1160-v4l.c          |  738 ++++
4411  drivers/media/video/stk1160/stk1160-video.c        |  518 +++
4412  drivers/media/video/stk1160/stk1160.h              |  208 +
4413  drivers/media/video/tm6000/tm6000-video.c          |   52 +-
4414  drivers/media/video/usbvision/usbvision-video.c    |   42 +-
4415  drivers/media/video/uvc/uvc_queue.c                |    1 +
4416  drivers/media/video/v4l2-common.c                  |    2 +-
4417  drivers/media/video/v4l2-dev.c                     |   51 +-
4418  drivers/media/video/v4l2-ioctl.c                   |   10 +-
4419  drivers/media/video/videobuf2-core.c               |   21 +-
4420  drivers/media/video/videobuf2-vmalloc.c            |    1 +
4421  drivers/media/video/vivi.c                         |   48 +-
4422  drivers/staging/media/Kconfig                      |    2 -
4423  drivers/staging/media/Makefile                     |    1 -
4424  drivers/staging/media/cxd2099/cxd2099.c            |   13 +-
4425  drivers/staging/media/dt3155v4l/dt3155v4l.c        |   29 +-
4426  drivers/staging/media/easycap/Kconfig              |   30 -
4427  drivers/staging/media/easycap/Makefile             |   10 -
4428  drivers/staging/media/easycap/README               |  141 -
4429  drivers/staging/media/easycap/easycap.h            |  567 ---
4430  drivers/staging/media/easycap/easycap_ioctl.c      | 2443 -----------
4431  drivers/staging/media/easycap/easycap_low.c        |  968 -----
4432  drivers/staging/media/easycap/easycap_main.c       | 4239 --------------------
4433  drivers/staging/media/easycap/easycap_settings.c   |  696 ----
4434  drivers/staging/media/easycap/easycap_sound.c      |  750 ----
4435  drivers/staging/media/easycap/easycap_testcard.c   |  155 -
4436  include/linux/omap3isp.h                           |    6 +-
4437  include/linux/v4l2-common.h                        |    8 +-
4438  include/media/omap3isp.h                           |   14 +-
4439  include/media/saa7146.h                            |    4 -
4440  include/media/v4l2-common.h                        |    4 +-
4441  include/media/v4l2-dev.h                           |    3 -
4442  include/media/v4l2-subdev.h                        |    2 +-
4443  203 files changed, 16299 insertions(+), 17234 deletions(-)
4444  create mode 100644 arch/arm/plat-mxc/devices/platform-imx27-coda.c
4445  rename drivers/media/dvb/{dvb-usb => dvb-core}/dvb-usb-ids.h (100%)
4446  create mode 100644 drivers/media/dvb/dvb-usb-v2/Kconfig
4447  create mode 100644 drivers/media/dvb/dvb-usb-v2/Makefile
4448  create mode 100644 drivers/media/dvb/dvb-usb-v2/af9015.c
4449  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/af9015.h (72%)
4450  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/af9035.c (62%)
4451  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/af9035.h (96%)
4452  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/anysee.c (70%)
4453  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/anysee.h (95%)
4454  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/au6610.c (64%)
4455  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/au6610.h (80%)
4456  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/az6007.c (63%)
4457  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ce6230.c (59%)
4458  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ce6230.h (60%)
4459  create mode 100644 drivers/media/dvb/dvb-usb-v2/cypress_firmware.c
4460  create mode 100644 drivers/media/dvb/dvb-usb-v2/cypress_firmware.h
4461  create mode 100644 drivers/media/dvb/dvb-usb-v2/dvb_usb.h
4462  create mode 100644 drivers/media/dvb/dvb-usb-v2/dvb_usb_common.h
4463  create mode 100644 drivers/media/dvb/dvb-usb-v2/dvb_usb_core.c
4464  create mode 100644 drivers/media/dvb/dvb-usb-v2/dvb_usb_urb.c
4465  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ec168.c (58%)
4466  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/ec168.h (65%)
4467  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/gl861.c (54%)
4468  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/gl861.h (59%)
4469  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/lmedm04.c (69%)
4470  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/lmedm04.h (100%)
4471  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-demod.c (100%)
4472  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-demod.h (100%)
4473  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-gpio.c (100%)
4474  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-gpio.h (100%)
4475  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-i2c.c (100%)
4476  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-i2c.h (100%)
4477  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-phy.c (100%)
4478  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-phy.h (100%)
4479  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-reg.h (100%)
4480  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-tuner.c (99%)
4481  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf-tuner.h (100%)
4482  create mode 100644 drivers/media/dvb/dvb-usb-v2/mxl111sf.c
4483  rename drivers/media/dvb/{dvb-usb => dvb-usb-v2}/mxl111sf.h (98%)
4484  create mode 100644 drivers/media/dvb/dvb-usb-v2/usb_urb.c
4485  delete mode 100644 drivers/media/dvb/dvb-usb/af9015.c
4486  create mode 100644 drivers/media/dvb/dvb-usb/dvb_usb_dvb.c
4487  create mode 100644 drivers/media/dvb/dvb-usb/dvb_usb_remote.c
4488  delete mode 100644 drivers/media/dvb/dvb-usb/mxl111sf.c
4489  create mode 100644 drivers/media/video/coda.c
4490  create mode 100644 drivers/media/video/coda.h
4491  create mode 100644 drivers/media/video/m2m-deinterlace.c
4492  create mode 100644 drivers/media/video/stk1160/Kconfig
4493  create mode 100644 drivers/media/video/stk1160/Makefile
4494  create mode 100644 drivers/media/video/stk1160/stk1160-ac97.c
4495  create mode 100644 drivers/media/video/stk1160/stk1160-core.c
4496  create mode 100644 drivers/media/video/stk1160/stk1160-i2c.c
4497  create mode 100644 drivers/media/video/stk1160/stk1160-reg.h
4498  create mode 100644 drivers/media/video/stk1160/stk1160-v4l.c
4499  create mode 100644 drivers/media/video/stk1160/stk1160-video.c
4500  create mode 100644 drivers/media/video/stk1160/stk1160.h
4501  delete mode 100644 drivers/staging/media/easycap/Kconfig
4502  delete mode 100644 drivers/staging/media/easycap/Makefile
4503  delete mode 100644 drivers/staging/media/easycap/README
4504  delete mode 100644 drivers/staging/media/easycap/easycap.h
4505  delete mode 100644 drivers/staging/media/easycap/easycap_ioctl.c
4506  delete mode 100644 drivers/staging/media/easycap/easycap_low.c
4507  delete mode 100644 drivers/staging/media/easycap/easycap_main.c
4508  delete mode 100644 drivers/staging/media/easycap/easycap_settings.c
4509  delete mode 100644 drivers/staging/media/easycap/easycap_sound.c
4510  delete mode 100644 drivers/staging/media/easycap/easycap_testcard.c
4511 Merging kbuild/for-next (85b170e Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next)
4512 $ git merge kbuild/for-next
4513 Merge made by the 'recursive' strategy.
4514 Merging kconfig/for-next (45f4c81 localmodconfig: Use my variable for loop in streamline_config.pl)
4515 $ git merge kconfig/for-next
4516 Merge made by the 'recursive' strategy.
4517  scripts/kconfig/streamline_config.pl |   48 ++++++++++++++++------------------
4518  1 file changed, 22 insertions(+), 26 deletions(-)
4519 Merging libata/NEXT (354b2ea libata-acpi: fix up for acpi_pm_device_sleep_state API)
4520 $ git merge libata/NEXT
4521 Already up-to-date.
4522 Merging infiniband/for-next (c0369b2 Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next)
4523 $ git merge infiniband/for-next
4524 Merge made by the 'recursive' strategy.
4525  drivers/infiniband/core/ucma.c               |    2 +-
4526  drivers/infiniband/hw/amso1100/c2_rnic.c     |    2 +-
4527  drivers/infiniband/hw/cxgb3/iwch_cm.c        |    2 +-
4528  drivers/infiniband/hw/mlx4/mad.c             |   16 +++--
4529  drivers/infiniband/hw/mlx4/main.c            |    5 +-
4530  drivers/infiniband/hw/mlx4/qp.c              |    6 +-
4531  drivers/infiniband/hw/ocrdma/ocrdma_main.c   |   16 ++---
4532  drivers/infiniband/hw/qib/qib_iba7322.c      |    4 +-
4533  drivers/infiniband/hw/qib/qib_sd7220.c       |    2 +-
4534  drivers/infiniband/ulp/ipoib/ipoib_cm.c      |    3 +
4535  drivers/infiniband/ulp/ipoib/ipoib_main.c    |    2 +-
4536  drivers/infiniband/ulp/srp/ib_srp.c          |   87 +++++++++++++++++++-------
4537  drivers/infiniband/ulp/srpt/ib_srpt.c        |    2 +-
4538  drivers/net/ethernet/mellanox/mlx4/icm.c     |    9 ++-
4539  drivers/net/ethernet/mellanox/mlx4/icm.h     |    2 +-
4540  drivers/net/ethernet/mellanox/mlx4/mlx4.h    |    4 +-
4541  drivers/net/ethernet/mellanox/mlx4/mr.c      |   27 +++++---
4542  drivers/net/ethernet/mellanox/mlx4/profile.c |    4 +-
4543  18 files changed, 130 insertions(+), 65 deletions(-)
4544 Merging acpi/next (9d0b01a Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie' into base)
4545 $ git merge acpi/next
4546 Already up-to-date.
4547 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
4548 $ git merge cpuidle/cpuidle-next
4549 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
4550 Auto-merging drivers/cpuidle/coupled.c
4551 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
4552 Automatic merge failed; fix conflicts and then commit the result.
4553 $ git commit -v -a
4554 [master d8e42ad] Merge remote-tracking branch 'cpuidle/cpuidle-next'
4555 $ git diff -M --stat --summary HEAD^..
4556 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
4557 $ git merge cpupowerutils/master
4558 Already up-to-date.
4559 Merging thermal/next (449488c thermal: Fix potential NULL pointer accesses)
4560 $ git merge thermal/next
4561 Auto-merging drivers/acpi/thermal.c
4562 Merge made by the 'recursive' strategy.
4563  Documentation/thermal/sysfs-api.txt                |    9 +-
4564  drivers/acpi/thermal.c                             |   93 ++++--
4565  drivers/platform/x86/acerhdf.c                     |    5 +-
4566  drivers/platform/x86/intel_mid_thermal.c           |    2 +-
4567  drivers/power/power_supply_core.c                  |    2 +-
4568  drivers/staging/omap-thermal/omap-thermal-common.c |    2 +-
4569  drivers/thermal/Kconfig                            |    8 +
4570  drivers/thermal/Makefile                           |    3 +-
4571  drivers/thermal/rcar_thermal.c                     |  260 ++++++++++++++++
4572  drivers/thermal/spear_thermal.c                    |    2 +-
4573  drivers/thermal/thermal_sys.c                      |  321 ++++++++++++--------
4574  include/linux/thermal.h                            |   28 +-
4575  12 files changed, 576 insertions(+), 159 deletions(-)
4576  create mode 100644 drivers/thermal/rcar_thermal.c
4577 Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute)
4578 $ git merge ieee1394/for-next
4579 Already up-to-date.
4580 Merging ubi/linux-next (a07ade1 arm: sam9_l9260_defconfig: remove non-existing config option)
4581 $ git merge ubi/linux-next
4582 Merge made by the 'recursive' strategy.
4583  arch/arm/configs/sam9_l9260_defconfig |    2 +-
4584  drivers/mtd/ubi/Kconfig               |   18 +++++--------
4585  drivers/mtd/ubi/build.c               |   12 ++++++++-
4586  drivers/mtd/ubi/misc.c                |   16 +++++++++---
4587  drivers/mtd/ubi/ubi.h                 |    5 ++--
4588  drivers/mtd/ubi/wl.c                  |   46 +++++++++++++++++++++------------
4589  6 files changed, 62 insertions(+), 37 deletions(-)
4590 Merging dlm/next (9c5bef5 dlm: cleanup send_to_sock routine)
4591 $ git merge dlm/next
4592 Merge made by the 'recursive' strategy.
4593  fs/dlm/ast.c          |    4 +-
4594  fs/dlm/config.c       |   79 ++++--------------
4595  fs/dlm/config.h       |    2 -
4596  fs/dlm/dlm_internal.h |   46 ++++++++---
4597  fs/dlm/lockspace.c    |   15 +++-
4598  fs/dlm/lowcomms.c     |  215 +++++++++++++++++++++++++++++++++++++++++--------
4599  fs/dlm/lowcomms.h     |    2 +
4600  fs/dlm/main.c         |    2 +
4601  fs/dlm/member.c       |   17 ++--
4602  fs/dlm/rcom.c         |    2 +-
4603  fs/dlm/recoverd.c     |   27 ++++---
4604  fs/dlm/recoverd.h     |    1 -
4605  12 files changed, 282 insertions(+), 130 deletions(-)
4606 Merging scsi/for-next (641aa03 Merge branch 'misc' into for-next)
4607 $ git merge scsi/for-next
4608 Resolved 'drivers/ata/libata-core.c' using previous resolution.
4609 Auto-merging include/linux/libata.h
4610 Auto-merging drivers/scsi/scsi_lib.c
4611 Auto-merging drivers/ata/libata-eh.c
4612 Auto-merging drivers/ata/libata-core.c
4613 CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
4614 Auto-merging Documentation/kernel-parameters.txt
4615 Automatic merge failed; fix conflicts and then commit the result.
4616 $ git commit -v -a
4617 [master 4bbe7d7] Merge remote-tracking branch 'scsi/for-next'
4618 $ git diff -M --stat --summary HEAD^..
4619  Documentation/kernel-parameters.txt         |    3 +
4620  Documentation/scsi/ChangeLog.megaraid_sas   |   10 ++
4621  drivers/ata/libata-core.c                   |   69 +++++++++----
4622  drivers/ata/libata-eh.c                     |    2 +
4623  drivers/scsi/ipr.c                          |  149 +++++++++++++++++++--------
4624  drivers/scsi/ipr.h                          |    5 +-
4625  drivers/scsi/isci/host.c                    |    4 +-
4626  drivers/scsi/isci/host.h                    |    2 +-
4627  drivers/scsi/isci/init.c                    |   59 ++++++++++-
4628  drivers/scsi/isci/phy.c                     |    4 +-
4629  drivers/scsi/isci/probe_roms.c              |    1 -
4630  drivers/scsi/isci/remote_node_context.h     |    2 +-
4631  drivers/scsi/libsas/sas_ata.c               |   91 +++++++++++++++-
4632  drivers/scsi/libsas/sas_discover.c          |   69 +++++++++++--
4633  drivers/scsi/libsas/sas_dump.c              |    1 +
4634  drivers/scsi/libsas/sas_event.c             |    4 +-
4635  drivers/scsi/libsas/sas_init.c              |   90 +++++++++++++++-
4636  drivers/scsi/libsas/sas_internal.h          |    1 +
4637  drivers/scsi/libsas/sas_phy.c               |   21 ++++
4638  drivers/scsi/libsas/sas_port.c              |   52 +++++++++-
4639  drivers/scsi/megaraid/megaraid_sas.h        |    8 +-
4640  drivers/scsi/megaraid/megaraid_sas_base.c   |   42 ++++++--
4641  drivers/scsi/megaraid/megaraid_sas_fusion.c |    5 +-
4642  drivers/scsi/mpt2sas/Kconfig                |    2 +-
4643  drivers/scsi/mpt2sas/mpi/mpi2.h             |   14 ++-
4644  drivers/scsi/mpt2sas/mpi/mpi2_init.h        |    9 +-
4645  drivers/scsi/mpt2sas/mpi/mpi2_ioc.h         |    8 +-
4646  drivers/scsi/mpt2sas/mpi/mpi2_raid.h        |    7 +-
4647  drivers/scsi/mpt2sas/mpt2sas_base.c         |   19 ++--
4648  drivers/scsi/mpt2sas/mpt2sas_base.h         |   14 +--
4649  drivers/scsi/mpt2sas/mpt2sas_config.c       |   38 ++++++-
4650  drivers/scsi/mpt2sas/mpt2sas_ctl.c          |   72 ++++++++++++-
4651  drivers/scsi/mpt2sas/mpt2sas_ctl.h          |    2 +-
4652  drivers/scsi/mpt2sas/mpt2sas_debug.h        |    2 +-
4653  drivers/scsi/mpt2sas/mpt2sas_scsih.c        |   30 +++++-
4654  drivers/scsi/mpt2sas/mpt2sas_transport.c    |    2 +-
4655  drivers/scsi/scsi_lib.c                     |    5 +-
4656  include/linux/libata.h                      |   15 ++-
4657  include/scsi/libsas.h                       |   20 +++-
4658  include/scsi/sas_ata.h                      |   10 ++
4659  40 files changed, 819 insertions(+), 144 deletions(-)
4660 Merging target-updates/for-next (bf6932f iscsi-target: Drop bogus struct file usage for iSCSI/SCTP)
4661 $ git merge target-updates/for-next
4662 Already up-to-date.
4663 Merging target-merge/for-next-merge (1247c37 tcm_vhost: Initial merge for vhost level target fabric driver)
4664 $ git merge target-merge/for-next-merge
4665 Merge made by the 'recursive' strategy.
4666 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
4667 $ git merge ibft/linux-next
4668 Already up-to-date.
4669 Merging isci/all (6734092 isci: add a couple __iomem annotations)
4670 $ git merge isci/all
4671 Already up-to-date.
4672 Merging slave-dma/next (c87a9fc Merge branch 'fixes_for-3.6' into next)
4673 $ git merge slave-dma/next
4674 Merge made by the 'recursive' strategy.
4675  drivers/dma/dw_dmac.c      |   53 +++++++++-----------------------------------
4676  drivers/dma/dw_dmac_regs.h |    2 --
4677  2 files changed, 10 insertions(+), 45 deletions(-)
4678 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
4679 $ git merge dmaengine/next
4680 Already up-to-date.
4681 Merging net-next/master (02644a1 sctp: fix bogus if statement in sctp_auth_recv_cid())
4682 $ git merge net-next/master
4683 Auto-merging net/packet/af_packet.c
4684 Auto-merging net/ipv6/tcp_ipv6.c
4685 Auto-merging net/ipv4/tcp_ipv4.c
4686 Auto-merging net/ipv4/tcp_input.c
4687 Auto-merging net/ipv4/route.c
4688 Auto-merging net/ipv4/fib_trie.c
4689 Auto-merging net/core/dev.c
4690 Auto-merging net/bluetooth/sco.c
4691 Auto-merging net/bluetooth/rfcomm/sock.c
4692 Auto-merging net/bluetooth/l2cap_sock.c
4693 Auto-merging net/bluetooth/l2cap_core.c
4694 Auto-merging net/bluetooth/hci_sock.c
4695 Auto-merging net/bluetooth/hci_event.c
4696 Auto-merging include/net/dst.h
4697 Auto-merging include/linux/netdevice.h
4698 Auto-merging include/linux/jiffies.h
4699 Auto-merging include/linux/if_team.h
4700 Auto-merging include/linux/Kbuild
4701 Removing firmware/cxgb3/t3fw-7.10.0.bin.ihex
4702 Auto-merging drivers/net/wireless/ath/ath5k/mac80211-ops.c
4703 Auto-merging drivers/net/wireless/ath/ath5k/base.c
4704 Auto-merging drivers/net/team/team.c
4705 Auto-merging drivers/net/bonding/bond_main.c
4706 Auto-merging drivers/bluetooth/btusb.c
4707 Merge made by the 'recursive' strategy.
4708  Documentation/devicetree/bindings/net/cpsw.txt     |  109 ++
4709  .../devicetree/bindings/net/davinci-mdio.txt       |   33 +
4710  drivers/bcma/driver_chipcommon_pmu.c               |    4 +-
4711  drivers/bcma/host_pci.c                            |   11 +-
4712  drivers/bcma/host_soc.c                            |    2 +-
4713  drivers/bluetooth/bcm203x.c                        |    8 +-
4714  drivers/bluetooth/bfusb.c                          |   12 +-
4715  drivers/bluetooth/bluecard_cs.c                    |    5 +-
4716  drivers/bluetooth/bpa10x.c                         |    8 +-
4717  drivers/bluetooth/bt3c_cs.c                        |    5 +-
4718  drivers/bluetooth/btmrvl_sdio.c                    |   15 +-
4719  drivers/bluetooth/btsdio.c                         |    8 +-
4720  drivers/bluetooth/btuart_cs.c                      |    5 +-
4721  drivers/bluetooth/btusb.c                          |   13 +-
4722  drivers/bluetooth/btwilink.c                       |    8 +-
4723  drivers/bluetooth/dtl1_cs.c                        |    3 +-
4724  drivers/net/bonding/bond_main.c                    |   20 +-
4725  drivers/net/ethernet/ti/Kconfig                    |    4 +-
4726  drivers/net/ethernet/ti/cpsw.c                     |  174 +-
4727  drivers/net/ethernet/ti/davinci_mdio.c             |   41 +-
4728  drivers/net/hyperv/netvsc_drv.c                    |    2 +-
4729  drivers/net/hyperv/rndis_filter.c                  |    8 +-
4730  drivers/net/loopback.c                             |    1 +
4731  drivers/net/ppp/ppp_generic.c                      |   58 +-
4732  drivers/net/team/team.c                            |  200 +-
4733  drivers/net/veth.c                                 |    3 +
4734  drivers/net/virtio_net.c                           |    2 +-
4735  drivers/net/wireless/ath/ath5k/ath5k.h             |    2 +-
4736  drivers/net/wireless/ath/ath5k/base.c              |    5 +-
4737  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    4 +-
4738  drivers/net/wireless/ath/ath5k/phy.c               |   43 +-
4739  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  149 +-
4740  drivers/net/wireless/ath/ath9k/rc.c                |  812 ++++----
4741  drivers/net/wireless/ath/ath9k/rc.h                |    4 -
4742  drivers/net/wireless/ath/carl9170/fw.c             |    1 +
4743  drivers/net/wireless/ath/carl9170/mac.c            |    2 +-
4744  drivers/net/wireless/ath/carl9170/main.c           |    4 +-
4745  drivers/net/wireless/ath/carl9170/rx.c             |    1 +
4746  drivers/net/wireless/b43/Makefile                  |    1 +
4747  drivers/net/wireless/b43/b43.h                     |   10 +-
4748  drivers/net/wireless/b43/main.c                    |   51 +-
4749  drivers/net/wireless/b43/phy_common.c              |   17 +-
4750  drivers/net/wireless/b43/phy_common.h              |    6 +
4751  drivers/net/wireless/b43/phy_n.c                   |  668 ++++++-
4752  drivers/net/wireless/b43/phy_n.h                   |    1 +
4753  drivers/net/wireless/b43/radio_2057.c              |  141 ++
4754  drivers/net/wireless/b43/radio_2057.h              |  430 +++++
4755  drivers/net/wireless/b43/tables_nphy.c             |   75 +
4756  drivers/net/wireless/b43/tables_nphy.h             |   10 +
4757  drivers/net/wireless/b43legacy/main.c              |    2 +-
4758  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    4 +-
4759  drivers/net/wireless/brcm80211/brcmsmac/main.c     |   13 +-
4760  .../net/wireless/brcm80211/include/brcmu_wifi.h    |    5 -
4761  drivers/net/wireless/iwlegacy/common.c             |   15 +-
4762  drivers/net/wireless/iwlegacy/common.h             |    2 -
4763  drivers/net/wireless/mwifiex/11n.c                 |   26 +
4764  drivers/net/wireless/mwifiex/11n.h                 |   15 +
4765  drivers/net/wireless/mwifiex/11n_aggr.c            |   14 +-
4766  drivers/net/wireless/mwifiex/11n_rxreorder.c       |   66 +-
4767  drivers/net/wireless/mwifiex/11n_rxreorder.h       |    5 +
4768  drivers/net/wireless/mwifiex/Makefile              |    2 +
4769  drivers/net/wireless/mwifiex/cfg80211.c            |   17 +-
4770  drivers/net/wireless/mwifiex/cmdevt.c              |    5 +-
4771  drivers/net/wireless/mwifiex/decl.h                |    3 +
4772  drivers/net/wireless/mwifiex/fw.h                  |   42 +-
4773  drivers/net/wireless/mwifiex/init.c                |  107 +-
4774  drivers/net/wireless/mwifiex/ioctl.h               |    5 +-
4775  drivers/net/wireless/mwifiex/main.c                |    3 +
4776  drivers/net/wireless/mwifiex/main.h                |   38 +-
4777  drivers/net/wireless/mwifiex/scan.c                |    6 +-
4778  drivers/net/wireless/mwifiex/sta_cmd.c             |   55 +-
4779  drivers/net/wireless/mwifiex/sta_event.c           |   64 +-
4780  drivers/net/wireless/mwifiex/sta_ioctl.c           |   12 +-
4781  drivers/net/wireless/mwifiex/sta_rx.c              |   38 +-
4782  drivers/net/wireless/mwifiex/txrx.c                |    5 +
4783  drivers/net/wireless/mwifiex/uap_cmd.c             |    1 +
4784  drivers/net/wireless/mwifiex/uap_event.c           |  290 +++
4785  drivers/net/wireless/mwifiex/uap_txrx.c            |  255 +++
4786  drivers/net/wireless/mwifiex/wmm.c                 |   59 +-
4787  drivers/net/wireless/p54/eeprom.c                  |  108 +-
4788  drivers/net/wireless/p54/eeprom.h                  |   12 +
4789  drivers/net/wireless/p54/p54pci.c                  |   88 +-
4790  drivers/net/wireless/p54/p54pci.h                  |    1 +
4791  drivers/net/xen-netfront.c                         |    2 +-
4792  drivers/ssb/driver_mipscore.c                      |   28 +-
4793  firmware/Makefile                                  |    1 -
4794  firmware/cxgb3/t3fw-7.10.0.bin.ihex                | 1935 --------------------
4795  include/linux/Kbuild                               |    1 +
4796  include/linux/bcma/bcma_driver_chipcommon.h        |   85 +
4797  include/linux/bcma/bcma_regs.h                     |    2 +
4798  include/linux/hash.h                               |   10 +
4799  include/linux/if_arp.h                             |    1 +
4800  include/linux/if_team.h                            |    7 +
4801  include/linux/if_tunnel.h                          |    3 +
4802  include/linux/inetdevice.h                         |   11 +-
4803  include/linux/ip6_tunnel.h                         |   17 +
4804  include/linux/jiffies.h                            |    6 +
4805  include/linux/netdevice.h                          |    5 +-
4806  include/linux/packet_diag.h                        |   57 +
4807  include/linux/skbuff.h                             |    9 +-
4808  include/linux/snmp.h                               |   12 +-
4809  include/linux/ssb/ssb_driver_chipcommon.h          |    4 +-
4810  include/net/arp.h                                  |    3 +-
4811  include/net/bluetooth/bluetooth.h                  |   10 +
4812  include/net/bluetooth/hci.h                        |   11 +
4813  include/net/bluetooth/hci_core.h                   |   22 +-
4814  include/net/bluetooth/l2cap.h                      |   17 +-
4815  include/net/bluetooth/smp.h                        |    8 +-
4816  include/net/dst.h                                  |   10 +-
4817  include/net/ip6_tunnel.h                           |   41 +-
4818  include/net/ipv6.h                                 |    1 +
4819  include/net/ndisc.h                                |    3 +-
4820  include/net/neighbour.h                            |   14 +-
4821  include/net/net_namespace.h                        |   12 +
4822  include/net/netlink.h                              |   98 +
4823  include/net/netns/sctp.h                           |  131 ++
4824  include/net/sctp/sctp.h                            |   69 +-
4825  include/net/sctp/sm.h                              |    8 +-
4826  include/net/sctp/structs.h                         |  154 +-
4827  include/net/snmp.h                                 |   10 +-
4828  include/net/xfrm.h                                 |    2 +-
4829  net/bluetooth/a2mp.c                               |   16 +-
4830  net/bluetooth/af_bluetooth.c                       |  141 ++
4831  net/bluetooth/bnep/sock.c                          |   22 +-
4832  net/bluetooth/cmtp/sock.c                          |   23 +-
4833  net/bluetooth/hci_core.c                           |    6 +-
4834  net/bluetooth/hci_event.c                          |   93 +-
4835  net/bluetooth/hci_sock.c                           |   13 +-
4836  net/bluetooth/hidp/sock.c                          |   22 +-
4837  net/bluetooth/l2cap_core.c                         |   32 +-
4838  net/bluetooth/l2cap_sock.c                         |   22 +-
4839  net/bluetooth/mgmt.c                               |   34 +-
4840  net/bluetooth/rfcomm/sock.c                        |   14 +-
4841  net/bluetooth/sco.c                                |   16 +-
4842  net/bridge/br_fdb.c                                |    2 +-
4843  net/bridge/br_stp_timer.c                          |    2 +-
4844  net/core/dev.c                                     |   29 +-
4845  net/core/rtnetlink.c                               |   14 +-
4846  net/decnet/dn_route.c                              |    6 +-
4847  net/ipv4/af_inet.c                                 |    4 +-
4848  net/ipv4/devinet.c                                 |   39 +-
4849  net/ipv4/fib_frontend.c                            |    2 +-
4850  net/ipv4/fib_trie.c                                |   13 +-
4851  net/ipv4/igmp.c                                    |    7 +-
4852  net/ipv4/ipmr.c                                    |    2 +-
4853  net/ipv4/netfilter/ipt_rpfilter.c                  |    2 +-
4854  net/ipv4/route.c                                   |   17 +-
4855  net/ipv4/tcp_input.c                               |    9 +-
4856  net/ipv4/tcp_ipv4.c                                |   13 +-
4857  net/ipv6/Kconfig                                   |   16 +
4858  net/ipv6/Makefile                                  |    1 +
4859  net/ipv6/ip6_gre.c                                 | 1790 ++++++++++++++++++
4860  net/ipv6/ip6_tunnel.c                              |   89 +-
4861  net/ipv6/route.c                                   |    2 +-
4862  net/ipv6/tcp_ipv6.c                                |    9 +-
4863  net/key/af_key.c                                   |    4 +-
4864  net/mac80211/mesh.c                                |   21 +-
4865  net/mac80211/mesh.h                                |    2 +-
4866  net/mac80211/mesh_plink.c                          |   44 +-
4867  net/packet/Kconfig                                 |    8 +
4868  net/packet/Makefile                                |    2 +
4869  net/packet/af_packet.c                             |   99 +-
4870  net/packet/diag.c                                  |  176 ++
4871  net/packet/internal.h                              |  103 ++
4872  net/sched/sch_generic.c                            |   18 -
4873  net/sctp/associola.c                               |   25 +-
4874  net/sctp/auth.c                                    |   20 +-
4875  net/sctp/bind_addr.c                               |   20 +-
4876  net/sctp/chunk.c                                   |    2 +-
4877  net/sctp/endpointola.c                             |   25 +-
4878  net/sctp/input.c                                   |  115 +-
4879  net/sctp/ipv6.c                                    |   36 +-
4880  net/sctp/objcnt.c                                  |    8 +-
4881  net/sctp/output.c                                  |    2 +-
4882  net/sctp/outqueue.c                                |   18 +-
4883  net/sctp/primitive.c                               |    4 +-
4884  net/sctp/proc.c                                    |   55 +-
4885  net/sctp/protocol.c                                |  454 ++---
4886  net/sctp/sm_make_chunk.c                           |   61 +-
4887  net/sctp/sm_sideeffect.c                           |   26 +-
4888  net/sctp/sm_statefuns.c                            |  725 ++++----
4889  net/sctp/sm_statetable.c                           |   17 +-
4890  net/sctp/socket.c                                  |  119 +-
4891  net/sctp/sysctl.c                                  |  198 +-
4892  net/sctp/transport.c                               |   23 +-
4893  net/sctp/ulpqueue.c                                |   18 +-
4894  net/xfrm/xfrm_policy.c                             |   39 +-
4895  net/xfrm/xfrm_state.c                              |    2 +-
4896  net/xfrm/xfrm_user.c                               |    9 +-
4897  189 files changed, 8014 insertions(+), 4408 deletions(-)
4898  create mode 100644 Documentation/devicetree/bindings/net/cpsw.txt
4899  create mode 100644 Documentation/devicetree/bindings/net/davinci-mdio.txt
4900  create mode 100644 drivers/net/wireless/b43/radio_2057.c
4901  create mode 100644 drivers/net/wireless/b43/radio_2057.h
4902  create mode 100644 drivers/net/wireless/mwifiex/uap_event.c
4903  create mode 100644 drivers/net/wireless/mwifiex/uap_txrx.c
4904  delete mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
4905  create mode 100644 include/linux/packet_diag.h
4906  create mode 100644 include/net/netns/sctp.h
4907  create mode 100644 net/ipv6/ip6_gre.c
4908  create mode 100644 net/packet/diag.c
4909  create mode 100644 net/packet/internal.h
4910 Merging wireless-next/master (22c5649 p54: fix powerpc gcc warnings)
4911 $ git merge wireless-next/master
4912 Already up-to-date.
4913 Merging bluetooth/master (b691f1a Bluetooth: mgmt: Add device disconnect reason)
4914 $ git merge bluetooth/master
4915 Auto-merging net/bluetooth/hci_event.c
4916 Merge made by the 'recursive' strategy.
4917  include/net/bluetooth/hci.h      |    3 ++
4918  include/net/bluetooth/hci_core.h |    4 +-
4919  include/net/bluetooth/mgmt.h     |    9 ++++
4920  net/bluetooth/af_bluetooth.c     |   20 +++-----
4921  net/bluetooth/hci_conn.c         |   99 ++++++++++++++++++++++++--------------
4922  net/bluetooth/hci_event.c        |   32 +++++++++---
4923  net/bluetooth/mgmt.c             |    9 ++--
4924  7 files changed, 114 insertions(+), 62 deletions(-)
4925 Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/Micron N25Q032)
4926 $ git merge mtd/master
4927 Auto-merging drivers/mtd/nand/Kconfig
4928 Auto-merging drivers/mtd/mtdoops.c
4929 Removing drivers/mtd/maps/wr_sbc82xx_flash.c
4930 Auto-merging arch/arm/mach-imx/clk-imx51-imx53.c
4931 Auto-merging arch/arm/boot/dts/imx53.dtsi
4932 Auto-merging arch/arm/boot/dts/imx51.dtsi
4933 Merge made by the 'recursive' strategy.
4934  Documentation/DocBook/mtdnand.tmpl                 |    2 -
4935  .../devicetree/bindings/mtd/atmel-nand.txt         |   40 +-
4936  .../devicetree/bindings/mtd/gpmi-nand.txt          |    4 +
4937  .../devicetree/bindings/mtd/lpc32xx-mlc.txt        |   50 +
4938  .../devicetree/bindings/mtd/lpc32xx-slc.txt        |   52 +
4939  arch/arm/boot/dts/imx51.dtsi                       |    7 +
4940  arch/arm/boot/dts/imx53.dtsi                       |    7 +
4941  arch/arm/mach-imx/clk-imx51-imx53.c                |    2 +
4942  arch/arm/plat-mxc/devices/platform-mxc_nand.c      |   11 +-
4943  drivers/mtd/chips/Kconfig                          |   11 +-
4944  drivers/mtd/chips/cfi_cmdset_0002.c                |   67 ++
4945  drivers/mtd/devices/Kconfig                        |    2 +-
4946  drivers/mtd/devices/m25p80.c                       |    6 +
4947  drivers/mtd/devices/spear_smi.c                    |   54 +-
4948  drivers/mtd/maps/Kconfig                           |   12 -
4949  drivers/mtd/maps/Makefile                          |    1 -
4950  drivers/mtd/maps/wr_sbc82xx_flash.c                |  174 ----
4951  drivers/mtd/mtdcore.c                              |    9 +
4952  drivers/mtd/mtdoops.c                              |   14 +-
4953  drivers/mtd/nand/Kconfig                           |   62 +-
4954  drivers/mtd/nand/Makefile                          |    2 +
4955  drivers/mtd/nand/atmel_nand.c                      |  934 +++++++++++++++--
4956  drivers/mtd/nand/atmel_nand_ecc.h                  |  114 ++-
4957  drivers/mtd/nand/bcm_umi_bch.c                     |    6 +-
4958  drivers/mtd/nand/bf5xx_nand.c                      |    6 +-
4959  drivers/mtd/nand/cafe_nand.c                       |   13 +-
4960  drivers/mtd/nand/denali.c                          |   12 +-
4961  drivers/mtd/nand/docg4.c                           |    8 +-
4962  drivers/mtd/nand/fsl_elbc_nand.c                   |   15 +-
4963  drivers/mtd/nand/fsl_ifc_nand.c                    |    5 +-
4964  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |   13 +-
4965  drivers/mtd/nand/lpc32xx_mlc.c                     |  925 +++++++++++++++++
4966  drivers/mtd/nand/lpc32xx_slc.c                     | 1059 ++++++++++++++++++++
4967  drivers/mtd/nand/mxc_nand.c                        |  141 +--
4968  drivers/mtd/nand/nand_base.c                       |   50 +-
4969  drivers/mtd/nand/nand_bbt.c                        |   21 +-
4970  drivers/mtd/nand/nand_ids.c                        |    7 +-
4971  drivers/mtd/nand/pxa3xx_nand.c                     |    5 +-
4972  drivers/mtd/nand/sh_flctl.c                        |  302 +++---
4973  drivers/mtd/tests/mtd_speedtest.c                  |   16 +-
4974  drivers/mtd/tests/mtd_stresstest.c                 |   39 +-
4975  include/linux/mtd/bbm.h                            |    7 +-
4976  include/linux/mtd/mtd.h                            |    9 +-
4977  include/linux/mtd/nand.h                           |   11 +-
4978  include/linux/mtd/sh_flctl.h                       |   23 +-
4979  45 files changed, 3653 insertions(+), 677 deletions(-)
4980  create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
4981  create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
4982  delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
4983  create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
4984  create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
4985 Merging l2-mtd/master (6fc9dbb mtd: nand: rename '_raw' BBT scan functions)
4986 $ git merge l2-mtd/master
4987 Merge made by the 'recursive' strategy.
4988  drivers/mtd/devices/m25p80.c           |   11 ++--
4989  drivers/mtd/mtdcore.c                  |   14 ++++-
4990  drivers/mtd/nand/gpmi-nand/gpmi-lib.c  |   45 +++++++++++++---
4991  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |   82 ++++++++++++++++++++++++----
4992  drivers/mtd/nand/gpmi-nand/gpmi-nand.h |    3 +-
4993  drivers/mtd/nand/nand_bbt.c            |   91 ++++++++++++++++----------------
4994  drivers/mtd/nand/sh_flctl.c            |   30 ++++++-----
4995  include/linux/mtd/sh_flctl.h           |    2 +-
4996  8 files changed, 196 insertions(+), 82 deletions(-)
4997 Merging crypto/master (35a1fc1 powerpc/crypto: add 842 crypto driver)
4998 $ git merge crypto/master
4999 Auto-merging crypto/cast6_generic.c
5000 Auto-merging crypto/cast5_generic.c
5001 Auto-merging MAINTAINERS
5002 Merge made by the 'recursive' strategy.
5003  MAINTAINERS                                |    6 +
5004  arch/powerpc/configs/ppc64_defconfig       |    3 +-
5005  arch/powerpc/configs/pseries_defconfig     |    3 +-
5006  arch/powerpc/kernel/prom_init.c            |    4 +-
5007  arch/s390/crypto/aes_s390.c                |    5 -
5008  arch/s390/crypto/des_s390.c                |   10 -
5009  arch/s390/crypto/ghash_s390.c              |    1 -
5010  arch/x86/crypto/Makefile                   |    4 +
5011  arch/x86/crypto/aes_glue.c                 |    1 -
5012  arch/x86/crypto/aesni-intel_glue.c         |    5 +-
5013  arch/x86/crypto/blowfish_glue.c            |    4 -
5014  arch/x86/crypto/camellia_glue.c            |    6 -
5015  arch/x86/crypto/cast5-avx-x86_64-asm_64.S  |  322 ++++
5016  arch/x86/crypto/cast5_avx_glue.c           |  530 ++++++
5017  arch/x86/crypto/cast6-avx-x86_64-asm_64.S  |  335 ++++
5018  arch/x86/crypto/cast6_avx_glue.c           |  648 +++++++
5019  arch/x86/crypto/ghash-clmulni-intel_glue.c |    2 -
5020  arch/x86/crypto/salsa20_glue.c             |    1 -
5021  arch/x86/crypto/serpent_avx_glue.c         |   10 -
5022  arch/x86/crypto/serpent_sse2_glue.c        |   10 -
5023  arch/x86/crypto/twofish_avx_glue.c         |   10 -
5024  arch/x86/crypto/twofish_glue.c             |    1 -
5025  arch/x86/crypto/twofish_glue_3way.c        |    5 -
5026  crypto/842.c                               |  183 ++
5027  crypto/Kconfig                             |   40 +
5028  crypto/Makefile                            |    5 +-
5029  crypto/aes_generic.c                       |    1 -
5030  crypto/ansi_cprng.c                        |   63 +-
5031  crypto/anubis.c                            |    1 -
5032  crypto/blowfish_generic.c                  |    1 -
5033  crypto/camellia_generic.c                  |    1 -
5034  crypto/{cast5.c => cast5_generic.c}        |   80 +-
5035  crypto/{cast6.c => cast6_generic.c}        |   67 +-
5036  crypto/crypto_null.c                       |   57 +-
5037  crypto/deflate.c                           |    1 -
5038  crypto/des_generic.c                       |   25 +-
5039  crypto/fcrypt.c                            |    1 -
5040  crypto/ghash-generic.c                     |    1 -
5041  crypto/khazad.c                            |    1 -
5042  crypto/krng.c                              |    1 -
5043  crypto/lzo.c                               |    1 -
5044  crypto/salsa20_generic.c                   |    1 -
5045  crypto/seed.c                              |    1 -
5046  crypto/serpent_generic.c                   |   53 +-
5047  crypto/sha256_generic.c                    |   25 +-
5048  crypto/sha512_generic.c                    |   20 +-
5049  crypto/shash.c                             |   36 +
5050  crypto/tcrypt.c                            |   82 +
5051  crypto/tcrypt.h                            |    1 +
5052  crypto/tea.c                               |   41 +-
5053  crypto/testmgr.c                           |  210 +++
5054  crypto/testmgr.h                           | 2538 ++++++++++++++++++++++++++--
5055  crypto/tgr192.c                            |   38 +-
5056  crypto/twofish_generic.c                   |    1 -
5057  crypto/wp512.c                             |   39 +-
5058  drivers/crypto/Kconfig                     |   20 +-
5059  drivers/crypto/atmel-aes.c                 |    2 -
5060  drivers/crypto/atmel-tdes.c                |    1 -
5061  drivers/crypto/caam/caamalg.c              |    8 +-
5062  drivers/crypto/caam/caamhash.c             |   18 +-
5063  drivers/crypto/caam/caamrng.c              |    9 +-
5064  drivers/crypto/caam/jr.c                   |   10 +-
5065  drivers/crypto/geode-aes.c                 |    3 -
5066  drivers/crypto/nx/Kconfig                  |   26 +
5067  drivers/crypto/nx/Makefile                 |    5 +-
5068  drivers/crypto/nx/nx-842.c                 | 1615 ++++++++++++++++++
5069  drivers/crypto/nx/nx-aes-cbc.c             |    1 -
5070  drivers/crypto/nx/nx-aes-ccm.c             |    2 -
5071  drivers/crypto/nx/nx-aes-ctr.c             |    2 -
5072  drivers/crypto/nx/nx-aes-ecb.c             |    1 -
5073  drivers/crypto/nx/nx-aes-gcm.c             |    2 -
5074  drivers/crypto/omap-aes.c                  |    1 -
5075  drivers/crypto/padlock-aes.c               |    3 -
5076  drivers/crypto/s5p-sss.c                   |    1 -
5077  drivers/crypto/tegra-aes.c                 |    2 -
5078  include/crypto/cast5.h                     |   22 +
5079  include/crypto/cast6.h                     |   23 +
5080  include/crypto/internal/hash.h             |    2 +
5081  include/linux/nx842.h                      |   11 +
5082  79 files changed, 6702 insertions(+), 630 deletions(-)
5083  create mode 100644 arch/x86/crypto/cast5-avx-x86_64-asm_64.S
5084  create mode 100644 arch/x86/crypto/cast5_avx_glue.c
5085  create mode 100644 arch/x86/crypto/cast6-avx-x86_64-asm_64.S
5086  create mode 100644 arch/x86/crypto/cast6_avx_glue.c
5087  create mode 100644 crypto/842.c
5088  rename crypto/{cast5.c => cast5_generic.c} (95%)
5089  rename crypto/{cast6.c => cast6_generic.c} (94%)
5090  create mode 100644 drivers/crypto/nx/Kconfig
5091  create mode 100644 drivers/crypto/nx/nx-842.c
5092  create mode 100644 include/crypto/cast5.h
5093  create mode 100644 include/crypto/cast6.h
5094  create mode 100644 include/linux/nx842.h
5095 Merging drm/drm-next (e2f895f Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next)
5096 $ git merge drm/drm-next
5097 Already up-to-date!
5098 Merge made by the 'recursive' strategy.
5099 Merging sound/for-next (1c86845 ALSA: hda - Add 3stack-automute model to AD1882 codec)
5100 $ git merge sound/for-next
5101 Auto-merging sound/pci/hda/hda_proc.c
5102 Auto-merging sound/pci/hda/hda_intel.c
5103 Auto-merging sound/pci/hda/hda_codec.c
5104 Auto-merging sound/pci/cs46xx/cs46xx_lib.c
5105 Merge made by the 'recursive' strategy.
5106  Documentation/sound/alsa/HD-Audio-Models.txt |    3 +-
5107  include/sound/emu10k1.h                      |    4 +-
5108  include/sound/initval.h                      |   14 +++++
5109  sound/isa/gus/interwave.c                    |    5 +-
5110  sound/isa/opti9xx/miro.c                     |   15 +----
5111  sound/isa/opti9xx/opti92x-ad1848.c           |   14 +----
5112  sound/pci/ali5451/ali5451.c                  |   10 ++--
5113  sound/pci/als300.c                           |    2 +-
5114  sound/pci/als4000.c                          |    4 +-
5115  sound/pci/asihpi/asihpi.c                    |    2 +-
5116  sound/pci/atiixp.c                           |    6 +-
5117  sound/pci/atiixp_modem.c                     |    6 +-
5118  sound/pci/azt3328.c                          |    6 +-
5119  sound/pci/ca0106/ca0106.h                    |    4 +-
5120  sound/pci/ca0106/ca0106_main.c               |    2 +-
5121  sound/pci/ca0106/ca0106_mixer.c              |    4 +-
5122  sound/pci/cmipci.c                           |    6 +-
5123  sound/pci/cs4281.c                           |    6 +-
5124  sound/pci/cs46xx/cs46xx.c                    |    2 +-
5125  sound/pci/cs46xx/cs46xx.h                    |    2 +-
5126  sound/pci/cs46xx/cs46xx_lib.c                |    8 +--
5127  sound/pci/cs46xx/cs46xx_lib.h                |    2 +-
5128  sound/pci/cs46xx/dsp_spos.c                  |    8 +--
5129  sound/pci/cs46xx/dsp_spos_scb_lib.c          |    2 +-
5130  sound/pci/cs5535audio/Makefile               |    2 +-
5131  sound/pci/cs5535audio/cs5535audio.c          |    2 +-
5132  sound/pci/ctxfi/ctatc.c                      |    4 +-
5133  sound/pci/ctxfi/ctatc.h                      |    2 +-
5134  sound/pci/ctxfi/cthardware.h                 |    2 +-
5135  sound/pci/ctxfi/cthw20k1.c                   |    4 +-
5136  sound/pci/ctxfi/cthw20k2.c                   |    4 +-
5137  sound/pci/ctxfi/ctmixer.c                    |    4 +-
5138  sound/pci/ctxfi/ctmixer.h                    |    2 +-
5139  sound/pci/ctxfi/ctpcm.c                      |    2 +-
5140  sound/pci/ctxfi/xfi.c                        |    2 +-
5141  sound/pci/echoaudio/echoaudio.c              |   12 ++--
5142  sound/pci/echoaudio/echoaudio.h              |    2 +-
5143  sound/pci/emu10k1/emu10k1.c                  |    4 +-
5144  sound/pci/emu10k1/emu10k1_main.c             |    8 +--
5145  sound/pci/emu10k1/emufx.c                    |    2 +-
5146  sound/pci/emu10k1/p16v.c                     |    2 +-
5147  sound/pci/ens1370.c                          |    4 +-
5148  sound/pci/es1938.c                           |    6 +-
5149  sound/pci/es1968.c                           |   12 ++--
5150  sound/pci/fm801.c                            |    6 +-
5151  sound/pci/hda/hda_codec.c                    |    2 +-
5152  sound/pci/hda/hda_codec.h                    |    6 +-
5153  sound/pci/hda/hda_hwdep.c                    |   39 +++++--------
5154  sound/pci/hda/hda_intel.c                    |   78 +++++++++++++++++++++-----
5155  sound/pci/hda/hda_proc.c                     |    9 ++-
5156  sound/pci/hda/patch_analog.c                 |   40 +++++++++++++
5157  sound/pci/ice1712/aureon.c                   |    4 +-
5158  sound/pci/ice1712/ice1712.h                  |    2 +-
5159  sound/pci/ice1712/ice1724.c                  |    4 +-
5160  sound/pci/ice1712/juli.c                     |    4 +-
5161  sound/pci/ice1712/prodigy_hifi.c             |    4 +-
5162  sound/pci/intel8x0.c                         |    4 +-
5163  sound/pci/intel8x0m.c                        |    4 +-
5164  sound/pci/maestro3.c                         |   10 ++--
5165  sound/pci/nm256/nm256.c                      |    4 +-
5166  sound/pci/oxygen/oxygen.c                    |    2 +-
5167  sound/pci/oxygen/oxygen.h                    |    2 +-
5168  sound/pci/oxygen/oxygen_lib.c                |    4 +-
5169  sound/pci/oxygen/virtuoso.c                  |    2 +-
5170  sound/pci/riptide/riptide.c                  |    6 +-
5171  sound/pci/sis7019.c                          |    6 +-
5172  sound/pci/trident/trident.c                  |    2 +-
5173  sound/pci/trident/trident_main.c             |    4 +-
5174  sound/pci/via82xx.c                          |   10 ++--
5175  sound/pci/via82xx_modem.c                    |    4 +-
5176  sound/pci/vx222/vx222.c                      |    2 +-
5177  sound/pci/ymfpci/ymfpci.c                    |    2 +-
5178  sound/pci/ymfpci/ymfpci.h                    |    2 +-
5179  sound/pci/ymfpci/ymfpci_main.c               |    8 +--
5180  sound/usb/6fire/firmware.c                   |    5 +-
5181  75 files changed, 289 insertions(+), 211 deletions(-)
5182 Merging sound-asoc/for-next (736ad1a Merge branch 'for-3.6' into asoc-next)
5183 $ git merge sound-asoc/for-next
5184 Auto-merging MAINTAINERS
5185 Merge made by the 'recursive' strategy.
5186  Documentation/devicetree/bindings/sound/cs4270.txt |   21 ++
5187  .../devicetree/bindings/sound/omap-abe-twl6040.txt |   91 +++++
5188  MAINTAINERS                                        |    7 +-
5189  sound/soc/blackfin/bf6xx-sport.c                   |    7 +
5190  sound/soc/codecs/ab8500-codec.c                    |    6 +-
5191  sound/soc/codecs/adau1373.c                        |   12 +-
5192  sound/soc/codecs/adau1701.c                        |   12 +-
5193  sound/soc/codecs/ak4671.c                          |   12 +-
5194  sound/soc/codecs/arizona.c                         |   66 ++++
5195  sound/soc/codecs/arizona.h                         |    6 +-
5196  sound/soc/codecs/cs4270.c                          |   40 ++-
5197  sound/soc/codecs/cs42l51.c                         |   19 +-
5198  sound/soc/codecs/cs42l52.c                         |    1 -
5199  sound/soc/codecs/isabelle.c                        |    1 -
5200  sound/soc/codecs/lm4857.c                          |   12 +-
5201  sound/soc/codecs/max98088.c                        |   18 +-
5202  sound/soc/codecs/max98095.c                        |   18 +-
5203  sound/soc/codecs/max9850.c                         |   12 +-
5204  sound/soc/codecs/max9877.c                         |   12 +-
5205  sound/soc/codecs/sta32x.c                          |   12 +-
5206  sound/soc/codecs/sta529.c                          |    2 +-
5207  sound/soc/codecs/tlv320aic32x4.c                   |   19 +-
5208  sound/soc/codecs/tlv320aic3x.c                     |   18 +-
5209  sound/soc/codecs/tlv320dac33.c                     |   19 +-
5210  sound/soc/codecs/tpa6130a2.c                       |   13 +-
5211  sound/soc/codecs/wm2000.c                          |   12 +-
5212  sound/soc/codecs/wm2200.c                          |   12 +-
5213  sound/soc/codecs/wm5102.c                          |   13 +
5214  sound/soc/codecs/wm5110.c                          |   16 +
5215  sound/soc/codecs/wm8903.c                          |   18 +-
5216  sound/soc/codecs/wm8940.c                          |   18 +-
5217  sound/soc/codecs/wm8955.c                          |   18 +-
5218  sound/soc/codecs/wm8958-dsp2.c                     |   28 +-
5219  sound/soc/codecs/wm8960.c                          |   18 +-
5220  sound/soc/codecs/wm8961.c                          |   18 +-
5221  sound/soc/codecs/wm8962.c                          |   15 -
5222  sound/soc/codecs/wm8971.c                          |   18 +-
5223  sound/soc/codecs/wm8974.c                          |   18 +-
5224  sound/soc/codecs/wm8978.c                          |   18 +-
5225  sound/soc/codecs/wm8991.c                          |   18 +-
5226  sound/soc/codecs/wm8994.c                          |   98 ++++--
5227  sound/soc/codecs/wm8994.h                          |   12 +-
5228  sound/soc/codecs/wm9090.c                          |   12 +-
5229  sound/soc/codecs/wm9712.c                          |    6 +-
5230  sound/soc/codecs/wm_hubs.c                         |   71 ++--
5231  sound/soc/codecs/wm_hubs.h                         |    2 +
5232  sound/soc/davinci/davinci-evm.c                    |    1 -
5233  sound/soc/davinci/davinci-mcasp.c                  |   50 +--
5234  sound/soc/davinci/davinci-mcasp.h                  |    3 +-
5235  sound/soc/fsl/imx-ssi.c                            |   30 +-
5236  sound/soc/mxs/Kconfig                              |    2 +-
5237  sound/soc/mxs/mxs-saif.c                           |   20 +-
5238  sound/soc/omap/mcbsp.c                             |    2 +-
5239  sound/soc/omap/omap-abe-twl6040.c                  |  145 ++++++--
5240  sound/soc/omap/omap-mcpdm.c                        |   52 +--
5241  sound/soc/samsung/Kconfig                          |    8 +
5242  sound/soc/samsung/Makefile                         |    2 +
5243  sound/soc/samsung/bells.c                          |  346 ++++++++++++++++++++
5244  sound/soc/samsung/pcm.c                            |    2 +-
5245  sound/soc/soc-core.c                               |   25 +-
5246  sound/soc/soc-jack.c                               |    8 +-
5247  sound/soc/ux500/ux500_msp_dai.c                    |    3 +
5248  sound/soc/ux500/ux500_msp_i2s.c                    |    2 +
5249  63 files changed, 982 insertions(+), 634 deletions(-)
5250  create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt
5251  create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt
5252  create mode 100644 sound/soc/samsung/bells.c
5253 Merging quilt/rr (d673c23 Make most arch asm/module.h files use asm-generic/module.h)
5254 $ git merge quilt/rr
5255 Resolved 'arch/s390/Kconfig' using previous resolution.
5256 Resolved 'arch/xtensa/Kconfig' using previous resolution.
5257 Auto-merging arch/xtensa/Kconfig
5258 CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
5259 Auto-merging arch/x86/Kconfig
5260 Auto-merging arch/unicore32/Kconfig
5261 Removing arch/sparc/include/asm/module.h
5262 Auto-merging arch/s390/Kconfig
5263 CONFLICT (content): Merge conflict in arch/s390/Kconfig
5264 Auto-merging arch/powerpc/Kconfig
5265 Auto-merging arch/mips/kernel/module.c
5266 Auto-merging arch/mips/include/asm/module.h
5267 Auto-merging arch/mips/Kconfig
5268 Auto-merging arch/m68k/Kconfig
5269 Removing arch/m32r/include/asm/module.h
5270 Removing arch/h8300/include/asm/module.h
5271 Removing arch/cris/include/asm/module.h
5272 Auto-merging arch/cris/Kconfig
5273 Auto-merging arch/c6x/Kconfig
5274 Auto-merging arch/arm/Kconfig
5275 Automatic merge failed; fix conflicts and then commit the result.
5276 $ git commit -v -a
5277 [master ecb1659] Merge branch 'quilt/rr'
5278 $ git diff -M --stat --summary HEAD^..
5279  arch/Kconfig                       |   19 +++++++++++++++++
5280  arch/alpha/Kconfig                 |    2 ++
5281  arch/alpha/include/asm/module.h    |   10 ++-------
5282  arch/arm/Kconfig                   |    2 ++
5283  arch/arm/include/asm/module.h      |    8 ++------
5284  arch/avr32/Kconfig                 |    2 ++
5285  arch/avr32/include/asm/module.h    |    6 ++----
5286  arch/blackfin/Kconfig              |    2 ++
5287  arch/blackfin/include/asm/module.h |    4 +---
5288  arch/c6x/Kconfig                   |    1 +
5289  arch/c6x/include/asm/module.h      |   12 +----------
5290  arch/cris/Kconfig                  |    1 +
5291  arch/cris/include/asm/Kbuild       |    2 ++
5292  arch/cris/include/asm/module.h     |    9 --------
5293  arch/frv/include/asm/module.h      |    8 +-------
5294  arch/h8300/Kconfig                 |    1 +
5295  arch/h8300/include/asm/Kbuild      |    2 ++
5296  arch/h8300/include/asm/module.h    |   11 ----------
5297  arch/hexagon/Kconfig               |    1 +
5298  arch/ia64/Kconfig                  |    2 ++
5299  arch/ia64/include/asm/module.h     |    6 ++----
5300  arch/m32r/Kconfig                  |    1 +
5301  arch/m32r/include/asm/Kbuild       |    2 ++
5302  arch/m32r/include/asm/module.h     |   10 ---------
5303  arch/m32r/kernel/module.c          |   15 --------------
5304  arch/m68k/Kconfig                  |    3 +++
5305  arch/m68k/include/asm/module.h     |    6 ++----
5306  arch/microblaze/Kconfig            |    1 +
5307  arch/mips/Kconfig                  |    3 +++
5308  arch/mips/include/asm/module.h     |   10 +++++++--
5309  arch/mips/kernel/module.c          |    2 ++
5310  arch/mn10300/Kconfig               |    1 +
5311  arch/mn10300/include/asm/module.h  |    7 +------
5312  arch/openrisc/Kconfig              |    1 +
5313  arch/parisc/Kconfig                |    2 ++
5314  arch/parisc/include/asm/module.h   |   16 +++------------
5315  arch/powerpc/Kconfig               |    2 ++
5316  arch/powerpc/include/asm/module.h  |    7 +------
5317  arch/s390/Kconfig                  |    2 ++
5318  arch/s390/include/asm/module.h     |   18 +++-------------
5319  arch/score/Kconfig                 |    2 ++
5320  arch/score/include/asm/module.h    |    6 +-----
5321  arch/score/kernel/module.c         |   10 ---------
5322  arch/sh/Kconfig                    |    2 ++
5323  arch/sh/include/asm/module.h       |   14 +++----------
5324  arch/sparc/Kconfig                 |    1 +
5325  arch/sparc/include/asm/Kbuild      |    1 +
5326  arch/sparc/include/asm/module.h    |   24 ----------------------
5327  arch/tile/Kconfig                  |    1 +
5328  arch/unicore32/Kconfig             |    1 +
5329  arch/x86/Kconfig                   |    2 ++
5330  arch/xtensa/Kconfig                |    1 +
5331  arch/xtensa/include/asm/module.h   |    9 +-------
5332  include/asm-generic/module.h       |   40 +++++++++++++++++++++++++++++-------
5333  include/linux/moduleloader.h       |   36 ++++++++++++++++++++++++++++----
5334  kernel/module.c                    |   24 ++++------------------
5335  56 files changed, 171 insertions(+), 223 deletions(-)
5336  delete mode 100644 arch/cris/include/asm/module.h
5337  delete mode 100644 arch/h8300/include/asm/module.h
5338  delete mode 100644 arch/m32r/include/asm/module.h
5339  delete mode 100644 arch/sparc/include/asm/module.h
5340 Merging input/next (2b94e25 Input: random formatting fixes)
5341 $ git merge input/next
5342 Merge made by the 'recursive' strategy.
5343  drivers/input/apm-power.c              |    2 +-
5344  drivers/input/ff-core.c                |    4 +-
5345  drivers/input/ff-memless.c             |   14 +--
5346  drivers/input/joydev.c                 |    2 +-
5347  drivers/input/keyboard/gpio_keys.c     |  168 ++++++++++++++++----------------
5348  drivers/input/misc/twl4030-pwrbutton.c |    1 +
5349  drivers/input/mousedev.c               |    9 +-
5350  drivers/input/sparse-keymap.c          |    4 +-
5351  8 files changed, 105 insertions(+), 99 deletions(-)
5352 Merging input-mt/for-next (0d7614f Linux 3.6-rc1)
5353 $ git merge input-mt/for-next
5354 Already up-to-date.
5355 Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next)
5356 $ git merge cgroup/for-next
5357 Already up-to-date!
5358 Merge made by the 'recursive' strategy.
5359 Merging block/for-next (4004e90 Documentation: update tunable options in block/cfq-iosched.txt)
5360 $ git merge block/for-next
5361 Auto-merging fs/bio.c
5362 Merge made by the 'recursive' strategy.
5363  Documentation/block/00-INDEX        |   10 ++-
5364  Documentation/block/cfq-iosched.txt |   77 +++++++++++++++++++++++
5365  Documentation/block/queue-sysfs.txt |   64 +++++++++++++++++++
5366  block/blk-lib.c                     |   41 ++++++++----
5367  block/blk-merge.c                   |  117 ++++++++++++++++++++++++-----------
5368  block/genhd.c                       |    2 +-
5369  fs/bio.c                            |   11 ++--
5370  fs/block_dev.c                      |    3 +
5371  fs/direct-io.c                      |    5 ++
5372  include/linux/blkdev.h              |   14 ++++-
5373  mm/filemap.c                        |    7 ---
5374  11 files changed, 287 insertions(+), 64 deletions(-)
5375 Merging quilt/device-mapper (0d7614f Linux 3.6-rc1)
5376 $ git merge quilt/device-mapper
5377 Already up-to-date.
5378 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
5379 $ git merge embedded/master
5380 Already up-to-date.
5381 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
5382 $ git merge firmware/master
5383 Already up-to-date.
5384 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
5385 $ git merge pcmcia/master
5386 Already up-to-date.
5387 Merging mmc/mmc-next (72d0f11 mmc: bfin_sdh: Reset SD controller when resume from power saving mode.)
5388 $ git merge mmc/mmc-next
5389 Auto-merging MAINTAINERS
5390 Merge made by the 'recursive' strategy.
5391  .../devicetree/bindings/mmc/atmel-hsmci.txt        |   68 ++++++
5392  Documentation/devicetree/bindings/mmc/pxa-mmc.txt  |   25 +++
5393  .../devicetree/bindings/mmc/sdhci-dove.txt         |   14 ++
5394  MAINTAINERS                                        |    2 +-
5395  drivers/mmc/host/atmel-mci.c                       |   91 +++++++-
5396  drivers/mmc/host/bfin_sdh.c                        |  217 +++++++++++++-------
5397  drivers/mmc/host/dw_mmc.c                          |   85 ++++----
5398  drivers/mmc/host/omap_hsmmc.c                      |    4 +-
5399  drivers/mmc/host/pxamci.c                          |   52 +++++
5400  drivers/mmc/host/sdhci-dove.c                      |    8 +
5401  drivers/mmc/host/sdhci-of-esdhc.c                  |   36 +++-
5402  drivers/mmc/host/sdhci-pxav2.c                     |    6 +-
5403  drivers/mmc/host/sdhci-pxav3.c                     |    8 +-
5404  drivers/mmc/host/sdhci.c                           |  188 +++++++++++------
5405  drivers/mmc/host/vub300.c                          |    4 +-
5406  include/linux/mmc/sdhci.h                          |    3 +-
5407  16 files changed, 608 insertions(+), 203 deletions(-)
5408  create mode 100644 Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
5409  create mode 100644 Documentation/devicetree/bindings/mmc/pxa-mmc.txt
5410  create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-dove.txt
5411 Merging kgdb/kgdb-next (15d7ea0 kgdboc: Accept either kbd or kdb to activate the vga + keyboard kdb shell)
5412 $ git merge kgdb/kgdb-next
5413 Merge made by the 'recursive' strategy.
5414  arch/mips/kernel/kgdb.c     |    9 +++++++++
5415  arch/x86/kernel/kgdb.c      |    2 ++
5416  drivers/tty/serial/kgdboc.c |    3 ++-
5417  3 files changed, 13 insertions(+), 1 deletion(-)
5418 Merging slab/for-next (77be4b1 mm/slab: restructure kmem_cache_create() debug checks)
5419 $ git merge slab/for-next
5420 Merge made by the 'recursive' strategy.
5421  mm/slab.c        |    1 -
5422  mm/slab_common.c |   97 +++++++++++++++++++++++++++---------------------------
5423  mm/slub.c        |   33 +++++++++++--------
5424  3 files changed, 68 insertions(+), 63 deletions(-)
5425 Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
5426 $ git merge uclinux/for-next
5427 Already up-to-date.
5428 Merging md/for-next (7705d0b md: avoid taking the mutex on some ioctls.)
5429 $ git merge md/for-next
5430 Auto-merging fs/bio.c
5431 Merge made by the 'recursive' strategy.
5432  drivers/md/linear.c    |   25 ++-
5433  drivers/md/md.c        |  103 ++++++++----
5434  drivers/md/md.h        |   15 +-
5435  drivers/md/multipath.c |    3 +-
5436  drivers/md/raid0.c     |   19 ++-
5437  drivers/md/raid1.c     |   23 ++-
5438  drivers/md/raid10.c    |   60 +++++--
5439  drivers/md/raid10.h    |    2 +-
5440  drivers/md/raid5.c     |  411 +++++++++++++++++++++++++++++++++++++++++++++---
5441  drivers/md/raid5.h     |   19 +++
5442  fs/bio.c               |   22 +--
5443  11 files changed, 611 insertions(+), 91 deletions(-)
5444 Merging mfd/for-next (3c1534c mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core)
5445 $ git merge mfd/for-next
5446 Already up-to-date.
5447 Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries)
5448 $ git merge battery/master
5449 Already up-to-date.
5450 Merging fbdev/fbdev-next (a023907 da8xx-fb: fix compile issue due to missing include)
5451 $ git merge fbdev/fbdev-next
5452 Already up-to-date.
5453 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
5454 $ git merge viafb/viafb-next
5455 Already up-to-date.
5456 Merging omap_dss2/for-next (974a658 Merge "Apply LCD manager related parameters" from Archit)
5457 $ git merge omap_dss2/for-next
5458 Already up-to-date.
5459 Merging regulator/for-next (e5b60c1 Merge branch 'regulator-drivers' into regulator-next)
5460 $ git merge regulator/for-next
5461 Merge made by the 'recursive' strategy.
5462  .../devicetree/bindings/regulator/tps6586x.txt     |   71 ++--
5463  drivers/mfd/tps6586x.c                             |   13 +
5464  drivers/regulator/Kconfig                          |   27 +-
5465  drivers/regulator/Makefile                         |    1 +
5466  drivers/regulator/ab3100.c                         |    7 +-
5467  drivers/regulator/ab8500.c                         |   16 +-
5468  drivers/regulator/anatop-regulator.c               |    5 +-
5469  drivers/regulator/core.c                           |   15 +-
5470  drivers/regulator/da9052-regulator.c               |    4 +-
5471  drivers/regulator/dummy.c                          |    2 +-
5472  drivers/regulator/gpio-regulator.c                 |   38 +-
5473  drivers/regulator/isl6271a-regulator.c             |    6 -
5474  drivers/regulator/lp872x.c                         |   18 +-
5475  drivers/regulator/lp8788-buck.c                    |   80 +---
5476  drivers/regulator/lp8788-ldo.c                     |    8 +
5477  drivers/regulator/max77686.c                       |   30 +-
5478  drivers/regulator/max8907-regulator.c              |  383 ++++++++++++++++++++
5479  drivers/regulator/mc13783-regulator.c              |   23 +-
5480  drivers/regulator/mc13892-regulator.c              |   77 ++--
5481  drivers/regulator/mc13xxx-regulator-core.c         |   17 +-
5482  drivers/regulator/mc13xxx.h                        |    1 -
5483  drivers/regulator/palmas-regulator.c               |   68 +---
5484  drivers/regulator/s2mps11.c                        |   27 +-
5485  drivers/regulator/tps6524x-regulator.c             |   10 +-
5486  drivers/regulator/tps6586x-regulator.c             |  104 ++----
5487  drivers/regulator/twl-regulator.c                  |  108 +++---
5488  drivers/regulator/wm831x-dcdc.c                    |   11 +-
5489  drivers/regulator/wm831x-ldo.c                     |    4 +
5490  drivers/regulator/wm8400-regulator.c               |    7 +-
5491  include/linux/mfd/max77686.h                       |    1 +
5492  include/linux/mfd/tps6586x.h                       |    1 +
5493  include/linux/regulator/consumer.h                 |    7 +
5494  include/linux/regulator/driver.h                   |    1 +
5495  33 files changed, 722 insertions(+), 469 deletions(-)
5496  create mode 100644 drivers/regulator/max8907-regulator.c
5497 Merging security/next (9f99798 ptrace: mark __ptrace_may_access() static)
5498 $ git merge security/next
5499 Merge made by the 'recursive' strategy.
5500  include/linux/ptrace.h       |    2 --
5501  kernel/ptrace.c              |    3 ++-
5502  samples/seccomp/bpf-helper.h |   15 ++++++++++-----
5503  3 files changed, 12 insertions(+), 8 deletions(-)
5504 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
5505 $ git merge selinux/master
5506 Already up-to-date!
5507 Merge made by the 'recursive' strategy.
5508 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
5509 $ git merge lblnet/master
5510 Already up-to-date.
5511 Merging watchdog/master (06a3fa7 watchdog: fix watchdog-test.c build warning)
5512 $ git merge watchdog/master
5513 Merge made by the 'recursive' strategy.
5514  Documentation/watchdog/src/watchdog-test.c |    2 +-
5515  1 file changed, 1 insertion(+), 1 deletion(-)
5516 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
5517 $ git merge dwmw2-iommu/master
5518 Already up-to-date.
5519 Merging iommu/next (6f286cc Merge branches 'iommu/fixes' and 'arm/tegra' into next)
5520 $ git merge iommu/next
5521 Merge made by the 'recursive' strategy.
5522  drivers/iommu/amd_iommu_init.c      |    2 +-
5523  drivers/iommu/intel_irq_remapping.c |   18 +++-
5524  drivers/iommu/tegra-smmu.c          |  202 ++++++++++++++++++++++++++++++++---
5525  3 files changed, 204 insertions(+), 18 deletions(-)
5526 Merging vfio/next (a1706d8 vfio: Include vfio.h in installed headers)
5527 $ git merge vfio/next
5528 Merge made by the 'recursive' strategy.
5529 Merging osd/linux-next (b8017d2 exofs: check for allocation failure in uri_store())
5530 $ git merge osd/linux-next
5531 Merge made by the 'recursive' strategy.
5532  fs/exofs/sys.c |    7 ++++++-
5533  1 file changed, 6 insertions(+), 1 deletion(-)
5534 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
5535 $ git merge jc_docs/docs-next
5536 Already up-to-date.
5537 Merging trivial/for-next (ef706fb irqdesc: delete now orphaned references to timer_rand_state)
5538 $ git merge trivial/for-next
5539 Auto-merging include/linux/irqdesc.h
5540 Merge made by the 'recursive' strategy.
5541  drivers/video/backlight/88pm860x_bl.c |    1 -
5542  include/linux/irqdesc.h               |    2 --
5543  2 files changed, 3 deletions(-)
5544 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
5545 $ git merge audit/for-next
5546 Already up-to-date.
5547 Merging pm/linux-next (19bf3f1 intel_idle: Check cpu_idle_get_driver() for NULL before dereferencing it.)
5548 $ git merge pm/linux-next
5549 Auto-merging kernel/time/timekeeping.c
5550 Removing arch/arm/mach-shmobile/common.c
5551 Merge made by the 'recursive' strategy.
5552  Documentation/cpuidle/sysfs.txt                  |   10 +-
5553  arch/arm/mach-shmobile/Makefile                  |    2 +-
5554  arch/arm/mach-shmobile/board-ap4evb.c            |   19 +-
5555  arch/arm/mach-shmobile/board-armadillo800eva.c   |    6 +-
5556  arch/arm/mach-shmobile/board-mackerel.c          |   32 +--
5557  arch/arm/mach-shmobile/common.c                  |   24 ---
5558  arch/arm/mach-shmobile/cpuidle.c                 |   39 ++--
5559  arch/arm/mach-shmobile/include/mach/common.h     |   14 +-
5560  arch/arm/mach-shmobile/include/mach/pm-rmobile.h |   35 +++-
5561  arch/arm/mach-shmobile/include/mach/r8a7740.h    |    6 +-
5562  arch/arm/mach-shmobile/include/mach/r8a7779.h    |   12 +-
5563  arch/arm/mach-shmobile/include/mach/sh7372.h     |   18 +-
5564  arch/arm/mach-shmobile/pm-r8a7740.c              |   42 ++--
5565  arch/arm/mach-shmobile/pm-r8a7779.c              |   71 +++----
5566  arch/arm/mach-shmobile/pm-rmobile.c              |   33 ++-
5567  arch/arm/mach-shmobile/pm-sh7372.c               |  233 ++++++++++++---------
5568  arch/arm/mach-shmobile/setup-r8a7740.c           |   27 +--
5569  arch/arm/mach-shmobile/setup-r8a7779.c           |    5 +-
5570  arch/arm/mach-shmobile/setup-sh7372.c            |   69 +++---
5571  drivers/base/platform.c                          |    2 +
5572  drivers/base/power/domain.c                      |  244 ++++++++++++++++++----
5573  drivers/base/power/main.c                        |   35 +++-
5574  drivers/base/power/power.h                       |   36 +++-
5575  drivers/base/power/runtime.c                     |   13 +-
5576  drivers/base/power/wakeup.c                      |   29 +++
5577  drivers/clocksource/sh_cmt.c                     |   71 ++++++-
5578  drivers/clocksource/sh_mtu2.c                    |   41 +++-
5579  drivers/clocksource/sh_tmu.c                     |  112 +++++++++-
5580  drivers/cpufreq/cpufreq_conservative.c           |    1 +
5581  drivers/cpuidle/coupled.c                        |   14 +-
5582  drivers/cpuidle/governors/ladder.c               |    6 +-
5583  drivers/idle/intel_idle.c                        |    3 +-
5584  include/linux/clockchips.h                       |    8 +
5585  include/linux/device.h                           |    7 +
5586  include/linux/pm.h                               |    2 +
5587  include/linux/pm_domain.h                        |   92 ++++++--
5588  kernel/power/Kconfig                             |    4 +
5589  kernel/time/clockevents.c                        |   24 +++
5590  kernel/time/timekeeping.c                        |    2 +
5591  39 files changed, 1010 insertions(+), 433 deletions(-)
5592  delete mode 100644 arch/arm/mach-shmobile/common.c
5593 Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
5594 $ git merge apm/for-next
5595 Already up-to-date.
5596 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
5597 $ git merge fsnotify/for-next
5598 Auto-merging kernel/audit_watch.c
5599 Auto-merging kernel/audit_tree.c
5600 Auto-merging include/linux/fsnotify_backend.h
5601 Auto-merging fs/notify/notification.c
5602 Auto-merging fs/notify/fanotify/fanotify_user.c
5603 Merge made by the 'recursive' strategy.
5604  fs/notify/dnotify/dnotify.c          |    4 +-
5605  fs/notify/fanotify/fanotify.c        |    6 +++
5606  fs/notify/fanotify/fanotify_user.c   |   37 +++++++++-----
5607  fs/notify/group.c                    |   47 ++++++++++--------
5608  fs/notify/inode_mark.c               |   14 ++++--
5609  fs/notify/inotify/inotify_fsnotify.c |    4 +-
5610  fs/notify/inotify/inotify_user.c     |   34 ++++++-------
5611  fs/notify/mark.c                     |   91 +++++++++++++++++++---------------
5612  fs/notify/notification.c             |    1 +
5613  fs/notify/vfsmount_mark.c            |   14 ++++--
5614  include/linux/fsnotify_backend.h     |   31 ++++++++----
5615  kernel/audit_tree.c                  |   10 ++--
5616  kernel/audit_watch.c                 |    4 +-
5617  13 files changed, 178 insertions(+), 119 deletions(-)
5618 Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
5619 $ git merge edac/linux_next
5620 Already up-to-date!
5621 Merge made by the 'recursive' strategy.
5622 Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
5623 $ git merge edac-amd/for-next
5624 Resolved 'Documentation/edac.txt' using previous resolution.
5625 Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
5626 Auto-merging drivers/edac/amd64_edac.c
5627 CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
5628 Auto-merging Documentation/edac.txt
5629 CONFLICT (content): Merge conflict in Documentation/edac.txt
5630 Automatic merge failed; fix conflicts and then commit the result.
5631 $ git commit -v -a
5632 [master 5696942] Merge remote-tracking branch 'edac-amd/for-next'
5633 $ git diff -M --stat --summary HEAD^..
5634 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
5635 $ git merge devicetree/devicetree/next
5636 Already up-to-date.
5637 Merging dt-rh/for-next (5d61b16 of: Allow busses with #size-cells=0)
5638 $ git merge dt-rh/for-next
5639 Merge made by the 'recursive' strategy.
5640  drivers/of/address.c       |   27 +++++++++++++++++++++++----
5641  drivers/of/platform.c      |   16 +++++++++++++---
5642  include/linux/of_address.h |    1 +
5643  3 files changed, 37 insertions(+), 7 deletions(-)
5644 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
5645 $ git merge spi/spi/next
5646 Already up-to-date.
5647 Merging spi-mb/spi-next (2370345 spi: spi-altera: Use of_match_ptr)
5648 $ git merge spi-mb/spi-next
5649 Auto-merging drivers/spi/spi-s3c64xx.c
5650 Auto-merging drivers/spi/spi-bcm63xx.c
5651 Merge made by the 'recursive' strategy.
5652  drivers/spi/spi-altera.c      |    4 +-
5653  drivers/spi/spi-bcm63xx.c     |    4 +-
5654  drivers/spi/spi-omap2-mcspi.c |    6 +-
5655  drivers/spi/spi-orion.c       |  209 ++++++++++++-----------------------------
5656  drivers/spi/spi-s3c64xx.c     |   12 +--
5657  5 files changed, 73 insertions(+), 162 deletions(-)
5658 Merging tip/auto-latest (bf09da2 Merge branch 'timers/urgent' into auto-latest)
5659 $ git merge tip/auto-latest
5660 Auto-merging kernel/time/timekeeping.c
5661 Auto-merging arch/x86/Kconfig
5662 Auto-merging MAINTAINERS
5663 Merge made by the 'recursive' strategy.
5664  MAINTAINERS                                   |    8 +
5665  arch/tile/include/asm/topology.h              |    1 -
5666  arch/x86/Kconfig                              |   31 +
5667  arch/x86/Makefile                             |    4 +
5668  arch/x86/boot/Makefile                        |    2 +-
5669  arch/x86/kernel/apic/io_apic.c                |   10 +
5670  arch/x86/kernel/cpu/amd.c                     |   67 ++
5671  arch/x86/kernel/cpu/common.c                  |    7 +-
5672  arch/x86/kernel/cpu/intel.c                   |    4 +
5673  arch/x86/kernel/cpu/mcheck/mce-inject.c       |    8 +
5674  arch/x86/kernel/cpu/mcheck/mce-internal.h     |   12 +
5675  arch/x86/kernel/cpu/mcheck/mce.c              |   84 +-
5676  arch/x86/kernel/cpu/mcheck/mce_intel.c        |  133 ++-
5677  arch/x86/kernel/cpu/perf_event_intel.c        |   10 +-
5678  arch/x86/kernel/cpu/perf_event_intel_uncore.c |  253 ++--
5679  arch/x86/kernel/cpu/perf_event_intel_uncore.h |   46 +-
5680  arch/x86/mm/pageattr.c                        |   10 +-
5681  arch/x86/platform/efi/efi.c                   |   30 +-
5682  arch/x86/realmode/rm/Makefile                 |    2 +-
5683  drivers/infiniband/hw/ehca/ehca_irq.c         |  250 ++--
5684  drivers/infiniband/hw/ehca/ehca_irq.h         |    6 +-
5685  include/linux/efi.h                           |    2 +
5686  include/linux/kthread.h                       |   11 +-
5687  include/linux/ktime.h                         |    7 -
5688  include/linux/sched.h                         |    1 -
5689  include/linux/smpboot.h                       |   43 +
5690  include/linux/time.h                          |   22 +-
5691  include/linux/topology.h                      |    2 -
5692  init/main.c                                   |    8 +-
5693  kernel/Makefile                               |    3 +-
5694  kernel/cpu.c                                  |   10 +-
5695  kernel/kthread.c                              |  185 ++-
5696  kernel/rcutree.c                              |   12 +-
5697  kernel/rcutree.h                              |   15 +-
5698  kernel/rcutree_plugin.h                       |  403 ++-----
5699  kernel/rcutree_trace.c                        |    3 +-
5700  kernel/sched/core.c                           |   70 +-
5701  kernel/sched/fair.c                           |   56 +-
5702  kernel/sched/rt.c                             |   13 +
5703  kernel/sched/sched.h                          |    8 +-
5704  kernel/sched/stop_task.c                      |   22 +-
5705  kernel/smpboot.c                              |  233 ++++
5706  kernel/smpboot.h                              |    4 +
5707  kernel/softirq.c                              |  111 +-
5708  kernel/time/timekeeping.c                     |   26 +-
5709  kernel/watchdog.c                             |  263 ++---
5710  scripts/kconfig/Makefile                      |    7 +-
5711  tools/kvm/.gitignore                          |   12 +
5712  tools/kvm/CREDITS-Git                         |   30 +
5713  tools/kvm/Documentation/kernel-debugging.txt  |   15 +
5714  tools/kvm/Documentation/kvm-balloon.txt       |   24 +
5715  tools/kvm/Documentation/kvm-debug.txt         |   16 +
5716  tools/kvm/Documentation/kvm-list.txt          |   16 +
5717  tools/kvm/Documentation/kvm-pause.txt         |   16 +
5718  tools/kvm/Documentation/kvm-resume.txt        |   16 +
5719  tools/kvm/Documentation/kvm-run.txt           |   62 +
5720  tools/kvm/Documentation/kvm-sandbox.txt       |   16 +
5721  tools/kvm/Documentation/kvm-setup.txt         |   15 +
5722  tools/kvm/Documentation/kvm-stat.txt          |   19 +
5723  tools/kvm/Documentation/kvm-stop.txt          |   16 +
5724  tools/kvm/Documentation/kvm-version.txt       |   21 +
5725  tools/kvm/Documentation/virtio-console.txt    |   41 +
5726  tools/kvm/Makefile                            |  427 +++++++
5727  tools/kvm/README                              |  112 ++
5728  tools/kvm/builtin-balloon.c                   |   80 ++
5729  tools/kvm/builtin-debug.c                     |  110 ++
5730  tools/kvm/builtin-help.c                      |   63 +
5731  tools/kvm/builtin-list.c                      |  149 +++
5732  tools/kvm/builtin-pause.c                     |   88 ++
5733  tools/kvm/builtin-resume.c                    |   88 ++
5734  tools/kvm/builtin-run.c                       | 1393 ++++++++++++++++++++++
5735  tools/kvm/builtin-sandbox.c                   |    9 +
5736  tools/kvm/builtin-setup.c                     |  232 ++++
5737  tools/kvm/builtin-stat.c                      |  127 ++
5738  tools/kvm/builtin-stop.c                      |   70 ++
5739  tools/kvm/builtin-version.c                   |   15 +
5740  tools/kvm/code16gcc.h                         |   15 +
5741  tools/kvm/command-list.txt                    |   15 +
5742  tools/kvm/config/feature-tests.mak            |  177 +++
5743  tools/kvm/config/utilities.mak                |  196 ++++
5744  tools/kvm/disk/blk.c                          |   76 ++
5745  tools/kvm/disk/core.c                         |  275 +++++
5746  tools/kvm/disk/qcow.c                         | 1529 +++++++++++++++++++++++++
5747  tools/kvm/disk/raw.c                          |  141 +++
5748  tools/kvm/framebuffer.c                       |   75 ++
5749  tools/kvm/guest/init.c                        |   38 +
5750  tools/kvm/guest/init_stage2.c                 |   55 +
5751  tools/kvm/guest/passwd                        |    1 +
5752  tools/kvm/guest_compat.c                      |   99 ++
5753  tools/kvm/hw/i8042.c                          |  348 ++++++
5754  tools/kvm/hw/pci-shmem.c                      |  268 +++++
5755  tools/kvm/hw/rtc.c                            |  137 +++
5756  tools/kvm/hw/serial.c                         |  446 ++++++++
5757  tools/kvm/hw/vesa.c                           |   85 ++
5758  tools/kvm/include/asm/hweight.h               |    8 +
5759  tools/kvm/include/bios/memcpy.h               |    9 +
5760  tools/kvm/include/kvm/8250-serial.h           |   11 +
5761  tools/kvm/include/kvm/apic.h                  |   17 +
5762  tools/kvm/include/kvm/brlock.h                |   41 +
5763  tools/kvm/include/kvm/builtin-balloon.h       |    9 +
5764  tools/kvm/include/kvm/builtin-debug.h         |   20 +
5765  tools/kvm/include/kvm/builtin-help.h          |    6 +
5766  tools/kvm/include/kvm/builtin-list.h          |   10 +
5767  tools/kvm/include/kvm/builtin-pause.h         |    9 +
5768  tools/kvm/include/kvm/builtin-resume.h        |    9 +
5769  tools/kvm/include/kvm/builtin-run.h           |   11 +
5770  tools/kvm/include/kvm/builtin-sandbox.h       |    6 +
5771  tools/kvm/include/kvm/builtin-setup.h         |   11 +
5772  tools/kvm/include/kvm/builtin-stat.h          |    9 +
5773  tools/kvm/include/kvm/builtin-stop.h          |    9 +
5774  tools/kvm/include/kvm/builtin-version.h       |    6 +
5775  tools/kvm/include/kvm/compiler.h              |   10 +
5776  tools/kvm/include/kvm/disk-image.h            |   87 ++
5777  tools/kvm/include/kvm/e820.h                  |   13 +
5778  tools/kvm/include/kvm/framebuffer.h           |   35 +
5779  tools/kvm/include/kvm/guest_compat.h          |    9 +
5780  tools/kvm/include/kvm/i8042.h                 |   12 +
5781  tools/kvm/include/kvm/ioeventfd.h             |   28 +
5782  tools/kvm/include/kvm/ioport.h                |   69 ++
5783  tools/kvm/include/kvm/irq.h                   |   33 +
5784  tools/kvm/include/kvm/kvm-cmd.h               |   17 +
5785  tools/kvm/include/kvm/kvm-cpu.h               |   24 +
5786  tools/kvm/include/kvm/kvm-ipc.h               |   24 +
5787  tools/kvm/include/kvm/kvm.h                   |   93 ++
5788  tools/kvm/include/kvm/msi.h                   |   10 +
5789  tools/kvm/include/kvm/mutex.h                 |   33 +
5790  tools/kvm/include/kvm/parse-options.h         |  214 ++++
5791  tools/kvm/include/kvm/pci-shmem.h             |   28 +
5792  tools/kvm/include/kvm/pci.h                   |   95 ++
5793  tools/kvm/include/kvm/qcow.h                  |  133 +++
5794  tools/kvm/include/kvm/rbtree-interval.h       |   28 +
5795  tools/kvm/include/kvm/read-write.h            |   43 +
5796  tools/kvm/include/kvm/rtc.h                   |    9 +
5797  tools/kvm/include/kvm/rwsem.h                 |   39 +
5798  tools/kvm/include/kvm/sdl.h                   |   22 +
5799  tools/kvm/include/kvm/segment.h               |   21 +
5800  tools/kvm/include/kvm/strbuf.h                |   20 +
5801  tools/kvm/include/kvm/symbol.h                |   30 +
5802  tools/kvm/include/kvm/term.h                  |   20 +
5803  tools/kvm/include/kvm/threadpool.h            |   37 +
5804  tools/kvm/include/kvm/types.h                 |    7 +
5805  tools/kvm/include/kvm/uip.h                   |  358 ++++++
5806  tools/kvm/include/kvm/util.h                  |   97 ++
5807  tools/kvm/include/kvm/vesa.h                  |   18 +
5808  tools/kvm/include/kvm/virtio-9p.h             |   73 ++
5809  tools/kvm/include/kvm/virtio-balloon.h        |    8 +
5810  tools/kvm/include/kvm/virtio-blk.h            |   12 +
5811  tools/kvm/include/kvm/virtio-console.h        |    9 +
5812  tools/kvm/include/kvm/virtio-mmio.h           |   58 +
5813  tools/kvm/include/kvm/virtio-net.h            |   26 +
5814  tools/kvm/include/kvm/virtio-pci-dev.h        |   37 +
5815  tools/kvm/include/kvm/virtio-pci.h            |   46 +
5816  tools/kvm/include/kvm/virtio-rng.h            |    9 +
5817  tools/kvm/include/kvm/virtio.h                |  103 ++
5818  tools/kvm/include/kvm/vnc.h                   |   20 +
5819  tools/kvm/include/linux/bitops.h              |   33 +
5820  tools/kvm/include/linux/byteorder.h           |    7 +
5821  tools/kvm/include/linux/compiler.h            |   19 +
5822  tools/kvm/include/linux/kernel.h              |   39 +
5823  tools/kvm/include/linux/module.h              |    6 +
5824  tools/kvm/include/linux/prefetch.h            |    6 +
5825  tools/kvm/include/linux/stddef.h              |   16 +
5826  tools/kvm/include/linux/types.h               |   51 +
5827  tools/kvm/ioeventfd.c                         |  215 ++++
5828  tools/kvm/ioport.c                            |  195 ++++
5829  tools/kvm/kvm-cmd.c                           |   91 ++
5830  tools/kvm/kvm-cpu.c                           |  175 +++
5831  tools/kvm/kvm-ipc.c                           |  231 ++++
5832  tools/kvm/kvm.c                               |  593 ++++++++++
5833  tools/kvm/main.c                              |   19 +
5834  tools/kvm/mmio.c                              |  140 +++
5835  tools/kvm/net/uip/arp.c                       |   30 +
5836  tools/kvm/net/uip/buf.c                       |  114 ++
5837  tools/kvm/net/uip/core.c                      |  190 +++
5838  tools/kvm/net/uip/csum.c                      |   92 ++
5839  tools/kvm/net/uip/dhcp.c                      |  203 ++++
5840  tools/kvm/net/uip/icmp.c                      |   29 +
5841  tools/kvm/net/uip/ipv4.c                      |   29 +
5842  tools/kvm/net/uip/tcp.c                       |  317 +++++
5843  tools/kvm/net/uip/udp.c                       |  236 ++++
5844  tools/kvm/pci.c                               |  213 ++++
5845  tools/kvm/powerpc/boot.c                      |    8 +
5846  tools/kvm/powerpc/cpu_info.c                  |  195 ++++
5847  tools/kvm/powerpc/cpu_info.h                  |   42 +
5848  tools/kvm/powerpc/include/kvm/barrier.h       |    6 +
5849  tools/kvm/powerpc/include/kvm/kvm-arch.h      |   90 ++
5850  tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h  |   76 ++
5851  tools/kvm/powerpc/ioport.c                    |   18 +
5852  tools/kvm/powerpc/irq.c                       |   75 ++
5853  tools/kvm/powerpc/kvm-cpu.c                   |  293 +++++
5854  tools/kvm/powerpc/kvm.c                       |  529 +++++++++
5855  tools/kvm/powerpc/spapr.h                     |   93 ++
5856  tools/kvm/powerpc/spapr_hcall.c               |  134 +++
5857  tools/kvm/powerpc/spapr_hvcons.c              |  102 ++
5858  tools/kvm/powerpc/spapr_hvcons.h              |   19 +
5859  tools/kvm/powerpc/spapr_pci.c                 |  423 +++++++
5860  tools/kvm/powerpc/spapr_pci.h                 |   57 +
5861  tools/kvm/powerpc/spapr_rtas.c                |  229 ++++
5862  tools/kvm/powerpc/xics.c                      |  514 +++++++++
5863  tools/kvm/powerpc/xics.h                      |   23 +
5864  tools/kvm/symbol.c                            |  131 +++
5865  tools/kvm/term.c                              |  166 +++
5866  tools/kvm/tests/Makefile                      |   19 +
5867  tools/kvm/tests/boot/Makefile                 |   13 +
5868  tools/kvm/tests/boot/init.c                   |   11 +
5869  tools/kvm/tests/kernel/.gitignore             |    2 +
5870  tools/kvm/tests/kernel/Makefile               |   20 +
5871  tools/kvm/tests/kernel/README                 |   16 +
5872  tools/kvm/tests/kernel/kernel.S               |    8 +
5873  tools/kvm/tests/pit/.gitignore                |    2 +
5874  tools/kvm/tests/pit/Makefile                  |   20 +
5875  tools/kvm/tests/pit/README                    |   16 +
5876  tools/kvm/tests/pit/tick.S                    |  109 ++
5877  tools/kvm/ui/sdl.c                            |  303 +++++
5878  tools/kvm/ui/vnc.c                            |  230 ++++
5879  tools/kvm/util/KVMTOOLS-VERSION-GEN           |   40 +
5880  tools/kvm/util/generate-cmdlist.sh            |   23 +
5881  tools/kvm/util/kvm-ifup-vbr0                  |    6 +
5882  tools/kvm/util/parse-options.c                |  577 ++++++++++
5883  tools/kvm/util/rbtree-interval.c              |   89 ++
5884  tools/kvm/util/read-write.c                   |  354 ++++++
5885  tools/kvm/util/set_private_br.sh              |   51 +
5886  tools/kvm/util/strbuf.c                       |   62 +
5887  tools/kvm/util/threadpool.c                   |  145 +++
5888  tools/kvm/util/util.c                         |  133 +++
5889  tools/kvm/virtio/9p-pdu.c                     |  287 +++++
5890  tools/kvm/virtio/9p.c                         | 1409 +++++++++++++++++++++++
5891  tools/kvm/virtio/balloon.c                    |  267 +++++
5892  tools/kvm/virtio/blk.c                        |  313 +++++
5893  tools/kvm/virtio/console.c                    |  193 ++++
5894  tools/kvm/virtio/core.c                       |  233 ++++
5895  tools/kvm/virtio/mmio.c                       |  264 +++++
5896  tools/kvm/virtio/net.c                        |  555 +++++++++
5897  tools/kvm/virtio/pci.c                        |  377 ++++++
5898  tools/kvm/virtio/rng.c                        |  194 ++++
5899  tools/kvm/x86/bios.c                          |  174 +++
5900  tools/kvm/x86/bios/.gitignore                 |    3 +
5901  tools/kvm/x86/bios/bios-rom.S                 |   12 +
5902  tools/kvm/x86/bios/e820.c                     |   72 ++
5903  tools/kvm/x86/bios/entry.S                    |   92 ++
5904  tools/kvm/x86/bios/gen-offsets.sh             |   14 +
5905  tools/kvm/x86/bios/int10.c                    |  110 ++
5906  tools/kvm/x86/bios/int15.c                    |   18 +
5907  tools/kvm/x86/bios/local.S                    |    7 +
5908  tools/kvm/x86/bios/macro.S                    |   25 +
5909  tools/kvm/x86/bios/memcpy.c                   |   23 +
5910  tools/kvm/x86/bios/rom.ld.S                   |   16 +
5911  tools/kvm/x86/boot.c                          |   41 +
5912  tools/kvm/x86/cpuid.c                         |   60 +
5913  tools/kvm/x86/include/kvm/assembly.h          |   24 +
5914  tools/kvm/x86/include/kvm/barrier.h           |   20 +
5915  tools/kvm/x86/include/kvm/bios-export.h       |   13 +
5916  tools/kvm/x86/include/kvm/bios.h              |   93 ++
5917  tools/kvm/x86/include/kvm/boot-protocol.h     |   16 +
5918  tools/kvm/x86/include/kvm/cpufeature.h        |   41 +
5919  tools/kvm/x86/include/kvm/interrupt.h         |   26 +
5920  tools/kvm/x86/include/kvm/kvm-arch.h          |   67 ++
5921  tools/kvm/x86/include/kvm/kvm-cpu-arch.h      |   49 +
5922  tools/kvm/x86/include/kvm/mptable.h           |    9 +
5923  tools/kvm/x86/interrupt.c                     |   28 +
5924  tools/kvm/x86/ioport.c                        |   77 ++
5925  tools/kvm/x86/irq.c                           |  222 ++++
5926  tools/kvm/x86/kvm-cpu.c                       |  425 +++++++
5927  tools/kvm/x86/kvm.c                           |  372 ++++++
5928  tools/kvm/x86/mptable.c                       |  287 +++++
5929  265 files changed, 26317 insertions(+), 1082 deletions(-)
5930  create mode 100644 include/linux/smpboot.h
5931  create mode 100644 tools/kvm/.gitignore
5932  create mode 100644 tools/kvm/CREDITS-Git
5933  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
5934  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
5935  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
5936  create mode 100644 tools/kvm/Documentation/kvm-list.txt
5937  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
5938  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
5939  create mode 100644 tools/kvm/Documentation/kvm-run.txt
5940  create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
5941  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
5942  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
5943  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
5944  create mode 100644 tools/kvm/Documentation/kvm-version.txt
5945  create mode 100644 tools/kvm/Documentation/virtio-console.txt
5946  create mode 100644 tools/kvm/Makefile
5947  create mode 100644 tools/kvm/README
5948  create mode 100644 tools/kvm/builtin-balloon.c
5949  create mode 100644 tools/kvm/builtin-debug.c
5950  create mode 100644 tools/kvm/builtin-help.c
5951  create mode 100644 tools/kvm/builtin-list.c
5952  create mode 100644 tools/kvm/builtin-pause.c
5953  create mode 100644 tools/kvm/builtin-resume.c
5954  create mode 100644 tools/kvm/builtin-run.c
5955  create mode 100644 tools/kvm/builtin-sandbox.c
5956  create mode 100644 tools/kvm/builtin-setup.c
5957  create mode 100644 tools/kvm/builtin-stat.c
5958  create mode 100644 tools/kvm/builtin-stop.c
5959  create mode 100644 tools/kvm/builtin-version.c
5960  create mode 100644 tools/kvm/code16gcc.h
5961  create mode 100644 tools/kvm/command-list.txt
5962  create mode 100644 tools/kvm/config/feature-tests.mak
5963  create mode 100644 tools/kvm/config/utilities.mak
5964  create mode 100644 tools/kvm/disk/blk.c
5965  create mode 100644 tools/kvm/disk/core.c
5966  create mode 100644 tools/kvm/disk/qcow.c
5967  create mode 100644 tools/kvm/disk/raw.c
5968  create mode 100644 tools/kvm/framebuffer.c
5969  create mode 100644 tools/kvm/guest/init.c
5970  create mode 100644 tools/kvm/guest/init_stage2.c
5971  create mode 100644 tools/kvm/guest/passwd
5972  create mode 100644 tools/kvm/guest_compat.c
5973  create mode 100644 tools/kvm/hw/i8042.c
5974  create mode 100644 tools/kvm/hw/pci-shmem.c
5975  create mode 100644 tools/kvm/hw/rtc.c
5976  create mode 100644 tools/kvm/hw/serial.c
5977  create mode 100644 tools/kvm/hw/vesa.c
5978  create mode 100644 tools/kvm/include/asm/hweight.h
5979  create mode 100644 tools/kvm/include/bios/memcpy.h
5980  create mode 100644 tools/kvm/include/kvm/8250-serial.h
5981  create mode 100644 tools/kvm/include/kvm/apic.h
5982  create mode 100644 tools/kvm/include/kvm/brlock.h
5983  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
5984  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
5985  create mode 100644 tools/kvm/include/kvm/builtin-help.h
5986  create mode 100644 tools/kvm/include/kvm/builtin-list.h
5987  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
5988  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
5989  create mode 100644 tools/kvm/include/kvm/builtin-run.h
5990  create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
5991  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
5992  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
5993  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
5994  create mode 100644 tools/kvm/include/kvm/builtin-version.h
5995  create mode 100644 tools/kvm/include/kvm/compiler.h
5996  create mode 100644 tools/kvm/include/kvm/disk-image.h
5997  create mode 100644 tools/kvm/include/kvm/e820.h
5998  create mode 100644 tools/kvm/include/kvm/framebuffer.h
5999  create mode 100644 tools/kvm/include/kvm/guest_compat.h
6000  create mode 100644 tools/kvm/include/kvm/i8042.h
6001  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
6002  create mode 100644 tools/kvm/include/kvm/ioport.h
6003  create mode 100644 tools/kvm/include/kvm/irq.h
6004  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
6005  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
6006  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
6007  create mode 100644 tools/kvm/include/kvm/kvm.h
6008  create mode 100644 tools/kvm/include/kvm/msi.h
6009  create mode 100644 tools/kvm/include/kvm/mutex.h
6010  create mode 100644 tools/kvm/include/kvm/parse-options.h
6011  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
6012  create mode 100644 tools/kvm/include/kvm/pci.h
6013  create mode 100644 tools/kvm/include/kvm/qcow.h
6014  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
6015  create mode 100644 tools/kvm/include/kvm/read-write.h
6016  create mode 100644 tools/kvm/include/kvm/rtc.h
6017  create mode 100644 tools/kvm/include/kvm/rwsem.h
6018  create mode 100644 tools/kvm/include/kvm/sdl.h
6019  create mode 100644 tools/kvm/include/kvm/segment.h
6020  create mode 100644 tools/kvm/include/kvm/strbuf.h
6021  create mode 100644 tools/kvm/include/kvm/symbol.h
6022  create mode 100644 tools/kvm/include/kvm/term.h
6023  create mode 100644 tools/kvm/include/kvm/threadpool.h
6024  create mode 100644 tools/kvm/include/kvm/types.h
6025  create mode 100644 tools/kvm/include/kvm/uip.h
6026  create mode 100644 tools/kvm/include/kvm/util.h
6027  create mode 100644 tools/kvm/include/kvm/vesa.h
6028  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
6029  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
6030  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
6031  create mode 100644 tools/kvm/include/kvm/virtio-console.h
6032  create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
6033  create mode 100644 tools/kvm/include/kvm/virtio-net.h
6034  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
6035  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
6036  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
6037  create mode 100644 tools/kvm/include/kvm/virtio.h
6038  create mode 100644 tools/kvm/include/kvm/vnc.h
6039  create mode 100644 tools/kvm/include/linux/bitops.h
6040  create mode 100644 tools/kvm/include/linux/byteorder.h
6041  create mode 100644 tools/kvm/include/linux/compiler.h
6042  create mode 100644 tools/kvm/include/linux/kernel.h
6043  create mode 100644 tools/kvm/include/linux/module.h
6044  create mode 100644 tools/kvm/include/linux/prefetch.h
6045  create mode 100644 tools/kvm/include/linux/stddef.h
6046  create mode 100644 tools/kvm/include/linux/types.h
6047  create mode 100644 tools/kvm/ioeventfd.c
6048  create mode 100644 tools/kvm/ioport.c
6049  create mode 100644 tools/kvm/kvm-cmd.c
6050  create mode 100644 tools/kvm/kvm-cpu.c
6051  create mode 100644 tools/kvm/kvm-ipc.c
6052  create mode 100644 tools/kvm/kvm.c
6053  create mode 100644 tools/kvm/main.c
6054  create mode 100644 tools/kvm/mmio.c
6055  create mode 100644 tools/kvm/net/uip/arp.c
6056  create mode 100644 tools/kvm/net/uip/buf.c
6057  create mode 100644 tools/kvm/net/uip/core.c
6058  create mode 100644 tools/kvm/net/uip/csum.c
6059  create mode 100644 tools/kvm/net/uip/dhcp.c
6060  create mode 100644 tools/kvm/net/uip/icmp.c
6061  create mode 100644 tools/kvm/net/uip/ipv4.c
6062  create mode 100644 tools/kvm/net/uip/tcp.c
6063  create mode 100644 tools/kvm/net/uip/udp.c
6064  create mode 100644 tools/kvm/pci.c
6065  create mode 100644 tools/kvm/powerpc/boot.c
6066  create mode 100644 tools/kvm/powerpc/cpu_info.c
6067  create mode 100644 tools/kvm/powerpc/cpu_info.h
6068  create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
6069  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
6070  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
6071  create mode 100644 tools/kvm/powerpc/ioport.c
6072  create mode 100644 tools/kvm/powerpc/irq.c
6073  create mode 100644 tools/kvm/powerpc/kvm-cpu.c
6074  create mode 100644 tools/kvm/powerpc/kvm.c
6075  create mode 100644 tools/kvm/powerpc/spapr.h
6076  create mode 100644 tools/kvm/powerpc/spapr_hcall.c
6077  create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
6078  create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
6079  create mode 100644 tools/kvm/powerpc/spapr_pci.c
6080  create mode 100644 tools/kvm/powerpc/spapr_pci.h
6081  create mode 100644 tools/kvm/powerpc/spapr_rtas.c
6082  create mode 100644 tools/kvm/powerpc/xics.c
6083  create mode 100644 tools/kvm/powerpc/xics.h
6084  create mode 100644 tools/kvm/symbol.c
6085  create mode 100644 tools/kvm/term.c
6086  create mode 100644 tools/kvm/tests/Makefile
6087  create mode 100644 tools/kvm/tests/boot/Makefile
6088  create mode 100644 tools/kvm/tests/boot/init.c
6089  create mode 100644 tools/kvm/tests/kernel/.gitignore
6090  create mode 100644 tools/kvm/tests/kernel/Makefile
6091  create mode 100644 tools/kvm/tests/kernel/README
6092  create mode 100644 tools/kvm/tests/kernel/kernel.S
6093  create mode 100644 tools/kvm/tests/pit/.gitignore
6094  create mode 100644 tools/kvm/tests/pit/Makefile
6095  create mode 100644 tools/kvm/tests/pit/README
6096  create mode 100644 tools/kvm/tests/pit/tick.S
6097  create mode 100644 tools/kvm/ui/sdl.c
6098  create mode 100644 tools/kvm/ui/vnc.c
6099  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
6100  create mode 100755 tools/kvm/util/generate-cmdlist.sh
6101  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
6102  create mode 100644 tools/kvm/util/parse-options.c
6103  create mode 100644 tools/kvm/util/rbtree-interval.c
6104  create mode 100644 tools/kvm/util/read-write.c
6105  create mode 100755 tools/kvm/util/set_private_br.sh
6106  create mode 100644 tools/kvm/util/strbuf.c
6107  create mode 100644 tools/kvm/util/threadpool.c
6108  create mode 100644 tools/kvm/util/util.c
6109  create mode 100644 tools/kvm/virtio/9p-pdu.c
6110  create mode 100644 tools/kvm/virtio/9p.c
6111  create mode 100644 tools/kvm/virtio/balloon.c
6112  create mode 100644 tools/kvm/virtio/blk.c
6113  create mode 100644 tools/kvm/virtio/console.c
6114  create mode 100644 tools/kvm/virtio/core.c
6115  create mode 100644 tools/kvm/virtio/mmio.c
6116  create mode 100644 tools/kvm/virtio/net.c
6117  create mode 100644 tools/kvm/virtio/pci.c
6118  create mode 100644 tools/kvm/virtio/rng.c
6119  create mode 100644 tools/kvm/x86/bios.c
6120  create mode 100644 tools/kvm/x86/bios/.gitignore
6121  create mode 100644 tools/kvm/x86/bios/bios-rom.S
6122  create mode 100644 tools/kvm/x86/bios/e820.c
6123  create mode 100644 tools/kvm/x86/bios/entry.S
6124  create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
6125  create mode 100644 tools/kvm/x86/bios/int10.c
6126  create mode 100644 tools/kvm/x86/bios/int15.c
6127  create mode 100644 tools/kvm/x86/bios/local.S
6128  create mode 100644 tools/kvm/x86/bios/macro.S
6129  create mode 100644 tools/kvm/x86/bios/memcpy.c
6130  create mode 100644 tools/kvm/x86/bios/rom.ld.S
6131  create mode 100644 tools/kvm/x86/boot.c
6132  create mode 100644 tools/kvm/x86/cpuid.c
6133  create mode 100644 tools/kvm/x86/include/kvm/assembly.h
6134  create mode 100644 tools/kvm/x86/include/kvm/barrier.h
6135  create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
6136  create mode 100644 tools/kvm/x86/include/kvm/bios.h
6137  create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
6138  create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
6139  create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
6140  create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
6141  create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
6142  create mode 100644 tools/kvm/x86/include/kvm/mptable.h
6143  create mode 100644 tools/kvm/x86/interrupt.c
6144  create mode 100644 tools/kvm/x86/ioport.c
6145  create mode 100644 tools/kvm/x86/irq.c
6146  create mode 100644 tools/kvm/x86/kvm-cpu.c
6147  create mode 100644 tools/kvm/x86/kvm.c
6148  create mode 100644 tools/kvm/x86/mptable.c
6149 $ git reset --hard HEAD^
6150 HEAD is now at d32838c Merge remote-tracking branch 'spi-mb/spi-next'
6151 Merging refs/next/20120814/tip
6152 $ git merge refs/next/20120814/tip
6153 Auto-merging arch/x86/Kconfig
6154 Auto-merging MAINTAINERS
6155 Merge made by the 'recursive' strategy.
6156  MAINTAINERS                                  |    8 +
6157  arch/x86/Kconfig                             |   31 +
6158  arch/x86/kernel/cpu/amd.c                    |   67 ++
6159  arch/x86/kernel/cpu/common.c                 |    5 +-
6160  arch/x86/kernel/cpu/intel.c                  |    4 +
6161  scripts/kconfig/Makefile                     |    7 +-
6162  tools/kvm/.gitignore                         |   12 +
6163  tools/kvm/CREDITS-Git                        |   30 +
6164  tools/kvm/Documentation/kernel-debugging.txt |   15 +
6165  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
6166  tools/kvm/Documentation/kvm-debug.txt        |   16 +
6167  tools/kvm/Documentation/kvm-list.txt         |   16 +
6168  tools/kvm/Documentation/kvm-pause.txt        |   16 +
6169  tools/kvm/Documentation/kvm-resume.txt       |   16 +
6170  tools/kvm/Documentation/kvm-run.txt          |   62 ++
6171  tools/kvm/Documentation/kvm-sandbox.txt      |   16 +
6172  tools/kvm/Documentation/kvm-setup.txt        |   15 +
6173  tools/kvm/Documentation/kvm-stat.txt         |   19 +
6174  tools/kvm/Documentation/kvm-stop.txt         |   16 +
6175  tools/kvm/Documentation/kvm-version.txt      |   21 +
6176  tools/kvm/Documentation/virtio-console.txt   |   41 +
6177  tools/kvm/Makefile                           |  427 +++++++
6178  tools/kvm/README                             |  112 ++
6179  tools/kvm/builtin-balloon.c                  |   80 ++
6180  tools/kvm/builtin-debug.c                    |  110 ++
6181  tools/kvm/builtin-help.c                     |   63 ++
6182  tools/kvm/builtin-list.c                     |  149 +++
6183  tools/kvm/builtin-pause.c                    |   88 ++
6184  tools/kvm/builtin-resume.c                   |   88 ++
6185  tools/kvm/builtin-run.c                      | 1393 +++++++++++++++++++++++
6186  tools/kvm/builtin-sandbox.c                  |    9 +
6187  tools/kvm/builtin-setup.c                    |  232 ++++
6188  tools/kvm/builtin-stat.c                     |  127 +++
6189  tools/kvm/builtin-stop.c                     |   70 ++
6190  tools/kvm/builtin-version.c                  |   15 +
6191  tools/kvm/code16gcc.h                        |   15 +
6192  tools/kvm/command-list.txt                   |   15 +
6193  tools/kvm/config/feature-tests.mak           |  177 +++
6194  tools/kvm/config/utilities.mak               |  196 ++++
6195  tools/kvm/disk/blk.c                         |   76 ++
6196  tools/kvm/disk/core.c                        |  275 +++++
6197  tools/kvm/disk/qcow.c                        | 1529 ++++++++++++++++++++++++++
6198  tools/kvm/disk/raw.c                         |  141 +++
6199  tools/kvm/framebuffer.c                      |   75 ++
6200  tools/kvm/guest/init.c                       |   38 +
6201  tools/kvm/guest/init_stage2.c                |   55 +
6202  tools/kvm/guest/passwd                       |    1 +
6203  tools/kvm/guest_compat.c                     |   99 ++
6204  tools/kvm/hw/i8042.c                         |  348 ++++++
6205  tools/kvm/hw/pci-shmem.c                     |  268 +++++
6206  tools/kvm/hw/rtc.c                           |  137 +++
6207  tools/kvm/hw/serial.c                        |  446 ++++++++
6208  tools/kvm/hw/vesa.c                          |   85 ++
6209  tools/kvm/include/asm/hweight.h              |    8 +
6210  tools/kvm/include/bios/memcpy.h              |    9 +
6211  tools/kvm/include/kvm/8250-serial.h          |   11 +
6212  tools/kvm/include/kvm/apic.h                 |   17 +
6213  tools/kvm/include/kvm/brlock.h               |   41 +
6214  tools/kvm/include/kvm/builtin-balloon.h      |    9 +
6215  tools/kvm/include/kvm/builtin-debug.h        |   20 +
6216  tools/kvm/include/kvm/builtin-help.h         |    6 +
6217  tools/kvm/include/kvm/builtin-list.h         |   10 +
6218  tools/kvm/include/kvm/builtin-pause.h        |    9 +
6219  tools/kvm/include/kvm/builtin-resume.h       |    9 +
6220  tools/kvm/include/kvm/builtin-run.h          |   11 +
6221  tools/kvm/include/kvm/builtin-sandbox.h      |    6 +
6222  tools/kvm/include/kvm/builtin-setup.h        |   11 +
6223  tools/kvm/include/kvm/builtin-stat.h         |    9 +
6224  tools/kvm/include/kvm/builtin-stop.h         |    9 +
6225  tools/kvm/include/kvm/builtin-version.h      |    6 +
6226  tools/kvm/include/kvm/compiler.h             |   10 +
6227  tools/kvm/include/kvm/disk-image.h           |   87 ++
6228  tools/kvm/include/kvm/e820.h                 |   13 +
6229  tools/kvm/include/kvm/framebuffer.h          |   35 +
6230  tools/kvm/include/kvm/guest_compat.h         |    9 +
6231  tools/kvm/include/kvm/i8042.h                |   12 +
6232  tools/kvm/include/kvm/ioeventfd.h            |   28 +
6233  tools/kvm/include/kvm/ioport.h               |   69 ++
6234  tools/kvm/include/kvm/irq.h                  |   33 +
6235  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
6236  tools/kvm/include/kvm/kvm-cpu.h              |   24 +
6237  tools/kvm/include/kvm/kvm-ipc.h              |   24 +
6238  tools/kvm/include/kvm/kvm.h                  |   93 ++
6239  tools/kvm/include/kvm/msi.h                  |   10 +
6240  tools/kvm/include/kvm/mutex.h                |   33 +
6241  tools/kvm/include/kvm/parse-options.h        |  214 ++++
6242  tools/kvm/include/kvm/pci-shmem.h            |   28 +
6243  tools/kvm/include/kvm/pci.h                  |   95 ++
6244  tools/kvm/include/kvm/qcow.h                 |  133 +++
6245  tools/kvm/include/kvm/rbtree-interval.h      |   28 +
6246  tools/kvm/include/kvm/read-write.h           |   43 +
6247  tools/kvm/include/kvm/rtc.h                  |    9 +
6248  tools/kvm/include/kvm/rwsem.h                |   39 +
6249  tools/kvm/include/kvm/sdl.h                  |   22 +
6250  tools/kvm/include/kvm/segment.h              |   21 +
6251  tools/kvm/include/kvm/strbuf.h               |   20 +
6252  tools/kvm/include/kvm/symbol.h               |   30 +
6253  tools/kvm/include/kvm/term.h                 |   20 +
6254  tools/kvm/include/kvm/threadpool.h           |   37 +
6255  tools/kvm/include/kvm/types.h                |    7 +
6256  tools/kvm/include/kvm/uip.h                  |  358 ++++++
6257  tools/kvm/include/kvm/util.h                 |   97 ++
6258  tools/kvm/include/kvm/vesa.h                 |   18 +
6259  tools/kvm/include/kvm/virtio-9p.h            |   73 ++
6260  tools/kvm/include/kvm/virtio-balloon.h       |    8 +
6261  tools/kvm/include/kvm/virtio-blk.h           |   12 +
6262  tools/kvm/include/kvm/virtio-console.h       |    9 +
6263  tools/kvm/include/kvm/virtio-mmio.h          |   58 +
6264  tools/kvm/include/kvm/virtio-net.h           |   26 +
6265  tools/kvm/include/kvm/virtio-pci-dev.h       |   37 +
6266  tools/kvm/include/kvm/virtio-pci.h           |   46 +
6267  tools/kvm/include/kvm/virtio-rng.h           |    9 +
6268  tools/kvm/include/kvm/virtio.h               |  103 ++
6269  tools/kvm/include/kvm/vnc.h                  |   20 +
6270  tools/kvm/include/linux/bitops.h             |   33 +
6271  tools/kvm/include/linux/byteorder.h          |    7 +
6272  tools/kvm/include/linux/compiler.h           |   19 +
6273  tools/kvm/include/linux/kernel.h             |   39 +
6274  tools/kvm/include/linux/module.h             |    6 +
6275  tools/kvm/include/linux/prefetch.h           |    6 +
6276  tools/kvm/include/linux/stddef.h             |   16 +
6277  tools/kvm/include/linux/types.h              |   51 +
6278  tools/kvm/ioeventfd.c                        |  215 ++++
6279  tools/kvm/ioport.c                           |  195 ++++
6280  tools/kvm/kvm-cmd.c                          |   91 ++
6281  tools/kvm/kvm-cpu.c                          |  175 +++
6282  tools/kvm/kvm-ipc.c                          |  231 ++++
6283  tools/kvm/kvm.c                              |  593 ++++++++++
6284  tools/kvm/main.c                             |   19 +
6285  tools/kvm/mmio.c                             |  140 +++
6286  tools/kvm/net/uip/arp.c                      |   30 +
6287  tools/kvm/net/uip/buf.c                      |  114 ++
6288  tools/kvm/net/uip/core.c                     |  190 ++++
6289  tools/kvm/net/uip/csum.c                     |   92 ++
6290  tools/kvm/net/uip/dhcp.c                     |  203 ++++
6291  tools/kvm/net/uip/icmp.c                     |   29 +
6292  tools/kvm/net/uip/ipv4.c                     |   29 +
6293  tools/kvm/net/uip/tcp.c                      |  317 ++++++
6294  tools/kvm/net/uip/udp.c                      |  236 ++++
6295  tools/kvm/pci.c                              |  213 ++++
6296  tools/kvm/powerpc/boot.c                     |    8 +
6297  tools/kvm/powerpc/cpu_info.c                 |  195 ++++
6298  tools/kvm/powerpc/cpu_info.h                 |   42 +
6299  tools/kvm/powerpc/include/kvm/barrier.h      |    6 +
6300  tools/kvm/powerpc/include/kvm/kvm-arch.h     |   90 ++
6301  tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h |   76 ++
6302  tools/kvm/powerpc/ioport.c                   |   18 +
6303  tools/kvm/powerpc/irq.c                      |   75 ++
6304  tools/kvm/powerpc/kvm-cpu.c                  |  293 +++++
6305  tools/kvm/powerpc/kvm.c                      |  529 +++++++++
6306  tools/kvm/powerpc/spapr.h                    |   93 ++
6307  tools/kvm/powerpc/spapr_hcall.c              |  134 +++
6308  tools/kvm/powerpc/spapr_hvcons.c             |  102 ++
6309  tools/kvm/powerpc/spapr_hvcons.h             |   19 +
6310  tools/kvm/powerpc/spapr_pci.c                |  423 +++++++
6311  tools/kvm/powerpc/spapr_pci.h                |   57 +
6312  tools/kvm/powerpc/spapr_rtas.c               |  229 ++++
6313  tools/kvm/powerpc/xics.c                     |  514 +++++++++
6314  tools/kvm/powerpc/xics.h                     |   23 +
6315  tools/kvm/symbol.c                           |  131 +++
6316  tools/kvm/term.c                             |  166 +++
6317  tools/kvm/tests/Makefile                     |   19 +
6318  tools/kvm/tests/boot/Makefile                |   13 +
6319  tools/kvm/tests/boot/init.c                  |   11 +
6320  tools/kvm/tests/kernel/.gitignore            |    2 +
6321  tools/kvm/tests/kernel/Makefile              |   20 +
6322  tools/kvm/tests/kernel/README                |   16 +
6323  tools/kvm/tests/kernel/kernel.S              |    8 +
6324  tools/kvm/tests/pit/.gitignore               |    2 +
6325  tools/kvm/tests/pit/Makefile                 |   20 +
6326  tools/kvm/tests/pit/README                   |   16 +
6327  tools/kvm/tests/pit/tick.S                   |  109 ++
6328  tools/kvm/ui/sdl.c                           |  303 +++++
6329  tools/kvm/ui/vnc.c                           |  230 ++++
6330  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
6331  tools/kvm/util/generate-cmdlist.sh           |   23 +
6332  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
6333  tools/kvm/util/parse-options.c               |  577 ++++++++++
6334  tools/kvm/util/rbtree-interval.c             |   89 ++
6335  tools/kvm/util/read-write.c                  |  354 ++++++
6336  tools/kvm/util/set_private_br.sh             |   51 +
6337  tools/kvm/util/strbuf.c                      |   62 ++
6338  tools/kvm/util/threadpool.c                  |  145 +++
6339  tools/kvm/util/util.c                        |  133 +++
6340  tools/kvm/virtio/9p-pdu.c                    |  287 +++++
6341  tools/kvm/virtio/9p.c                        | 1409 ++++++++++++++++++++++++
6342  tools/kvm/virtio/balloon.c                   |  267 +++++
6343  tools/kvm/virtio/blk.c                       |  313 ++++++
6344  tools/kvm/virtio/console.c                   |  193 ++++
6345  tools/kvm/virtio/core.c                      |  233 ++++
6346  tools/kvm/virtio/mmio.c                      |  264 +++++
6347  tools/kvm/virtio/net.c                       |  555 ++++++++++
6348  tools/kvm/virtio/pci.c                       |  377 +++++++
6349  tools/kvm/virtio/rng.c                       |  194 ++++
6350  tools/kvm/x86/bios.c                         |  174 +++
6351  tools/kvm/x86/bios/.gitignore                |    3 +
6352  tools/kvm/x86/bios/bios-rom.S                |   12 +
6353  tools/kvm/x86/bios/e820.c                    |   72 ++
6354  tools/kvm/x86/bios/entry.S                   |   92 ++
6355  tools/kvm/x86/bios/gen-offsets.sh            |   14 +
6356  tools/kvm/x86/bios/int10.c                   |  110 ++
6357  tools/kvm/x86/bios/int15.c                   |   18 +
6358  tools/kvm/x86/bios/local.S                   |    7 +
6359  tools/kvm/x86/bios/macro.S                   |   25 +
6360  tools/kvm/x86/bios/memcpy.c                  |   23 +
6361  tools/kvm/x86/bios/rom.ld.S                  |   16 +
6362  tools/kvm/x86/boot.c                         |   41 +
6363  tools/kvm/x86/cpuid.c                        |   60 +
6364  tools/kvm/x86/include/kvm/assembly.h         |   24 +
6365  tools/kvm/x86/include/kvm/barrier.h          |   20 +
6366  tools/kvm/x86/include/kvm/bios-export.h      |   13 +
6367  tools/kvm/x86/include/kvm/bios.h             |   93 ++
6368  tools/kvm/x86/include/kvm/boot-protocol.h    |   16 +
6369  tools/kvm/x86/include/kvm/cpufeature.h       |   41 +
6370  tools/kvm/x86/include/kvm/interrupt.h        |   26 +
6371  tools/kvm/x86/include/kvm/kvm-arch.h         |   67 ++
6372  tools/kvm/x86/include/kvm/kvm-cpu-arch.h     |   49 +
6373  tools/kvm/x86/include/kvm/mptable.h          |    9 +
6374  tools/kvm/x86/interrupt.c                    |   28 +
6375  tools/kvm/x86/ioport.c                       |   77 ++
6376  tools/kvm/x86/irq.c                          |  222 ++++
6377  tools/kvm/x86/kvm-cpu.c                      |  425 +++++++
6378  tools/kvm/x86/kvm.c                          |  372 +++++++
6379  tools/kvm/x86/mptable.c                      |  287 +++++
6380  224 files changed, 24999 insertions(+), 4 deletions(-)
6381  create mode 100644 tools/kvm/.gitignore
6382  create mode 100644 tools/kvm/CREDITS-Git
6383  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
6384  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
6385  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
6386  create mode 100644 tools/kvm/Documentation/kvm-list.txt
6387  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
6388  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
6389  create mode 100644 tools/kvm/Documentation/kvm-run.txt
6390  create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
6391  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
6392  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
6393  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
6394  create mode 100644 tools/kvm/Documentation/kvm-version.txt
6395  create mode 100644 tools/kvm/Documentation/virtio-console.txt
6396  create mode 100644 tools/kvm/Makefile
6397  create mode 100644 tools/kvm/README
6398  create mode 100644 tools/kvm/builtin-balloon.c
6399  create mode 100644 tools/kvm/builtin-debug.c
6400  create mode 100644 tools/kvm/builtin-help.c
6401  create mode 100644 tools/kvm/builtin-list.c
6402  create mode 100644 tools/kvm/builtin-pause.c
6403  create mode 100644 tools/kvm/builtin-resume.c
6404  create mode 100644 tools/kvm/builtin-run.c
6405  create mode 100644 tools/kvm/builtin-sandbox.c
6406  create mode 100644 tools/kvm/builtin-setup.c
6407  create mode 100644 tools/kvm/builtin-stat.c
6408  create mode 100644 tools/kvm/builtin-stop.c
6409  create mode 100644 tools/kvm/builtin-version.c
6410  create mode 100644 tools/kvm/code16gcc.h
6411  create mode 100644 tools/kvm/command-list.txt
6412  create mode 100644 tools/kvm/config/feature-tests.mak
6413  create mode 100644 tools/kvm/config/utilities.mak
6414  create mode 100644 tools/kvm/disk/blk.c
6415  create mode 100644 tools/kvm/disk/core.c
6416  create mode 100644 tools/kvm/disk/qcow.c
6417  create mode 100644 tools/kvm/disk/raw.c
6418  create mode 100644 tools/kvm/framebuffer.c
6419  create mode 100644 tools/kvm/guest/init.c
6420  create mode 100644 tools/kvm/guest/init_stage2.c
6421  create mode 100644 tools/kvm/guest/passwd
6422  create mode 100644 tools/kvm/guest_compat.c
6423  create mode 100644 tools/kvm/hw/i8042.c
6424  create mode 100644 tools/kvm/hw/pci-shmem.c
6425  create mode 100644 tools/kvm/hw/rtc.c
6426  create mode 100644 tools/kvm/hw/serial.c
6427  create mode 100644 tools/kvm/hw/vesa.c
6428  create mode 100644 tools/kvm/include/asm/hweight.h
6429  create mode 100644 tools/kvm/include/bios/memcpy.h
6430  create mode 100644 tools/kvm/include/kvm/8250-serial.h
6431  create mode 100644 tools/kvm/include/kvm/apic.h
6432  create mode 100644 tools/kvm/include/kvm/brlock.h
6433  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
6434  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
6435  create mode 100644 tools/kvm/include/kvm/builtin-help.h
6436  create mode 100644 tools/kvm/include/kvm/builtin-list.h
6437  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
6438  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
6439  create mode 100644 tools/kvm/include/kvm/builtin-run.h
6440  create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
6441  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
6442  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
6443  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
6444  create mode 100644 tools/kvm/include/kvm/builtin-version.h
6445  create mode 100644 tools/kvm/include/kvm/compiler.h
6446  create mode 100644 tools/kvm/include/kvm/disk-image.h
6447  create mode 100644 tools/kvm/include/kvm/e820.h
6448  create mode 100644 tools/kvm/include/kvm/framebuffer.h
6449  create mode 100644 tools/kvm/include/kvm/guest_compat.h
6450  create mode 100644 tools/kvm/include/kvm/i8042.h
6451  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
6452  create mode 100644 tools/kvm/include/kvm/ioport.h
6453  create mode 100644 tools/kvm/include/kvm/irq.h
6454  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
6455  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
6456  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
6457  create mode 100644 tools/kvm/include/kvm/kvm.h
6458  create mode 100644 tools/kvm/include/kvm/msi.h
6459  create mode 100644 tools/kvm/include/kvm/mutex.h
6460  create mode 100644 tools/kvm/include/kvm/parse-options.h
6461  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
6462  create mode 100644 tools/kvm/include/kvm/pci.h
6463  create mode 100644 tools/kvm/include/kvm/qcow.h
6464  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
6465  create mode 100644 tools/kvm/include/kvm/read-write.h
6466  create mode 100644 tools/kvm/include/kvm/rtc.h
6467  create mode 100644 tools/kvm/include/kvm/rwsem.h
6468  create mode 100644 tools/kvm/include/kvm/sdl.h
6469  create mode 100644 tools/kvm/include/kvm/segment.h
6470  create mode 100644 tools/kvm/include/kvm/strbuf.h
6471  create mode 100644 tools/kvm/include/kvm/symbol.h
6472  create mode 100644 tools/kvm/include/kvm/term.h
6473  create mode 100644 tools/kvm/include/kvm/threadpool.h
6474  create mode 100644 tools/kvm/include/kvm/types.h
6475  create mode 100644 tools/kvm/include/kvm/uip.h
6476  create mode 100644 tools/kvm/include/kvm/util.h
6477  create mode 100644 tools/kvm/include/kvm/vesa.h
6478  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
6479  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
6480  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
6481  create mode 100644 tools/kvm/include/kvm/virtio-console.h
6482  create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
6483  create mode 100644 tools/kvm/include/kvm/virtio-net.h
6484  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
6485  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
6486  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
6487  create mode 100644 tools/kvm/include/kvm/virtio.h
6488  create mode 100644 tools/kvm/include/kvm/vnc.h
6489  create mode 100644 tools/kvm/include/linux/bitops.h
6490  create mode 100644 tools/kvm/include/linux/byteorder.h
6491  create mode 100644 tools/kvm/include/linux/compiler.h
6492  create mode 100644 tools/kvm/include/linux/kernel.h
6493  create mode 100644 tools/kvm/include/linux/module.h
6494  create mode 100644 tools/kvm/include/linux/prefetch.h
6495  create mode 100644 tools/kvm/include/linux/stddef.h
6496  create mode 100644 tools/kvm/include/linux/types.h
6497  create mode 100644 tools/kvm/ioeventfd.c
6498  create mode 100644 tools/kvm/ioport.c
6499  create mode 100644 tools/kvm/kvm-cmd.c
6500  create mode 100644 tools/kvm/kvm-cpu.c
6501  create mode 100644 tools/kvm/kvm-ipc.c
6502  create mode 100644 tools/kvm/kvm.c
6503  create mode 100644 tools/kvm/main.c
6504  create mode 100644 tools/kvm/mmio.c
6505  create mode 100644 tools/kvm/net/uip/arp.c
6506  create mode 100644 tools/kvm/net/uip/buf.c
6507  create mode 100644 tools/kvm/net/uip/core.c
6508  create mode 100644 tools/kvm/net/uip/csum.c
6509  create mode 100644 tools/kvm/net/uip/dhcp.c
6510  create mode 100644 tools/kvm/net/uip/icmp.c
6511  create mode 100644 tools/kvm/net/uip/ipv4.c
6512  create mode 100644 tools/kvm/net/uip/tcp.c
6513  create mode 100644 tools/kvm/net/uip/udp.c
6514  create mode 100644 tools/kvm/pci.c
6515  create mode 100644 tools/kvm/powerpc/boot.c
6516  create mode 100644 tools/kvm/powerpc/cpu_info.c
6517  create mode 100644 tools/kvm/powerpc/cpu_info.h
6518  create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
6519  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
6520  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
6521  create mode 100644 tools/kvm/powerpc/ioport.c
6522  create mode 100644 tools/kvm/powerpc/irq.c
6523  create mode 100644 tools/kvm/powerpc/kvm-cpu.c
6524  create mode 100644 tools/kvm/powerpc/kvm.c
6525  create mode 100644 tools/kvm/powerpc/spapr.h
6526  create mode 100644 tools/kvm/powerpc/spapr_hcall.c
6527  create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
6528  create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
6529  create mode 100644 tools/kvm/powerpc/spapr_pci.c
6530  create mode 100644 tools/kvm/powerpc/spapr_pci.h
6531  create mode 100644 tools/kvm/powerpc/spapr_rtas.c
6532  create mode 100644 tools/kvm/powerpc/xics.c
6533  create mode 100644 tools/kvm/powerpc/xics.h
6534  create mode 100644 tools/kvm/symbol.c
6535  create mode 100644 tools/kvm/term.c
6536  create mode 100644 tools/kvm/tests/Makefile
6537  create mode 100644 tools/kvm/tests/boot/Makefile
6538  create mode 100644 tools/kvm/tests/boot/init.c
6539  create mode 100644 tools/kvm/tests/kernel/.gitignore
6540  create mode 100644 tools/kvm/tests/kernel/Makefile
6541  create mode 100644 tools/kvm/tests/kernel/README
6542  create mode 100644 tools/kvm/tests/kernel/kernel.S
6543  create mode 100644 tools/kvm/tests/pit/.gitignore
6544  create mode 100644 tools/kvm/tests/pit/Makefile
6545  create mode 100644 tools/kvm/tests/pit/README
6546  create mode 100644 tools/kvm/tests/pit/tick.S
6547  create mode 100644 tools/kvm/ui/sdl.c
6548  create mode 100644 tools/kvm/ui/vnc.c
6549  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
6550  create mode 100755 tools/kvm/util/generate-cmdlist.sh
6551  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
6552  create mode 100644 tools/kvm/util/parse-options.c
6553  create mode 100644 tools/kvm/util/rbtree-interval.c
6554  create mode 100644 tools/kvm/util/read-write.c
6555  create mode 100755 tools/kvm/util/set_private_br.sh
6556  create mode 100644 tools/kvm/util/strbuf.c
6557  create mode 100644 tools/kvm/util/threadpool.c
6558  create mode 100644 tools/kvm/util/util.c
6559  create mode 100644 tools/kvm/virtio/9p-pdu.c
6560  create mode 100644 tools/kvm/virtio/9p.c
6561  create mode 100644 tools/kvm/virtio/balloon.c
6562  create mode 100644 tools/kvm/virtio/blk.c
6563  create mode 100644 tools/kvm/virtio/console.c
6564  create mode 100644 tools/kvm/virtio/core.c
6565  create mode 100644 tools/kvm/virtio/mmio.c
6566  create mode 100644 tools/kvm/virtio/net.c
6567  create mode 100644 tools/kvm/virtio/pci.c
6568  create mode 100644 tools/kvm/virtio/rng.c
6569  create mode 100644 tools/kvm/x86/bios.c
6570  create mode 100644 tools/kvm/x86/bios/.gitignore
6571  create mode 100644 tools/kvm/x86/bios/bios-rom.S
6572  create mode 100644 tools/kvm/x86/bios/e820.c
6573  create mode 100644 tools/kvm/x86/bios/entry.S
6574  create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
6575  create mode 100644 tools/kvm/x86/bios/int10.c
6576  create mode 100644 tools/kvm/x86/bios/int15.c
6577  create mode 100644 tools/kvm/x86/bios/local.S
6578  create mode 100644 tools/kvm/x86/bios/macro.S
6579  create mode 100644 tools/kvm/x86/bios/memcpy.c
6580  create mode 100644 tools/kvm/x86/bios/rom.ld.S
6581  create mode 100644 tools/kvm/x86/boot.c
6582  create mode 100644 tools/kvm/x86/cpuid.c
6583  create mode 100644 tools/kvm/x86/include/kvm/assembly.h
6584  create mode 100644 tools/kvm/x86/include/kvm/barrier.h
6585  create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
6586  create mode 100644 tools/kvm/x86/include/kvm/bios.h
6587  create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
6588  create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
6589  create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
6590  create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
6591  create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
6592  create mode 100644 tools/kvm/x86/include/kvm/mptable.h
6593  create mode 100644 tools/kvm/x86/interrupt.c
6594  create mode 100644 tools/kvm/x86/ioport.c
6595  create mode 100644 tools/kvm/x86/irq.c
6596  create mode 100644 tools/kvm/x86/kvm-cpu.c
6597  create mode 100644 tools/kvm/x86/kvm.c
6598  create mode 100644 tools/kvm/x86/mptable.c
6599 Merging rcu/rcu/next (d1d61c1 Merge branches 'bigrt.2012.07.31a', 'doctorture.2012.08.03a', 'fixes.2012.08.03a', 'hotplug.2012.08.03a' and 'idle.2012.07.31a' into dev.3.7.2012.08.03a)
6600 $ git merge rcu/rcu/next
6601 Resolved 'arch/Kconfig' using previous resolution.
6602 Resolved 'arch/x86/Kconfig' using previous resolution.
6603 Resolved 'include/linux/sched.h' using previous resolution.
6604 Auto-merging lib/Kconfig.debug
6605 Auto-merging kernel/sched/core.c
6606 Auto-merging init/Kconfig
6607 Auto-merging include/linux/sched.h
6608 CONFLICT (content): Merge conflict in include/linux/sched.h
6609 Auto-merging arch/x86/kernel/traps.c
6610 Auto-merging arch/x86/kernel/signal.c
6611 Auto-merging arch/x86/kernel/entry_64.S
6612 Auto-merging arch/x86/Kconfig
6613 CONFLICT (content): Merge conflict in arch/x86/Kconfig
6614 Auto-merging arch/um/drivers/mconsole_kern.c
6615 Auto-merging arch/Kconfig
6616 CONFLICT (content): Merge conflict in arch/Kconfig
6617 Auto-merging Documentation/kernel-parameters.txt
6618 Automatic merge failed; fix conflicts and then commit the result.
6619 $ git commit -v -a
6620 [master 0447480] Merge remote-tracking branch 'rcu/rcu/next'
6621 $ git diff -M --stat --summary HEAD^..
6622  Documentation/RCU/trace.txt         |   43 +-
6623  Documentation/kernel-parameters.txt |   11 +
6624  arch/Kconfig                        |   10 +
6625  arch/um/drivers/mconsole_kern.c     |    1 +
6626  arch/x86/Kconfig                    |    1 +
6627  arch/x86/include/asm/rcu.h          |   20 +
6628  arch/x86/include/asm/thread_info.h  |   10 +-
6629  arch/x86/kernel/entry_64.S          |    8 +-
6630  arch/x86/kernel/ptrace.c            |    5 +
6631  arch/x86/kernel/signal.c            |    4 +
6632  arch/x86/kernel/traps.c             |   30 +-
6633  arch/x86/mm/fault.c                 |   13 +-
6634  include/linux/rcupdate.h            |   20 +-
6635  include/linux/sched.h               |    8 +
6636  init/Kconfig                        |   18 +
6637  kernel/rcupdate.c                   |    4 +
6638  kernel/rcutiny.c                    |   31 +-
6639  kernel/rcutorture.c                 |   46 +-
6640  kernel/rcutree.c                    |  817 ++++++++++++++++++++---------------
6641  kernel/rcutree.h                    |   33 +-
6642  kernel/rcutree_plugin.h             |  172 +++++++-
6643  kernel/rcutree_trace.c              |    7 +-
6644  kernel/sched/core.c                 |   30 +-
6645  lib/Kconfig.debug                   |   14 +
6646  24 files changed, 897 insertions(+), 459 deletions(-)
6647  create mode 100644 arch/x86/include/asm/rcu.h
6648 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
6649 $ git merge cputime/cputime
6650 Already up-to-date.
6651 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
6652 $ git merge uprobes/for-next
6653 Already up-to-date.
6654 Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
6655 $ git merge kmemleak/kmemleak
6656 Merge made by the 'recursive' strategy.
6657  mm/kmemleak.c |    1 +
6658  1 file changed, 1 insertion(+)
6659 Merging kvm/linux-next (dbcb4e7 KVM: VMX: Advertize RDTSC exiting to nested guests)
6660 $ git merge kvm/linux-next
6661 Resolved 'arch/s390/include/asm/processor.h' using previous resolution.
6662 Removing arch/x86/kvm/timer.c
6663 Removing arch/x86/kvm/kvm_timer.h
6664 Auto-merging arch/s390/kernel/dis.c
6665 Auto-merging arch/s390/include/asm/processor.h
6666 CONFLICT (content): Merge conflict in arch/s390/include/asm/processor.h
6667 Automatic merge failed; fix conflicts and then commit the result.
6668 $ git commit -v -a
6669 [master 6be9226] Merge remote-tracking branch 'kvm/linux-next'
6670 $ git diff -M --stat --summary HEAD^..
6671  Documentation/virtual/kvm/hypercalls.txt |   66 ++++++
6672  Documentation/virtual/kvm/ppc-pv.txt     |   22 ++
6673  arch/ia64/kvm/kvm-ia64.c                 |   33 +--
6674  arch/powerpc/include/asm/kvm_host.h      |    3 +
6675  arch/powerpc/kvm/44x_tlb.c               |    1 -
6676  arch/powerpc/kvm/book3s_64_mmu_hv.c      |   51 +++--
6677  arch/powerpc/kvm/book3s_hv_rm_mmu.c      |    4 +-
6678  arch/powerpc/kvm/book3s_pr.c             |    4 +-
6679  arch/powerpc/kvm/e500_tlb.c              |    3 +-
6680  arch/powerpc/kvm/powerpc.c               |    8 +
6681  arch/s390/include/asm/processor.h        |    1 +
6682  arch/s390/kernel/dis.c                   |   27 +++
6683  arch/s390/kvm/Kconfig                    |    1 +
6684  arch/s390/kvm/diag.c                     |    4 +
6685  arch/s390/kvm/intercept.c                |   11 +
6686  arch/s390/kvm/interrupt.c                |   23 ++
6687  arch/s390/kvm/kvm-s390.c                 |   10 +
6688  arch/s390/kvm/priv.c                     |    9 +-
6689  arch/s390/kvm/sigp.c                     |    2 +
6690  arch/s390/kvm/trace-s390.h               |  210 ++++++++++++++++++
6691  arch/s390/kvm/trace.h                    |  341 ++++++++++++++++++++++++++++++
6692  arch/x86/include/asm/kvm_host.h          |    5 +-
6693  arch/x86/include/asm/kvm_para.h          |    2 +-
6694  arch/x86/kvm/Kconfig                     |    1 +
6695  arch/x86/kvm/Makefile                    |    2 +-
6696  arch/x86/kvm/cpuid.c                     |    2 +-
6697  arch/x86/kvm/emulate.c                   |   48 ++---
6698  arch/x86/kvm/i8254.c                     |   64 +++---
6699  arch/x86/kvm/i8254.h                     |    6 +-
6700  arch/x86/kvm/irq.h                       |    2 +-
6701  arch/x86/kvm/kvm_timer.h                 |   18 --
6702  arch/x86/kvm/lapic.c                     |  264 +++++++++++++----------
6703  arch/x86/kvm/lapic.h                     |   58 ++++-
6704  arch/x86/kvm/mmu.c                       |  132 +++++++-----
6705  arch/x86/kvm/mmu_audit.c                 |    8 +-
6706  arch/x86/kvm/paging_tmpl.h               |    8 +-
6707  arch/x86/kvm/pmu.c                       |    2 +-
6708  arch/x86/kvm/svm.c                       |    5 +-
6709  arch/x86/kvm/timer.c                     |   47 ----
6710  arch/x86/kvm/vmx.c                       |   19 +-
6711  arch/x86/kvm/x86.c                       |  149 +++++++------
6712  arch/x86/kvm/x86.h                       |    1 +
6713  include/linux/kvm_host.h                 |  107 ++++++++--
6714  kernel/jump_label.c                      |    1 +
6715  virt/kvm/Kconfig                         |    3 +
6716  virt/kvm/async_pf.c                      |   11 +-
6717  virt/kvm/iommu.c                         |   16 +-
6718  virt/kvm/irq_comm.c                      |    4 +-
6719  virt/kvm/kvm_main.c                      |  229 ++++++++++----------
6720  49 files changed, 1454 insertions(+), 594 deletions(-)
6721  create mode 100644 Documentation/virtual/kvm/hypercalls.txt
6722  create mode 100644 arch/s390/kvm/trace-s390.h
6723  create mode 100644 arch/s390/kvm/trace.h
6724  delete mode 100644 arch/x86/kvm/kvm_timer.h
6725  delete mode 100644 arch/x86/kvm/timer.c
6726 Merging kvm-ppc/kvm-ppc-next (e9908a4 KVM: PPC: BookE: Support FPU on non-hv systems)
6727 $ git merge kvm-ppc/kvm-ppc-next
6728 Auto-merging arch/powerpc/mm/mem.c
6729 Merge made by the 'recursive' strategy.
6730  Documentation/virtual/kvm/api.txt       |   16 +-
6731  arch/powerpc/include/asm/Kbuild         |    1 +
6732  arch/powerpc/include/asm/epapr_hcalls.h |   36 ++--
6733  arch/powerpc/include/asm/fsl_hcalls.h   |   36 ++--
6734  arch/powerpc/include/asm/kvm.h          |   12 ++
6735  arch/powerpc/include/asm/kvm_host.h     |   30 +++-
6736  arch/powerpc/include/asm/kvm_para.h     |   21 +--
6737  arch/powerpc/include/asm/kvm_ppc.h      |   28 +++
6738  arch/powerpc/include/asm/reg_booke.h    |    7 +
6739  arch/powerpc/kernel/epapr_hcalls.S      |   28 +++
6740  arch/powerpc/kernel/epapr_paravirt.c    |   11 +-
6741  arch/powerpc/kernel/kvm.c               |    2 +-
6742  arch/powerpc/kernel/ppc_ksyms.c         |    5 +
6743  arch/powerpc/kvm/44x.c                  |    1 +
6744  arch/powerpc/kvm/44x_emulate.c          |  110 +++++++-----
6745  arch/powerpc/kvm/Kconfig                |    3 +
6746  arch/powerpc/kvm/book3s.c               |    9 +
6747  arch/powerpc/kvm/book3s_32_mmu_host.c   |    4 +
6748  arch/powerpc/kvm/book3s_64_mmu_host.c   |    3 +
6749  arch/powerpc/kvm/book3s_hv_builtin.c    |    4 +-
6750  arch/powerpc/kvm/book3s_hv_rmhandlers.S |   12 +-
6751  arch/powerpc/kvm/book3s_mmu_hpte.c      |    5 -
6752  arch/powerpc/kvm/book3s_pr.c            |  109 ++++++++----
6753  arch/powerpc/kvm/book3s_rmhandlers.S    |   15 +-
6754  arch/powerpc/kvm/booke.c                |  290 ++++++++++++++++++++++++++-----
6755  arch/powerpc/kvm/booke_emulate.c        |   22 ++-
6756  arch/powerpc/kvm/e500.h                 |    3 +-
6757  arch/powerpc/kvm/e500_tlb.c             |   80 +++++++--
6758  arch/powerpc/kvm/powerpc.c              |  128 ++++++++++++--
6759  arch/powerpc/kvm/trace.h                |  200 ++++++++++++++++++---
6760  arch/powerpc/mm/mem.c                   |    1 +
6761  arch/powerpc/platforms/Kconfig          |    1 +
6762  arch/powerpc/sysdev/fsl_msi.c           |    9 +-
6763  arch/powerpc/sysdev/fsl_soc.c           |    2 +
6764  drivers/tty/Kconfig                     |    1 +
6765  drivers/virt/Kconfig                    |    1 +
6766  include/linux/kvm.h                     |    4 +
6767  include/linux/kvm_host.h                |    1 +
6768  38 files changed, 994 insertions(+), 257 deletions(-)
6769 Merging oprofile/for-next (c16fa4f Linux 3.3)
6770 $ git merge oprofile/for-next
6771 Already up-to-date.
6772 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
6773 $ git merge xen/upstream/xen
6774 Already up-to-date.
6775 Merging xen-two/linux-next (64b0a47 Merge commit 'v3.5-rc7' into linux-next)
6776 $ git merge xen-two/linux-next
6777 Auto-merging arch/x86/xen/enlighten.c
6778 Merge made by the 'recursive' strategy.
6779  arch/x86/xen/enlighten.c |    8 --------
6780  drivers/xen/events.c     |    2 --
6781  2 files changed, 10 deletions(-)
6782 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
6783 $ git merge xen-pvhvm/linux-next
6784 Already up-to-date.
6785 Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
6786 $ git merge percpu/for-next
6787 Already up-to-date.
6788 Merging workqueues/for-next (7635d2f workqueue: use system_highpri_wq for unbind_work)
6789 $ git merge workqueues/for-next
6790 Auto-merging net/core/dst.c
6791 Auto-merging drivers/thermal/thermal_sys.c
6792 Auto-merging drivers/platform/x86/thinkpad_acpi.c
6793 Auto-merging block/genhd.c
6794 Merge made by the 'recursive' strategy.
6795  block/genhd.c                          |    6 +-
6796  drivers/edac/edac_mc.c                 |   17 +-
6797  drivers/infiniband/core/addr.c         |    4 +-
6798  drivers/infiniband/hw/nes/nes_hw.c     |    6 +-
6799  drivers/infiniband/hw/nes/nes_nic.c    |    5 +-
6800  drivers/net/wireless/ipw2x00/ipw2100.c |    8 +-
6801  drivers/net/wireless/zd1211rw/zd_usb.c |    3 +-
6802  drivers/platform/x86/thinkpad_acpi.c   |   20 +-
6803  drivers/power/charger-manager.c        |    9 +-
6804  drivers/power/ds2760_battery.c         |    9 +-
6805  drivers/power/jz4740-battery.c         |    6 +-
6806  drivers/thermal/thermal_sys.c          |   15 +-
6807  fs/afs/callback.c                      |    4 +-
6808  fs/afs/server.c                        |   10 +-
6809  fs/afs/vlocation.c                     |   14 +-
6810  fs/nfs/nfs4renewd.c                    |    3 +-
6811  include/linux/workqueue.h              |   48 +-
6812  kernel/workqueue.c                     |  779 ++++++++++++++++++++------------
6813  net/core/dst.c                         |    4 +-
6814  net/rfkill/input.c                     |    3 +-
6815  20 files changed, 564 insertions(+), 409 deletions(-)
6816 Merging drivers-x86/linux-next (00d3959 thinkpad_acpi: Free hotkey_keycode_map after unregistering tpacpi_inputdev)
6817 $ git merge drivers-x86/linux-next
6818 Already up-to-date.
6819 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
6820 $ git merge hwpoison/hwpoison
6821 Already up-to-date.
6822 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
6823 $ git merge sysctl/master
6824 Already up-to-date.
6825 Merging regmap/for-next (e0bf121 Merge branch 'regmap-irq' into regmap-next)
6826 $ git merge regmap/for-next
6827 Merge made by the 'recursive' strategy.
6828  drivers/base/regmap/regmap-irq.c |   84 ++++++++++++++++++++++++++++++--------
6829  drivers/base/regmap/regmap.c     |   13 ++----
6830  drivers/mfd/wm8994-irq.c         |    1 +
6831  include/linux/regmap.h           |    2 +
6832  4 files changed, 74 insertions(+), 26 deletions(-)
6833 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
6834 $ git merge hsi/for-next
6835 Already up-to-date.
6836 Merging leds/for-next (4e83ac8 leds: delay led_set_brightness if stopping soft-blink)
6837 $ git merge leds/for-next
6838 Merge made by the 'recursive' strategy.
6839  drivers/leds/led-class.c       |   15 +++++++++++++++
6840  drivers/leds/led-core.c        |   10 ++++++----
6841  drivers/leds/led-triggers.c    |    2 +-
6842  drivers/leds/leds-clevo-mail.c |   10 +++++-----
6843  drivers/leds/leds-wm8350.c     |   29 +++++++----------------------
6844  include/linux/leds.h           |    4 ++++
6845  6 files changed, 38 insertions(+), 32 deletions(-)
6846 Merging driver-core/driver-core-next (9baf322 extcon: Ensure dynamically allocated sysfs attributes are initialised)
6847 $ git merge driver-core/driver-core-next
6848 Auto-merging include/linux/device.h
6849 Auto-merging drivers/extcon/extcon-class.c
6850 Auto-merging drivers/base/platform.c
6851 Auto-merging drivers/base/core.c
6852 Merge made by the 'recursive' strategy.
6853  drivers/base/core.c                               |   18 +-
6854  drivers/base/devres.c                             |   42 ++
6855  drivers/base/firmware_class.c                     |  764 ++++++++++++++++++---
6856  drivers/base/platform.c                           |   38 +-
6857  drivers/extcon/Makefile                           |    4 +-
6858  drivers/extcon/extcon-arizona.c                   |   72 +-
6859  drivers/extcon/{extcon_class.c => extcon-class.c} |    4 +
6860  drivers/extcon/{extcon_gpio.c => extcon-gpio.c}   |    0
6861  drivers/hv/hv.c                                   |    9 +-
6862  drivers/hv/hv_kvp.c                               |  114 ++-
6863  drivers/hv/hv_util.c                              |    4 +-
6864  drivers/hv/hyperv_vmbus.h                         |   47 +-
6865  drivers/hv/vmbus_drv.c                            |   38 +-
6866  fs/debugfs/inode.c                                |    6 +-
6867  include/linux/device.h                            |    4 +
6868  include/linux/firmware.h                          |   15 +
6869  include/linux/hyperv.h                            |   99 ++-
6870  include/linux/platform_device.h                   |    4 +
6871  tools/hv/hv_kvp_daemon.c                          |   68 +-
6872  19 files changed, 1111 insertions(+), 239 deletions(-)
6873  rename drivers/extcon/{extcon_class.c => extcon-class.c} (99%)
6874  rename drivers/extcon/{extcon_gpio.c => extcon-gpio.c} (100%)
6875 $ git reset --hard HEAD^
6876 HEAD is now at 772c3bc Merge remote-tracking branch 'leds/for-next'
6877 Merging refs/next/20120816/driver-core
6878 $ git merge refs/next/20120816/driver-core
6879 Merge made by the 'recursive' strategy.
6880  drivers/hv/hv.c           |    9 ++++++---
6881  drivers/hv/hyperv_vmbus.h |   47 +++++++++++++++++++++++++++++++++++++++++----
6882  drivers/hv/vmbus_drv.c    |   38 ++----------------------------------
6883  3 files changed, 51 insertions(+), 43 deletions(-)
6884 Merging tty/tty-next (63d4869 firmware: remove computone driver firmware and documentation)
6885 $ git merge tty/tty-next
6886 Auto-merging net/bluetooth/rfcomm/tty.c
6887 Removing include/linux/stallion.h
6888 Removing include/linux/serial167.h
6889 Removing include/linux/sc26198.h
6890 Removing include/linux/istallion.h
6891 Removing include/linux/generic_serial.h
6892 Removing include/linux/comstats.h
6893 Removing include/linux/cdk.h
6894 Removing include/linux/cd1400.h
6895 Auto-merging include/linux/Kbuild
6896 Removing firmware/intelliport2.bin.ihex
6897 Auto-merging firmware/Makefile
6898 Auto-merging drivers/usb/serial/usb_wwan.c
6899 Auto-merging drivers/usb/serial/mos7840.c
6900 Auto-merging drivers/usb/serial/ftdi_sio.c
6901 Removing drivers/tty/serial/max3107.h
6902 Removing drivers/tty/serial/max3107.c
6903 Auto-merging drivers/tty/serial/ifx6x60.c
6904 Auto-merging drivers/tty/serial/Kconfig
6905 Auto-merging arch/xtensa/platforms/iss/console.c
6906 Removing Documentation/serial/computone.txt
6907 Merge made by the 'recursive' strategy.
6908  .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt     |   14 +
6909  .../devicetree/bindings/tty/serial/of-serial.txt   |    2 +
6910  Documentation/serial/00-INDEX                      |    2 -
6911  Documentation/serial/computone.txt                 |  520 -----
6912  arch/alpha/kernel/srmcons.c                        |    1 +
6913  arch/arm/mach-omap2/serial.c                       |    3 +
6914  arch/arm/plat-omap/include/plat/omap-serial.h      |    7 +
6915  arch/ia64/hp/sim/simserial.c                       |    3 +-
6916  arch/m68k/emu/nfcon.c                              |    4 +
6917  arch/mips/cavium-octeon/serial.c                   |   30 +-
6918  arch/parisc/kernel/pdc_cons.c                      |    1 +
6919  arch/um/drivers/line.c                             |    3 +-
6920  arch/xtensa/platforms/iss/console.c                |    1 +
6921  drivers/bluetooth/hci_ath.c                        |    2 +-
6922  drivers/char/mwave/mwavedd.c                       |   16 +-
6923  drivers/char/pcmcia/synclink_cs.c                  |  129 +-
6924  drivers/char/ttyprintk.c                           |   33 +-
6925  drivers/isdn/capi/capi.c                           |    3 +-
6926  drivers/isdn/gigaset/interface.c                   |    7 +-
6927  drivers/isdn/i4l/isdn_tty.c                        |   41 +-
6928  drivers/misc/ibmasm/uart.c                         |   16 +-
6929  drivers/misc/pti.c                                 |  128 +-
6930  drivers/mmc/card/sdio_uart.c                       |   24 +-
6931  drivers/net/ethernet/sgi/ioc3-eth.c                |   22 +-
6932  drivers/net/irda/irtty-sir.c                       |   10 +-
6933  drivers/net/usb/hso.c                              |   19 +-
6934  drivers/s390/char/con3215.c                        |   28 +-
6935  drivers/s390/char/sclp_tty.c                       |    1 +
6936  drivers/s390/char/sclp_vt220.c                     |    1 +
6937  drivers/s390/char/tty3270.c                        |   34 +-
6938  drivers/staging/ipack/devices/ipoctal.c            |   14 +-
6939  drivers/staging/serqt_usb2/serqt_usb2.c            |   18 +-
6940  drivers/tty/amiserial.c                            |   43 +-
6941  drivers/tty/bfin_jtag_comm.c                       |    1 +
6942  drivers/tty/cyclades.c                             |  100 +-
6943  drivers/tty/ehv_bytechan.c                         |    9 +-
6944  drivers/tty/hvc/hvc_console.c                      |   31 +-
6945  drivers/tty/hvc/hvcs.c                             |   82 +-
6946  drivers/tty/hvc/hvsi.c                             |    2 +
6947  drivers/tty/hvc/hvsi_lib.c                         |    2 +-
6948  drivers/tty/ipwireless/tty.c                       |    2 +-
6949  drivers/tty/isicom.c                               |   11 +-
6950  drivers/tty/moxa.c                                 |   39 +-
6951  drivers/tty/mxser.c                                |   61 +-
6952  drivers/tty/n_gsm.c                                |  142 +-
6953  drivers/tty/n_r3964.c                              |   10 +-
6954  drivers/tty/n_tty.c                                |   29 +-
6955  drivers/tty/nozomi.c                               |    4 +-
6956  drivers/tty/pty.c                                  |  234 ++-
6957  drivers/tty/rocket.c                               |   22 +-
6958  drivers/tty/serial/68328serial.c                   |   23 +-
6959  drivers/tty/serial/8250/8250.c                     |   80 +-
6960  drivers/tty/serial/8250/8250.h                     |   31 +-
6961  drivers/tty/serial/8250/8250_acorn.c               |   22 +-
6962  drivers/tty/serial/8250/8250_dw.c                  |   38 +-
6963  drivers/tty/serial/8250/8250_gsc.c                 |   26 +-
6964  drivers/tty/serial/8250/8250_hp300.c               |   26 +-
6965  drivers/tty/serial/8250/8250_pci.c                 |  134 +-
6966  drivers/tty/serial/8250/8250_pnp.c                 |   28 +-
6967  drivers/tty/serial/8250/serial_cs.c                |   30 +-
6968  drivers/tty/serial/Kconfig                         |   32 +-
6969  drivers/tty/serial/Makefile                        |    3 +-
6970  drivers/tty/serial/amba-pl011.c                    |   34 +-
6971  drivers/tty/serial/bfin_uart.c                     |    2 +-
6972  drivers/tty/serial/crisv10.c                       |   45 +-
6973  drivers/tty/serial/ifx6x60.c                       |    4 +-
6974  drivers/tty/serial/imx.c                           |    2 +-
6975  drivers/tty/serial/ioc4_serial.c                   |    2 +-
6976  drivers/tty/serial/jsm/jsm_tty.c                   |    8 +-
6977  drivers/tty/serial/lpc32xx_hs.c                    |  823 ++++++++
6978  drivers/tty/serial/max3107.c                       | 1215 -----------
6979  drivers/tty/serial/max3107.h                       |  441 ----
6980  drivers/tty/serial/max310x.c                       | 1259 ++++++++++++
6981  drivers/tty/serial/msm_smd_tty.c                   |    8 +-
6982  drivers/tty/serial/of_serial.c                     |   13 +-
6983  drivers/tty/serial/omap-serial.c                   |   35 +-
6984  drivers/tty/serial/pch_uart.c                      |    4 +
6985  drivers/tty/serial/pxa.c                           |   14 +
6986  drivers/tty/serial/samsung.c                       |   26 +-
6987  drivers/tty/serial/sc26xx.c                        |    1 +
6988  drivers/tty/serial/serial_core.c                   |   31 +-
6989  drivers/tty/synclink.c                             |   84 +-
6990  drivers/tty/synclink_gt.c                          |   35 +-
6991  drivers/tty/synclinkmp.c                           |   56 +-
6992  drivers/tty/tty_io.c                               |  309 +--
6993  drivers/tty/tty_ioctl.c                            |  100 +-
6994  drivers/tty/tty_ldisc.c                            |   78 +-
6995  drivers/tty/tty_mutex.c                            |   71 +-
6996  drivers/tty/tty_port.c                             |   70 +-
6997  drivers/tty/vt/keyboard.c                          |   50 +-
6998  drivers/tty/vt/vt.c                                |   63 +-
6999  drivers/usb/class/cdc-acm.c                        |    5 +-
7000  drivers/usb/gadget/u_serial.c                      |    3 +-
7001  drivers/usb/serial/ark3116.c                       |    4 +-
7002  drivers/usb/serial/belkin_sa.c                     |    2 +-
7003  drivers/usb/serial/console.c                       |    4 +-
7004  drivers/usb/serial/cp210x.c                        |    8 +-
7005  drivers/usb/serial/cypress_m8.c                    |   40 +-
7006  drivers/usb/serial/digi_acceleport.c               |   14 +-
7007  drivers/usb/serial/empeg.c                         |    2 +-
7008  drivers/usb/serial/f81232.c                        |    3 +-
7009  drivers/usb/serial/ftdi_sio.c                      |    2 +-
7010  drivers/usb/serial/io_edgeport.c                   |   12 +-
7011  drivers/usb/serial/io_ti.c                         |   12 +-
7012  drivers/usb/serial/ir-usb.c                        |    2 +-
7013  drivers/usb/serial/iuu_phoenix.c                   |   28 +-
7014  drivers/usb/serial/keyspan.c                       |    6 +-
7015  drivers/usb/serial/keyspan_pda.c                   |    4 +-
7016  drivers/usb/serial/kl5kusb105.c                    |   18 +-
7017  drivers/usb/serial/kobil_sct.c                     |   14 +-
7018  drivers/usb/serial/mct_u232.c                      |    4 +-
7019  drivers/usb/serial/metro-usb.c                     |    6 -
7020  drivers/usb/serial/mos7720.c                       |   14 +-
7021  drivers/usb/serial/mos7840.c                       |   12 +-
7022  drivers/usb/serial/oti6858.c                       |   10 +-
7023  drivers/usb/serial/pl2303.c                        |    6 +-
7024  drivers/usb/serial/quatech2.c                      |    4 +-
7025  drivers/usb/serial/sierra.c                        |    2 +-
7026  drivers/usb/serial/spcp8x5.c                       |   12 +-
7027  drivers/usb/serial/ssu100.c                        |    4 +-
7028  drivers/usb/serial/ti_usb_3410_5052.c              |   10 +-
7029  drivers/usb/serial/usb-serial.c                    |    7 +-
7030  drivers/usb/serial/usb_wwan.c                      |    2 +-
7031  drivers/usb/serial/whiteheat.c                     |    2 +-
7032  firmware/Makefile                                  |    1 -
7033  firmware/intelliport2.bin.ihex                     | 2147 --------------------
7034  include/linux/Kbuild                               |    3 -
7035  include/linux/cd1400.h                             |  292 ---
7036  include/linux/cdk.h                                |  486 -----
7037  include/linux/comstats.h                           |  119 --
7038  include/linux/generic_serial.h                     |   35 -
7039  include/linux/istallion.h                          |  123 --
7040  include/linux/kbd_kern.h                           |   13 -
7041  include/linux/platform_data/max310x.h              |   67 +
7042  include/linux/sc26198.h                            |  533 -----
7043  include/linux/serial167.h                          |  157 --
7044  include/linux/serial_8250.h                        |   33 +-
7045  include/linux/serial_core.h                        |    4 +-
7046  include/linux/stallion.h                           |  147 --
7047  include/linux/tty.h                                |   77 +-
7048  include/linux/tty_driver.h                         |   47 +-
7049  include/net/irda/ircomm_tty.h                      |   17 +-
7050  net/bluetooth/rfcomm/tty.c                         |   10 +-
7051  net/irda/ircomm/ircomm_param.c                     |    5 -
7052  net/irda/ircomm/ircomm_tty.c                       |  320 ++-
7053  net/irda/ircomm/ircomm_tty_attach.c                |   40 +-
7054  net/irda/ircomm/ircomm_tty_ioctl.c                 |   33 +-
7055  147 files changed, 4369 insertions(+), 7935 deletions(-)
7056  create mode 100644 Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt
7057  delete mode 100644 Documentation/serial/computone.txt
7058  create mode 100644 drivers/tty/serial/lpc32xx_hs.c
7059  delete mode 100644 drivers/tty/serial/max3107.c
7060  delete mode 100644 drivers/tty/serial/max3107.h
7061  create mode 100644 drivers/tty/serial/max310x.c
7062  delete mode 100644 firmware/intelliport2.bin.ihex
7063  delete mode 100644 include/linux/cd1400.h
7064  delete mode 100644 include/linux/cdk.h
7065  delete mode 100644 include/linux/comstats.h
7066  delete mode 100644 include/linux/generic_serial.h
7067  delete mode 100644 include/linux/istallion.h
7068  create mode 100644 include/linux/platform_data/max310x.h
7069  delete mode 100644 include/linux/sc26198.h
7070  delete mode 100644 include/linux/serial167.h
7071  delete mode 100644 include/linux/stallion.h
7072 Merging usb/usb-next (26f944b usb: hcd: use *resource_size_t* for specifying resource data)
7073 $ git merge usb/usb-next
7074 Auto-merging drivers/usb/serial/ftdi_sio.c
7075 Auto-merging drivers/usb/host/ehci-tegra.c
7076 Auto-merging drivers/usb/host/ehci-sead3.c
7077 Merge made by the 'recursive' strategy.
7078  .../devicetree/bindings/usb/platform-uhci.txt      |   12 ++
7079  Documentation/devicetree/bindings/usb/pxa-usb.txt  |   31 ++++
7080  .../devicetree/bindings/usb/vt8500-ehci.txt        |   12 ++
7081  Documentation/usb/persist.txt                      |    3 +
7082  arch/arm/mach-vt8500/bv07.c                        |    1 +
7083  arch/arm/mach-vt8500/devices-vt8500.c              |    5 +
7084  arch/arm/mach-vt8500/devices-wm8505.c              |    4 +
7085  arch/arm/mach-vt8500/devices.c                     |   11 ++
7086  arch/arm/mach-vt8500/devices.h                     |    1 +
7087  arch/arm/mach-vt8500/wm8505_7in.c                  |    1 +
7088  drivers/usb/atm/ueagle-atm.c                       |   79 ++++++++--
7089  drivers/usb/core/sysfs.c                           |    6 +-
7090  drivers/usb/gadget/s3c-hsotg.c                     |    3 +
7091  drivers/usb/host/Kconfig                           |   12 +-
7092  drivers/usb/host/ehci-atmel.c                      |   30 +---
7093  drivers/usb/host/ehci-au1xxx.c                     |   20 +--
7094  drivers/usb/host/ehci-cns3xxx.c                    |   16 +-
7095  drivers/usb/host/ehci-grlib.c                      |   18 +--
7096  drivers/usb/host/ehci-ixp4xx.c                     |   19 +--
7097  drivers/usb/host/ehci-ls1x.c                       |   18 +--
7098  drivers/usb/host/ehci-msm.c                        |   13 +-
7099  drivers/usb/host/ehci-mv.c                         |   51 ++-----
7100  drivers/usb/host/ehci-mxc.c                        |   45 ++----
7101  drivers/usb/host/ehci-platform.c                   |   50 ++++++-
7102  drivers/usb/host/ehci-ppc-of.c                     |   28 +---
7103  drivers/usb/host/ehci-s5p.c                        |    7 +-
7104  drivers/usb/host/ehci-sead3.c                      |   15 +-
7105  drivers/usb/host/ehci-sh.c                         |   35 +----
7106  drivers/usb/host/ehci-tegra.c                      |   40 ++---
7107  drivers/usb/host/ehci-vt8500.c                     |   24 ++-
7108  drivers/usb/host/ehci-xilinx-of.c                  |   20 +--
7109  drivers/usb/host/ohci-platform.c                   |   46 +++++-
7110  drivers/usb/host/ohci-pxa27x.c                     |   68 +++++++++
7111  drivers/usb/host/uhci-hcd.c                        |    5 +
7112  drivers/usb/host/uhci-platform.c                   |  157 ++++++++++++++++++++
7113  drivers/usb/host/whci/hcd.c                        |    8 +-
7114  drivers/usb/host/whci/qset.c                       |   11 +-
7115  drivers/usb/misc/legousbtower.c                    |    3 -
7116  drivers/usb/serial/ftdi_sio.c                      |    2 +-
7117  drivers/usb/storage/ene_ub6250.c                   |   28 +++-
7118  drivers/usb/wusbcore/security.c                    |    7 +-
7119  drivers/usb/wusbcore/wa-hc.c                       |    4 +-
7120  include/linux/usb/ehci_pdriver.h                   |    8 +
7121  include/linux/usb/hcd.h                            |    4 +-
7122  include/linux/usb/ohci_pdriver.h                   |    8 +
7123  45 files changed, 633 insertions(+), 356 deletions(-)
7124  create mode 100644 Documentation/devicetree/bindings/usb/platform-uhci.txt
7125  create mode 100644 Documentation/devicetree/bindings/usb/pxa-usb.txt
7126  create mode 100644 Documentation/devicetree/bindings/usb/vt8500-ehci.txt
7127  create mode 100644 drivers/usb/host/uhci-platform.c
7128 Merging staging/staging-next (1021bb5 Merge tag 'iio-for-v3.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
7129 $ git merge staging/staging-next
7130 Removing drivers/staging/zsmalloc/zsmalloc_int.h
7131 Auto-merging drivers/staging/serqt_usb2/serqt_usb2.c
7132 Auto-merging drivers/staging/iio/adc/ad7192.c
7133 Removing drivers/staging/csr/csr_formatted_io.h
7134 Removing drivers/staging/csr/csr_formatted_io.c
7135 Removing drivers/staging/comedi/drivers/adl_pci7432.c
7136 Removing drivers/staging/comedi/drivers/adl_pci7230.c
7137 Auto-merging drivers/staging/comedi/drivers.c
7138 Merge made by the 'recursive' strategy.
7139  .../bindings/staging/iio/adc/mxs-lradc.txt         |   15 +
7140  drivers/iio/adc/at91_adc.c                         |   42 +-
7141  drivers/staging/android/ashmem.c                   |   32 +-
7142  drivers/staging/android/logger.c                   |   40 +-
7143  drivers/staging/android/logger.h                   |   24 +-
7144  drivers/staging/android/timed_gpio.c               |   13 +-
7145  drivers/staging/asus_oled/asus_oled.c              |   21 +-
7146  drivers/staging/bcm/CmHost.c                       |   78 ++-
7147  drivers/staging/bcm/Misc.c                         |    5 +-
7148  drivers/staging/ccg/ccg.c                          |    2 +-
7149  drivers/staging/comedi/Kconfig                     |   25 +-
7150  drivers/staging/comedi/comedi_fops.c               |   37 +-
7151  drivers/staging/comedi/comedidev.h                 |    2 +-
7152  drivers/staging/comedi/drivers.c                   |   69 ++-
7153  drivers/staging/comedi/drivers/Makefile            |    3 +-
7154  drivers/staging/comedi/drivers/adl_pci6208.c       |  187 ++++---
7155  drivers/staging/comedi/drivers/adl_pci7230.c       |  190 -------
7156  drivers/staging/comedi/drivers/adl_pci7296.c       |  220 ++++----
7157  drivers/staging/comedi/drivers/adl_pci7432.c       |  200 -------
7158  drivers/staging/comedi/drivers/adl_pci7x3x.c       |  342 ++++++++++++
7159  drivers/staging/comedi/drivers/amplc_dio200.c      |   57 +-
7160  drivers/staging/comedi/drivers/amplc_pc236.c       |   64 ++-
7161  drivers/staging/comedi/drivers/amplc_pc263.c       |   52 +-
7162  drivers/staging/comedi/drivers/contec_pci_dio.c    |  146 ++---
7163  drivers/staging/comedi/drivers/dyna_pci10xx.c      |  161 ++----
7164  drivers/staging/comedi/drivers/ssv_dnp.c           |    5 +-
7165  drivers/staging/comedi/range.c                     |   16 +-
7166  drivers/staging/crystalhd/crystalhd_lnx.c          |    6 +-
7167  drivers/staging/csr/Makefile                       |    1 -
7168  drivers/staging/csr/bh.c                           |  173 +++---
7169  drivers/staging/csr/csr_formatted_io.c             |   27 -
7170  drivers/staging/csr/csr_formatted_io.h             |   25 -
7171  drivers/staging/csr/csr_panic.c                    |    1 -
7172  drivers/staging/csr/csr_time.c                     |   20 +-
7173  drivers/staging/csr/csr_wifi_hip_card_sdio.c       |    8 +-
7174  drivers/staging/csr/csr_wifi_hip_send.c            |    9 +-
7175  drivers/staging/csr/csr_wifi_hip_udi.c             |   94 ++--
7176  drivers/staging/csr/csr_wifi_hip_unifi.h           |    1 -
7177  drivers/staging/csr/drv.c                          |    3 +-
7178  drivers/staging/csr/firmware.c                     |    4 +-
7179  drivers/staging/csr/io.c                           |   32 +-
7180  drivers/staging/csr/monitor.c                      |    3 +-
7181  drivers/staging/csr/netdev.c                       |    3 +-
7182  drivers/staging/csr/sdio_mmc.c                     |   45 +-
7183  drivers/staging/csr/sme_native.c                   |    2 +-
7184  drivers/staging/csr/sme_sys.c                      |    2 +-
7185  drivers/staging/csr/sme_wext.c                     |    4 +-
7186  drivers/staging/csr/ul_int.c                       |    1 +
7187  drivers/staging/csr/unifi_pdu_processing.c         |    2 +-
7188  drivers/staging/csr/unifi_wext.h                   |    1 +
7189  drivers/staging/csr/wext_events.c                  |    8 +-
7190  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |   14 +-
7191  drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |    2 -
7192  drivers/staging/gdm72xx/gdm_wimax.c                |   16 +-
7193  drivers/staging/iio/Documentation/generic_buffer.c |   10 +
7194  drivers/staging/iio/accel/adis16201_core.c         |    2 +-
7195  drivers/staging/iio/accel/adis16203_core.c         |    2 +-
7196  drivers/staging/iio/accel/adis16204_core.c         |    2 +-
7197  drivers/staging/iio/accel/adis16209_core.c         |    2 +-
7198  drivers/staging/iio/accel/adis16220_core.c         |    9 +-
7199  drivers/staging/iio/accel/adis16240_core.c         |    2 +-
7200  drivers/staging/iio/accel/kxsd9.c                  |    2 +-
7201  drivers/staging/iio/accel/lis3l02dq_core.c         |    2 +-
7202  drivers/staging/iio/accel/sca3000_core.c           |    2 +-
7203  drivers/staging/iio/adc/Kconfig                    |   12 +
7204  drivers/staging/iio/adc/Makefile                   |    1 +
7205  drivers/staging/iio/adc/ad7192.c                   |    2 +-
7206  drivers/staging/iio/adc/ad7298_core.c              |    2 +-
7207  drivers/staging/iio/adc/ad7606.h                   |    2 +-
7208  drivers/staging/iio/adc/ad7606_core.c              |    6 +-
7209  drivers/staging/iio/adc/lpc32xx_adc.c              |    2 +-
7210  drivers/staging/iio/adc/max1363.h                  |    2 +-
7211  drivers/staging/iio/adc/max1363_core.c             |   26 +-
7212  drivers/staging/iio/adc/mxs-lradc.c                |  590 ++++++++++++++++++++
7213  drivers/staging/iio/adc/spear_adc.c                |    2 +-
7214  drivers/staging/iio/iio_hwmon.c                    |   12 +-
7215  drivers/staging/iio/iio_simple_dummy.c             |    2 +-
7216  drivers/staging/iio/impedance-analyzer/ad5933.c    |    2 +-
7217  drivers/staging/iio/imu/adis16400_core.c           |    6 +-
7218  drivers/staging/iio/meter/ade7758.h                |    2 +-
7219  drivers/staging/iio/meter/ade7758_core.c           |    2 +-
7220  drivers/staging/iio/resolver/ad2s1210.c            |    2 +-
7221  drivers/staging/ipack/bridges/tpci200.c            |   44 +-
7222  drivers/staging/line6/pcm.c                        |    8 +-
7223  drivers/staging/line6/variax.c                     |    8 +-
7224  drivers/staging/nvec/nvec.c                        |    9 +-
7225  drivers/staging/omapdrm/omap_crtc.c                |   10 +
7226  drivers/staging/omapdrm/omap_dmm_tiler.c           |   51 +-
7227  drivers/staging/omapdrm/omap_dmm_tiler.h           |   17 +-
7228  drivers/staging/omapdrm/omap_drv.c                 |   18 +-
7229  drivers/staging/omapdrm/omap_drv.h                 |   33 +-
7230  drivers/staging/omapdrm/omap_fb.c                  |   99 +++-
7231  drivers/staging/omapdrm/omap_gem.c                 |   43 +-
7232  drivers/staging/omapdrm/omap_plane.c               |  111 +++-
7233  drivers/staging/ozwpan/ozhcd.c                     |   89 ++-
7234  drivers/staging/ozwpan/ozmain.c                    |    2 +-
7235  drivers/staging/ozwpan/ozpd.c                      |    8 +-
7236  drivers/staging/ozwpan/ozpd.h                      |    1 +
7237  drivers/staging/ozwpan/ozproto.c                   |   13 +
7238  drivers/staging/ozwpan/ozproto.h                   |    8 +-
7239  drivers/staging/ozwpan/ozprotocol.h                |    6 +-
7240  drivers/staging/panel/panel.c                      |    4 +-
7241  drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    2 +-
7242  drivers/staging/rtl8187se/r8180_core.c             |    4 +-
7243  drivers/staging/rtl8187se/r8180_hw.h               |    9 +-
7244  drivers/staging/rtl8187se/r8185b_init.c            |    2 +-
7245  .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |    9 +-
7246  .../staging/rtl8192e/rtl8192e/r8192E_firmware.h    |    4 +
7247  drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |    3 +
7248  drivers/staging/rtl8192e/rtl8192e/rtl_dm.c         |    2 +-
7249  drivers/staging/rtl8192e/rtllib.h                  |    8 +-
7250  drivers/staging/rtl8192e/rtllib_softmac.c          |    4 +-
7251  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    4 +-
7252  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    4 +-
7253  .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |    2 +-
7254  drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h    |    4 +-
7255  .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    |    2 +-
7256  drivers/staging/rtl8192u/r819xU_HTType.h           |    2 +-
7257  drivers/staging/rtl8192u/r819xU_phyreg.h           |    2 +-
7258  drivers/staging/rtl8712/rtl8712_recv.h             |    2 +-
7259  drivers/staging/rts5139/trace.h                    |   32 +-
7260  drivers/staging/rts_pstor/trace.h                  |   30 +-
7261  drivers/staging/serqt_usb2/serqt_usb2.c            |    9 +-
7262  drivers/staging/speakup/i18n.c                     |    1 +
7263  .../staging/tidspbridge/Documentation/error-codes  |    2 +-
7264  drivers/staging/tidspbridge/core/_tiomap.h         |    2 +-
7265  drivers/staging/tidspbridge/core/chnl_sm.c         |    6 +-
7266  drivers/staging/tidspbridge/core/io_sm.c           |   10 +-
7267  drivers/staging/tidspbridge/core/sync.c            |    2 +-
7268  drivers/staging/tidspbridge/core/tiomap3430.c      |    4 +-
7269  drivers/staging/tidspbridge/core/tiomap3430_pwr.c  |    2 +-
7270  drivers/staging/tidspbridge/dynload/tramp.c        |    8 +-
7271  drivers/staging/tidspbridge/gen/uuidutil.c         |   21 -
7272  drivers/staging/tidspbridge/hw/hw_mmu.c            |    6 +-
7273  .../tidspbridge/include/dspbridge/dspioctl.h       |    2 +-
7274  .../staging/tidspbridge/include/dspbridge/mbx_sh.h |    2 +-
7275  .../staging/tidspbridge/include/dspbridge/node.h   |    2 +-
7276  .../staging/tidspbridge/include/dspbridge/ntfy.h   |    2 +-
7277  .../staging/tidspbridge/include/dspbridge/proc.h   |    2 +-
7278  .../staging/tidspbridge/include/dspbridge/strm.h   |    2 +-
7279  .../staging/tidspbridge/include/dspbridge/sync.h   |    4 +-
7280  .../tidspbridge/include/dspbridge/uuidutil.h       |   20 -
7281  drivers/staging/tidspbridge/rmgr/dbdcd.c           |    4 +-
7282  drivers/staging/tidspbridge/rmgr/drv_interface.c   |   14 +-
7283  drivers/staging/tidspbridge/rmgr/dspdrv.c          |    4 +-
7284  drivers/staging/tidspbridge/rmgr/mgr.c             |    4 +-
7285  drivers/staging/tidspbridge/rmgr/nldr.c            |    2 +-
7286  drivers/staging/tidspbridge/rmgr/node.c            |    2 +-
7287  drivers/staging/tidspbridge/rmgr/proc.c            |    2 +-
7288  drivers/staging/usbip/stub_rx.c                    |    2 +-
7289  drivers/staging/usbip/vhci_hcd.c                   |    4 +-
7290  drivers/staging/vme/devices/vme_user.c             |    8 +-
7291  drivers/staging/vt6655/ioctl.c                     |    7 +-
7292  drivers/staging/vt6656/hostap.c                    |   12 +-
7293  drivers/staging/vt6656/ioctl.c                     |    7 +-
7294  drivers/staging/vt6656/rf.c                        |    4 +-
7295  drivers/staging/vt6656/rxtx.c                      |    4 +-
7296  drivers/staging/vt6656/wcmd.c                      |    2 +-
7297  drivers/staging/vt6656/wmgr.c                      |    6 +-
7298  drivers/staging/wlan-ng/p80211wep.c                |   18 +-
7299  drivers/staging/xgifb/XGI_main_26.c                |   13 +-
7300  drivers/staging/xgifb/vb_init.c                    |    2 +-
7301  drivers/staging/zsmalloc/zsmalloc-main.c           |  322 +++++++++--
7302  drivers/staging/zsmalloc/zsmalloc_int.h            |  155 -----
7303  164 files changed, 2702 insertions(+), 1983 deletions(-)
7304  create mode 100644 Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
7305  delete mode 100644 drivers/staging/comedi/drivers/adl_pci7230.c
7306  delete mode 100644 drivers/staging/comedi/drivers/adl_pci7432.c
7307  create mode 100644 drivers/staging/comedi/drivers/adl_pci7x3x.c
7308  delete mode 100644 drivers/staging/csr/csr_formatted_io.c
7309  delete mode 100644 drivers/staging/csr/csr_formatted_io.h
7310  create mode 100644 drivers/staging/iio/adc/mxs-lradc.c
7311  delete mode 100644 drivers/staging/zsmalloc/zsmalloc_int.h
7312 Merging char-misc/char-misc-next (877cdf3 drivers/misc/ti-st: check chip_awake NULL check)
7313 $ git merge char-misc/char-misc-next
7314 Recorded preimage for 'drivers/misc/mei/interrupt.c'
7315 Auto-merging drivers/misc/mei/main.c
7316 Auto-merging drivers/misc/mei/interrupt.c
7317 CONFLICT (content): Merge conflict in drivers/misc/mei/interrupt.c
7318 Automatic merge failed; fix conflicts and then commit the result.
7319 $ git commit -v -a
7320 Recorded resolution for 'drivers/misc/mei/interrupt.c'.
7321 [master dc08adb] Merge remote-tracking branch 'char-misc/char-misc-next'
7322 $ git diff -M --stat --summary HEAD^..
7323  Documentation/devicetree/bindings/w1/w1-gpio.txt |   22 +++++
7324  drivers/char/tlclk.c                             |    4 +-
7325  drivers/misc/bmp085-i2c.c                        |    7 --
7326  drivers/misc/carma/carma-fpga-program.c          |    1 -
7327  drivers/misc/carma/carma-fpga.c                  |    2 +-
7328  drivers/misc/mei/hw.h                            |   79 ++++++++--------
7329  drivers/misc/mei/init.c                          |   93 ++++++++++--------
7330  drivers/misc/mei/interface.h                     |   10 +-
7331  drivers/misc/mei/interrupt.c                     |   35 ++++---
7332  drivers/misc/mei/iorw.c                          |   59 ++++++------
7333  drivers/misc/mei/main.c                          |   78 ++++++----------
7334  drivers/misc/mei/mei_dev.h                       |   57 ++++++-----
7335  drivers/misc/mei/wd.c                            |   91 +++++++++---------
7336  drivers/misc/pch_phub.c                          |   15 +--
7337  drivers/misc/ti-st/st_core.c                     |   12 ++-
7338  drivers/misc/ti-st/st_kim.c                      |  109 +++++++++-------------
7339  drivers/w1/masters/Kconfig                       |    1 -
7340  drivers/w1/masters/omap_hdq.c                    |   57 +++--------
7341  drivers/w1/masters/w1-gpio.c                     |   66 ++++++++++++-
7342  include/linux/ti_wilink_st.h                     |    3 +-
7343  include/linux/w1-gpio.h                          |    1 +
7344  21 files changed, 417 insertions(+), 385 deletions(-)
7345  create mode 100644 Documentation/devicetree/bindings/w1/w1-gpio.txt
7346 Merging tmem/linux-next (15773b6 Merge branch 'stable/for-linus-3.6' into linux-next)
7347 $ git merge tmem/linux-next
7348 Merge made by the 'recursive' strategy.
7349  mm/frontswap.c |    2 +-
7350  1 file changed, 1 insertion(+), 1 deletion(-)
7351 Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors)
7352 $ git merge writeback/writeback-for-next
7353 Already up-to-date.
7354 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
7355 $ git merge arm-dt/devicetree/arm-next
7356 Already up-to-date.
7357 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
7358 $ git merge hwspinlock/linux-next
7359 Already up-to-date.
7360 Merging pinctrl/for-next (f84b81f Merge branch 'devel' into for-next)
7361 $ git merge pinctrl/for-next
7362 Auto-merging arch/arm/Kconfig
7363 Merge made by the 'recursive' strategy.
7364  .../bindings/pinctrl/fsl,imx35-pinctrl.txt         |  984 ++++++++++++
7365  Documentation/pinctrl.txt                          |    6 +-
7366  arch/arm/Kconfig                                   |    1 +
7367  arch/arm/mach-nomadik/board-nhk8815.c              |   36 +
7368  arch/arm/mach-nomadik/cpu-8815.c                   |   13 +
7369  drivers/pinctrl/Kconfig                            |   16 +
7370  drivers/pinctrl/Makefile                           |    3 +
7371  drivers/pinctrl/core.c                             |   13 +-
7372  drivers/pinctrl/pinctrl-imx35.c                    | 1595 ++++++++++++++++++++
7373  drivers/pinctrl/pinctrl-imx51.c                    |  492 +++---
7374  drivers/pinctrl/pinctrl-imx53.c                    |  402 ++---
7375  drivers/pinctrl/pinctrl-nomadik-db8500.c           |    5 +-
7376  drivers/pinctrl/pinctrl-nomadik-db8540.c           |  999 ++++++++++++
7377  drivers/pinctrl/pinctrl-nomadik-stn8815.c          |  357 +++++
7378  drivers/pinctrl/pinctrl-nomadik.c                  |    7 +-
7379  drivers/pinctrl/pinctrl-nomadik.h                  |   27 +
7380  include/linux/pinctrl/consumer.h                   |    3 +-
7381  17 files changed, 4496 insertions(+), 463 deletions(-)
7382  create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx35-pinctrl.txt
7383  create mode 100644 drivers/pinctrl/pinctrl-imx35.c
7384  create mode 100644 drivers/pinctrl/pinctrl-nomadik-db8540.c
7385  create mode 100644 drivers/pinctrl/pinctrl-nomadik-stn8815.c
7386 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
7387 $ git merge vhost/linux-next
7388 Resolved 'drivers/net/tun.c' using previous resolution.
7389 Auto-merging drivers/net/tun.c
7390 CONFLICT (content): Merge conflict in drivers/net/tun.c
7391 Automatic merge failed; fix conflicts and then commit the result.
7392 $ git commit -v -a
7393 [master 2fa83fc] Merge remote-tracking branch 'vhost/linux-next'
7394 $ git diff -M --stat --summary HEAD^..
7395 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
7396 $ git merge memblock/memblock-kill-early_node_map
7397 Already up-to-date.
7398 Merging remoteproc/for-next (6bb697b MAINTAINERS: add remoteproc's git)
7399 $ git merge remoteproc/for-next
7400 Already up-to-date.
7401 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
7402 $ git merge irqdomain/irqdomain/next
7403 Already up-to-date.
7404 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
7405 $ git merge gpio/gpio/next
7406 Already up-to-date.
7407 Merging gpio-lw/for-next (a4b2b71 Merge branch 'devel' into for-next)
7408 $ git merge gpio-lw/for-next
7409 Merge made by the 'recursive' strategy.
7410  drivers/gpio/gpio-ml-ioh.c |   20 ++++-----
7411  drivers/gpio/gpio-pch.c    |   22 +++++-----
7412  drivers/gpio/gpiolib-of.c  |    2 +-
7413  drivers/gpio/gpiolib.c     |  102 ++++++++++++++++++++++++++++++++------------
7414  4 files changed, 95 insertions(+), 51 deletions(-)
7415 Merging arm-soc/for-next (e149302 Merge branch 'next/dt' into for-next)
7416 $ git merge arm-soc/for-next
7417 Resolved 'drivers/mtd/nand/Kconfig' using previous resolution.
7418 Auto-merging include/linux/platform_data/pinctrl-coh901.h
7419 Auto-merging include/linux/leds.h
7420 Auto-merging drivers/spi/spi-omap2-mcspi.c
7421 Auto-merging drivers/mtd/nand/pxa3xx_nand.c
7422 Auto-merging drivers/mtd/nand/Kconfig
7423 CONFLICT (content): Merge conflict in drivers/mtd/nand/Kconfig
7424 Auto-merging drivers/mmc/host/omap_hsmmc.c
7425 Auto-merging drivers/gpio/gpio-pxa.c
7426 Auto-merging arch/powerpc/sysdev/fsl_msi.c
7427 Removing arch/arm/mach-versatile/include/mach/io.h
7428 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
7429 Removing arch/arm/mach-u300/u300.c
7430 Removing arch/arm/mach-u300/include/mach/platform.h
7431 Removing arch/arm/mach-u300/include/mach/clkdev.h
7432 Auto-merging arch/arm/mach-u300/dma_channels.h
7433 Removing arch/arm/mach-tegra/include/mach/io.h
7434 Removing arch/arm/mach-shark/include/mach/io.h
7435 Removing arch/arm/mach-sa1100/leds.h
7436 Removing arch/arm/mach-sa1100/leds.c
7437 Removing arch/arm/mach-sa1100/leds-lart.c
7438 Removing arch/arm/mach-sa1100/leds-hackkit.c
7439 Removing arch/arm/mach-sa1100/leds-cerf.c
7440 Removing arch/arm/mach-sa1100/leds-badge4.c
7441 Removing arch/arm/mach-sa1100/leds-assabet.c
7442 Auto-merging arch/arm/mach-realview/realview_pbx.c
7443 Auto-merging arch/arm/mach-realview/realview_pba8.c
7444 Auto-merging arch/arm/mach-realview/realview_pb11mp.c
7445 Auto-merging arch/arm/mach-realview/realview_pb1176.c
7446 Auto-merging arch/arm/mach-realview/realview_eb.c
7447 Removing arch/arm/mach-pxa/leds.h
7448 Removing arch/arm/mach-pxa/leds.c
7449 Removing arch/arm/mach-pxa/leds-mainstone.c
7450 Removing arch/arm/mach-pxa/leds-lubbock.c
7451 Removing arch/arm/mach-pxa/leds-idp.c
7452 Removing arch/arm/mach-orion5x/include/mach/io.h
7453 Removing arch/arm/mach-omap1/leds.h
7454 Removing arch/arm/mach-omap1/leds.c
7455 Removing arch/arm/mach-omap1/leds-osk.c
7456 Removing arch/arm/mach-omap1/leds-innovator.c
7457 Removing arch/arm/mach-omap1/leds-h2p2-debug.c
7458 Removing arch/arm/mach-mv78xx0/include/mach/io.h
7459 Removing arch/arm/mach-ks8695/leds.c
7460 Removing arch/arm/mach-kirkwood/include/mach/io.h
7461 Removing arch/arm/mach-iop33x/include/mach/io.h
7462 Removing arch/arm/mach-iop32x/include/mach/io.h
7463 Removing arch/arm/mach-iop13xx/include/mach/io.h
7464 Removing arch/arm/mach-integrator/include/mach/io.h
7465 Removing arch/arm/mach-footbridge/netwinder-leds.c
7466 Removing arch/arm/mach-footbridge/ebsa285-leds.c
7467 Removing arch/arm/mach-dove/include/mach/io.h
7468 Removing arch/arm/mach-clps711x/p720t-leds.c
7469 Auto-merging arch/arm/mach-bcmring/include/mach/csp/tmrHw.h
7470 Auto-merging arch/arm/mach-bcmring/include/mach/csp/reg.h
7471 Auto-merging arch/arm/mach-bcmring/include/mach/csp/dmacHw.h
7472 Auto-merging arch/arm/mach-bcmring/include/mach/cfg_global.h
7473 Removing arch/arm/mach-bcmring/include/csp/string.h
7474 Removing arch/arm/mach-bcmring/include/csp/stdint.h
7475 Removing arch/arm/mach-bcmring/include/csp/secHw.h
7476 Removing arch/arm/mach-bcmring/include/csp/module.h
7477 Removing arch/arm/mach-bcmring/include/csp/intcHw.h
7478 Removing arch/arm/mach-bcmring/include/csp/errno.h
7479 Removing arch/arm/mach-bcmring/include/csp/delay.h
7480 Removing arch/arm/mach-bcmring/include/csp/cache.h
7481 Removing arch/arm/mach-bcmring/include/cfg_global.h
7482 Auto-merging arch/arm/mach-bcmring/arch.c
7483 Removing arch/arm/kernel/leds.c
7484 Auto-merging arch/arm/kernel/Makefile
7485 Removing arch/arm/include/asm/leds.h
7486 Auto-merging arch/arm/Kconfig
7487 Automatic merge failed; fix conflicts and then commit the result.
7488 $ git commit -v -a
7489 [master 842d6f6] Merge remote-tracking branch 'arm-soc/for-next'
7490 $ git diff -M --stat --summary HEAD^..
7491  Documentation/arm/Marvell/README                   |  232 ++++++++++++++++
7492  Documentation/arm/memory.txt                       |    3 +
7493  .../devicetree/bindings/arm/mrvl/tauros2.txt       |   17 ++
7494  .../devicetree/bindings/mtd/pxa3xx-nand.txt        |   31 +++
7495  Documentation/devicetree/bindings/rtc/pxa-rtc.txt  |   14 +
7496  arch/arm/Kconfig                                   |   67 +----
7497  arch/arm/arm-soc-for-next-contents.txt             |   40 +++
7498  arch/arm/boot/dts/am33xx.dtsi                      |    5 +
7499  arch/arm/boot/dts/kirkwood-iconnect.dts            |    6 +-
7500  arch/arm/boot/dts/mmp2.dtsi                        |    5 +
7501  arch/arm/boot/dts/pxa27x.dtsi                      |   14 +
7502  arch/arm/boot/dts/pxa2xx.dtsi                      |  132 +++++++++
7503  arch/arm/boot/dts/pxa3xx.dtsi                      |   32 +++
7504  arch/arm/boot/dts/pxa910.dtsi                      |    5 +
7505  arch/arm/boot/dts/twl6030.dtsi                     |    3 +
7506  arch/arm/configs/afeb9260_defconfig                |    1 -
7507  arch/arm/configs/at91rm9200_defconfig              |    2 +-
7508  arch/arm/configs/at91sam9261_defconfig             |    2 +-
7509  arch/arm/configs/at91sam9263_defconfig             |    3 +-
7510  arch/arm/configs/at91sam9g20_defconfig             |    2 +-
7511  arch/arm/configs/at91sam9rl_defconfig              |    2 +-
7512  arch/arm/configs/cpu9260_defconfig                 |    2 +-
7513  arch/arm/configs/cpu9g20_defconfig                 |    2 +-
7514  arch/arm/configs/qil-a9260_defconfig               |    3 +-
7515  arch/arm/configs/stamp9g20_defconfig               |    1 -
7516  arch/arm/configs/usb-a9260_defconfig               |    1 -
7517  arch/arm/include/asm/hardware/cache-tauros2.h      |    5 +-
7518  arch/arm/include/asm/hardware/iop3xx.h             |   12 +-
7519  arch/arm/include/asm/io.h                          |    8 +
7520  arch/arm/include/asm/leds.h                        |   50 ----
7521  arch/arm/include/asm/mach/map.h                    |    8 +
7522  arch/arm/include/asm/mach/pci.h                    |   13 +
7523  arch/arm/kernel/Makefile                           |    1 -
7524  arch/arm/kernel/bios32.c                           |   54 +++-
7525  arch/arm/kernel/leds.c                             |  121 --------
7526  arch/arm/kernel/process.c                          |    6 +-
7527  arch/arm/kernel/time.c                             |   17 --
7528  arch/arm/mach-at91/at91rm9200_devices.c            |   92 +++---
7529  arch/arm/mach-at91/at91sam9260_devices.c           |   84 +-----
7530  arch/arm/mach-at91/at91sam9261_devices.c           |   60 ++--
7531  arch/arm/mach-at91/at91sam9263.c                   |    4 +-
7532  arch/arm/mach-at91/at91sam9263_devices.c           |  161 ++++++-----
7533  arch/arm/mach-at91/at91sam9rl_devices.c            |   60 ++--
7534  arch/arm/mach-at91/board-afeb-9260v1.c             |   14 +-
7535  arch/arm/mach-at91/board-carmeva.c                 |   14 +-
7536  arch/arm/mach-at91/board-cpu9krea.c                |   17 +-
7537  arch/arm/mach-at91/board-cpuat91.c                 |   13 +-
7538  arch/arm/mach-at91/board-csb337.c                  |   16 +-
7539  arch/arm/mach-at91/board-eb9200.c                  |   14 +-
7540  arch/arm/mach-at91/board-ecbat91.c                 |   32 ++-
7541  arch/arm/mach-at91/board-eco920.c                  |   36 ++-
7542  arch/arm/mach-at91/board-flexibity.c               |   14 +-
7543  arch/arm/mach-at91/board-foxg20.c                  |   16 +-
7544  arch/arm/mach-at91/board-kafa.c                    |   17 +-
7545  arch/arm/mach-at91/board-kb9202.c                  |   37 ++-
7546  arch/arm/mach-at91/board-neocore926.c              |   13 +-
7547  arch/arm/mach-at91/board-picotux200.c              |   14 +-
7548  arch/arm/mach-at91/board-qil-a9260.c               |   14 +-
7549  arch/arm/mach-at91/board-rm9200dk.c                |   17 +-
7550  arch/arm/mach-at91/board-rm9200ek.c                |   17 +-
7551  arch/arm/mach-at91/board-rsi-ews.c                 |   16 +-
7552  arch/arm/mach-at91/board-sam9-l9260.c              |   39 ++-
7553  arch/arm/mach-at91/board-sam9260ek.c               |   16 +-
7554  arch/arm/mach-at91/board-sam9261ek.c               |   16 +-
7555  arch/arm/mach-at91/board-sam9263ek.c               |   13 +-
7556  arch/arm/mach-at91/board-sam9g20ek.c               |   16 +-
7557  arch/arm/mach-at91/board-sam9rlek.c                |   13 +-
7558  arch/arm/mach-at91/board-stamp9g20.c               |   14 -
7559  arch/arm/mach-at91/board-usb-a926x.c               |    2 -
7560  arch/arm/mach-at91/board-yl-9200.c                 |   16 +-
7561  arch/arm/mach-at91/include/mach/board.h            |    1 -
7562  arch/arm/mach-at91/leds.c                          |  105 -------
7563  arch/arm/mach-bcmring/arch.c                       |    2 +-
7564  arch/arm/mach-bcmring/core.c                       |    3 +-
7565  arch/arm/mach-bcmring/csp/chipc/chipcHw.c          |  137 ++++-----
7566  arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c     |   90 +++---
7567  arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c    |   19 +-
7568  arch/arm/mach-bcmring/csp/dmac/dmacHw.c            |   27 +-
7569  arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c      |    6 +-
7570  arch/arm/mach-bcmring/csp/tmr/tmrHw.c              |    6 +-
7571  arch/arm/mach-bcmring/include/cfg_global.h         |   13 -
7572  arch/arm/mach-bcmring/include/csp/cache.h          |   35 ---
7573  arch/arm/mach-bcmring/include/csp/delay.h          |   36 ---
7574  arch/arm/mach-bcmring/include/csp/errno.h          |   32 ---
7575  arch/arm/mach-bcmring/include/csp/intcHw.h         |   40 ---
7576  arch/arm/mach-bcmring/include/csp/module.h         |   32 ---
7577  arch/arm/mach-bcmring/include/csp/secHw.h          |   65 -----
7578  arch/arm/mach-bcmring/include/csp/stdint.h         |   30 --
7579  arch/arm/mach-bcmring/include/csp/string.h         |   34 ---
7580  .../{cfg_global_defines.h => mach/cfg_global.h}    |   11 +
7581  .../arm/mach-bcmring/include/mach/csp/cap_inline.h |    2 +-
7582  .../mach-bcmring/include/mach/csp/chipcHw_def.h    |    6 +-
7583  .../mach-bcmring/include/mach/csp/chipcHw_inline.h |  119 ++++----
7584  .../mach-bcmring/include/mach/csp/chipcHw_reg.h    |    6 +-
7585  arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h   |    6 +-
7586  .../mach-bcmring/include/{ => mach}/csp/dmacHw.h   |    4 +-
7587  .../mach-bcmring/include/mach/csp/dmacHw_priv.h    |    2 +-
7588  .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h |  106 +++----
7589  arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h    |    2 +-
7590  .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h |   18 +-
7591  arch/arm/mach-bcmring/include/mach/csp/mm_addr.h   |    2 +-
7592  arch/arm/mach-bcmring/include/mach/csp/mm_io.h     |    8 +-
7593  arch/arm/mach-bcmring/include/{ => mach}/csp/reg.h |   25 +-
7594  .../mach-bcmring/include/mach/csp/secHw_inline.h   |   10 +-
7595  .../mach-bcmring/include/{ => mach}/csp/tmrHw.h    |    2 +-
7596  arch/arm/mach-bcmring/include/mach/dma.h           |    2 +-
7597  arch/arm/mach-bcmring/include/mach/hardware.h      |    2 +-
7598  arch/arm/mach-bcmring/include/mach/reg_nand.h      |    2 +-
7599  arch/arm/mach-bcmring/include/mach/reg_umi.h       |    4 +-
7600  arch/arm/mach-bcmring/mm.c                         |    4 +-
7601  arch/arm/mach-bcmring/timer.c                      |    2 +-
7602  arch/arm/mach-clps711x/Makefile                    |    2 -
7603  arch/arm/mach-clps711x/common.c                    |    1 -
7604  arch/arm/mach-clps711x/p720t-leds.c                |   63 -----
7605  arch/arm/mach-clps711x/p720t.c                     |   62 +++++
7606  arch/arm/mach-dove/common.c                        |   15 +-
7607  arch/arm/mach-dove/include/mach/dove.h             |    8 +-
7608  arch/arm/mach-dove/include/mach/io.h               |   19 --
7609  arch/arm/mach-dove/pcie.c                          |   43 +--
7610  arch/arm/mach-ebsa110/Makefile                     |    4 +-
7611  arch/arm/mach-ebsa110/leds.c                       |   81 +++---
7612  arch/arm/mach-footbridge/Makefile                  |    4 -
7613  arch/arm/mach-footbridge/common.c                  |   12 +-
7614  arch/arm/mach-footbridge/dc21285.c                 |   16 +-
7615  arch/arm/mach-footbridge/ebsa285-leds.c            |  138 ---------
7616  arch/arm/mach-footbridge/ebsa285.c                 |   81 ++++++
7617  .../arm/mach-footbridge/include/mach/debug-macro.S |    3 +-
7618  arch/arm/mach-footbridge/include/mach/io.h         |   12 +-
7619  arch/arm/mach-footbridge/netwinder-hw.c            |  112 +++++++-
7620  arch/arm/mach-footbridge/netwinder-leds.c          |  138 ---------
7621  arch/arm/mach-integrator/Makefile                  |    3 +-
7622  arch/arm/mach-integrator/core.c                    |    3 -
7623  arch/arm/mach-integrator/include/mach/cm.h         |    2 +
7624  arch/arm/mach-integrator/include/mach/io.h         |   33 ---
7625  arch/arm/mach-integrator/include/mach/platform.h   |    4 +
7626  arch/arm/mach-integrator/integrator_ap.c           |    9 +-
7627  arch/arm/mach-integrator/leds.c                    |  161 ++++++-----
7628  arch/arm/mach-integrator/pci_v3.c                  |   50 ++--
7629  arch/arm/mach-iop13xx/include/mach/io.h            |   28 --
7630  arch/arm/mach-iop13xx/include/mach/iop13xx.h       |   28 +-
7631  arch/arm/mach-iop13xx/io.c                         |   27 --
7632  arch/arm/mach-iop13xx/pci.c                        |   37 +--
7633  arch/arm/mach-iop13xx/setup.c                      |   10 -
7634  arch/arm/mach-iop32x/include/mach/io.h             |   19 --
7635  arch/arm/mach-iop33x/include/mach/io.h             |   19 --
7636  arch/arm/mach-kirkwood/Makefile.boot               |    3 +-
7637  arch/arm/mach-kirkwood/common.c                    |   14 +-
7638  arch/arm/mach-kirkwood/include/mach/io.h           |   24 --
7639  arch/arm/mach-kirkwood/include/mach/kirkwood.h     |    8 +-
7640  arch/arm/mach-kirkwood/pcie.c                      |   44 +--
7641  arch/arm/mach-ks8695/Makefile                      |    3 -
7642  arch/arm/mach-ks8695/devices.c                     |   21 --
7643  arch/arm/mach-ks8695/include/mach/devices.h        |    5 -
7644  arch/arm/mach-ks8695/leds.c                        |   92 ------
7645  arch/arm/mach-mmp/mmp2.c                           |    2 +-
7646  arch/arm/mach-mmp/pxa910.c                         |    4 +
7647  arch/arm/mach-mmp/ttc_dkb.c                        |   10 +
7648  arch/arm/mach-mv78xx0/addr-map.c                   |    5 +-
7649  arch/arm/mach-mv78xx0/common.c                     |   11 +-
7650  arch/arm/mach-mv78xx0/include/mach/io.h            |   24 --
7651  arch/arm/mach-mv78xx0/include/mach/mv78xx0.h       |   21 +-
7652  arch/arm/mach-mv78xx0/pcie.c                       |  110 +++-----
7653  arch/arm/mach-omap1/Makefile                       |    8 -
7654  arch/arm/mach-omap1/board-h2.c                     |   32 +++
7655  arch/arm/mach-omap1/board-h3.c                     |   32 +++
7656  arch/arm/mach-omap1/board-osk.c                    |   33 +++
7657  arch/arm/mach-omap1/leds-h2p2-debug.c              |  166 -----------
7658  arch/arm/mach-omap1/leds-innovator.c               |   98 -------
7659  arch/arm/mach-omap1/leds-osk.c                     |  113 --------
7660  arch/arm/mach-omap1/leds.c                         |   69 -----
7661  arch/arm/mach-omap1/leds.h                         |    3 -
7662  arch/arm/mach-omap1/time.c                         |    1 -
7663  arch/arm/mach-omap1/timer32k.c                     |    1 -
7664  arch/arm/mach-omap2/Kconfig                        |    1 +
7665  arch/arm/mach-omap2/board-igep0020.c               |    2 +
7666  arch/arm/mach-omap2/board-omap3evm.c               |    1 +
7667  arch/arm/mach-omap2/common-board-devices.c         |   11 -
7668  arch/arm/mach-omap2/common-board-devices.h         |    1 -
7669  arch/arm/mach-omap2/mux.h                          |    1 -
7670  arch/arm/mach-omap2/opp4xxx_data.c                 |    2 +-
7671  arch/arm/mach-omap2/pm34xx.c                       |   19 +-
7672  arch/arm/mach-omap2/sleep44xx.S                    |    8 +-
7673  arch/arm/mach-omap2/twl-common.c                   |    1 +
7674  arch/arm/mach-orion5x/common.c                     |   13 +-
7675  arch/arm/mach-orion5x/include/mach/io.h            |   22 --
7676  arch/arm/mach-orion5x/include/mach/orion5x.h       |   20 +-
7677  arch/arm/mach-orion5x/pci.c                        |   56 ++--
7678  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    1 -
7679  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    1 -
7680  arch/arm/mach-orion5x/rd88f5182-setup.c            |   72 ++---
7681  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    1 -
7682  arch/arm/mach-pnx4008/time.c                       |    1 -
7683  arch/arm/mach-pxa/Kconfig                          |   12 +
7684  arch/arm/mach-pxa/Makefile                         |   11 +-
7685  arch/arm/mach-pxa/clock-pxa3xx.c                   |    8 +-
7686  arch/arm/mach-pxa/idp.c                            |   81 ++++++
7687  arch/arm/mach-pxa/irq.c                            |  131 +++++++--
7688  arch/arm/mach-pxa/leds-idp.c                       |  115 --------
7689  arch/arm/mach-pxa/leds-lubbock.c                   |  124 ---------
7690  arch/arm/mach-pxa/leds-mainstone.c                 |  119 --------
7691  arch/arm/mach-pxa/leds.c                           |   32 ---
7692  arch/arm/mach-pxa/leds.h                           |   13 -
7693  arch/arm/mach-pxa/lubbock.c                        |   95 +++++++
7694  arch/arm/mach-pxa/mainstone.c                      |   94 +++++++
7695  arch/arm/mach-pxa/pxa-dt.c                         |   63 +++++
7696  arch/arm/mach-pxa/pxa3xx.c                         |   21 +-
7697  arch/arm/mach-realview/core.c                      |   39 ---
7698  arch/arm/mach-realview/core.h                      |    2 -
7699  arch/arm/mach-realview/realview_eb.c               |    5 -
7700  arch/arm/mach-realview/realview_pb1176.c           |    5 -
7701  arch/arm/mach-realview/realview_pb11mp.c           |    5 -
7702  arch/arm/mach-realview/realview_pba8.c             |    5 -
7703  arch/arm/mach-realview/realview_pbx.c              |    5 -
7704  arch/arm/mach-sa1100/Makefile                      |    9 -
7705  arch/arm/mach-sa1100/assabet.c                     |   85 ++++++
7706  arch/arm/mach-sa1100/badge4.c                      |   30 ++
7707  arch/arm/mach-sa1100/cerf.c                        |   42 +++
7708  arch/arm/mach-sa1100/hackkit.c                     |   32 +++
7709  arch/arm/mach-sa1100/lart.c                        |   26 ++
7710  arch/arm/mach-sa1100/leds-assabet.c                |  113 --------
7711  arch/arm/mach-sa1100/leds-badge4.c                 |  110 --------
7712  arch/arm/mach-sa1100/leds-cerf.c                   |  110 --------
7713  arch/arm/mach-sa1100/leds-hackkit.c                |  112 --------
7714  arch/arm/mach-sa1100/leds-lart.c                   |  101 -------
7715  arch/arm/mach-sa1100/leds.c                        |   50 ----
7716  arch/arm/mach-sa1100/leds.h                        |   13 -
7717  arch/arm/mach-shark/Makefile                       |    4 +-
7718  arch/arm/mach-shark/core.c                         |   19 --
7719  arch/arm/mach-shark/include/mach/debug-macro.S     |    7 +-
7720  arch/arm/mach-shark/include/mach/entry-macro.S     |    3 +-
7721  arch/arm/mach-shark/include/mach/io.h              |   18 --
7722  arch/arm/mach-shark/leds.c                         |  220 ++++++---------
7723  arch/arm/mach-shark/pci.c                          |    5 +
7724  arch/arm/mach-tegra/include/mach/io.h              |   46 ---
7725  arch/arm/mach-tegra/include/mach/iomap.h           |    3 +
7726  arch/arm/mach-tegra/pcie.c                         |   95 ++-----
7727  arch/arm/mach-u300/Kconfig                         |   43 +--
7728  arch/arm/mach-u300/Makefile                        |    1 -
7729  arch/arm/mach-u300/core.c                          |  100 ++-----
7730  .../mach-u300/{include/mach => }/dma_channels.h    |   11 +-
7731  arch/arm/mach-u300/i2c.c                           |    6 +-
7732  arch/arm/mach-u300/include/mach/clkdev.h           |    7 -
7733  arch/arm/mach-u300/include/mach/irqs.h             |   36 +--
7734  arch/arm/mach-u300/include/mach/platform.h         |   20 --
7735  arch/arm/mach-u300/include/mach/syscon.h           |   32 +--
7736  arch/arm/mach-u300/include/mach/u300-regs.h        |   19 +-
7737  arch/arm/mach-u300/spi.c                           |    2 +-
7738  arch/arm/mach-u300/timer.c                         |    5 +-
7739  arch/arm/mach-u300/timer.h                         |    1 +
7740  arch/arm/mach-u300/u300-gpio.h                     |   46 +--
7741  arch/arm/mach-u300/u300.c                          |   57 ----
7742  arch/arm/mach-ux500/cache-l2x0.c                   |    2 +-
7743  arch/arm/mach-ux500/cpu-db8500.c                   |    2 +-
7744  arch/arm/mach-ux500/cpu.c                          |    2 +-
7745  arch/arm/mach-ux500/include/mach/id.h              |   44 +--
7746  arch/arm/mach-ux500/platsmp.c                      |    2 +-
7747  arch/arm/mach-versatile/core.c                     |   10 -
7748  arch/arm/mach-versatile/include/mach/hardware.h    |    1 -
7749  arch/arm/mach-versatile/include/mach/io.h          |   27 --
7750  arch/arm/mach-versatile/pci.c                      |   22 +-
7751  arch/arm/mm/cache-l2x0.c                           |    2 +-
7752  arch/arm/mm/cache-tauros2.c                        |   83 ++++--
7753  arch/arm/mm/ioremap.c                              |   14 +
7754  arch/arm/mm/mmu.c                                  |   54 +++-
7755  arch/arm/plat-iop/pci.c                            |   25 +-
7756  arch/arm/plat-iop/setup.c                          |    5 -
7757  arch/arm/plat-omap/Kconfig                         |    3 +-
7758  arch/arm/plat-omap/debug-leds.c                    |  293 +++++---------------
7759  arch/arm/plat-omap/dmtimer.c                       |    6 +-
7760  arch/arm/plat-omap/include/plat/cpu.h              |    3 +-
7761  arch/arm/plat-omap/include/plat/multi.h            |    9 +
7762  arch/arm/plat-omap/include/plat/uncompress.h       |    4 +-
7763  arch/arm/plat-orion/common.c                       |    8 +-
7764  arch/arm/plat-orion/include/plat/common.h          |    6 +-
7765  arch/arm/plat-samsung/time.c                       |    1 -
7766  arch/arm/plat-versatile/Kconfig                    |    4 +-
7767  arch/arm/plat-versatile/leds.c                     |    8 +-
7768  arch/powerpc/platforms/83xx/suspend.c              |    2 +-
7769  arch/powerpc/platforms/cell/celleb_pci.c           |    2 +-
7770  arch/powerpc/sysdev/fsl_msi.c                      |    8 +-
7771  drivers/char/nwflash.c                             |   34 ---
7772  drivers/cpufreq/omap-cpufreq.c                     |    4 +-
7773  drivers/gpio/gpio-mpc8xxx.c                        |    2 +-
7774  drivers/gpio/gpio-omap.c                           |    8 +-
7775  drivers/gpio/gpio-pxa.c                            |   77 ++---
7776  drivers/i2c/busses/i2c-iop3xx.c                    |  121 ++++----
7777  drivers/i2c/busses/i2c-mpc.c                       |   12 +-
7778  drivers/i2c/busses/i2c-omap.c                      |    3 +-
7779  drivers/leds/Kconfig                               |   10 +
7780  drivers/leds/Makefile                              |    1 +
7781  drivers/leds/ledtrig-cpu.c                         |  163 +++++++++++
7782  drivers/macintosh/mediabay.c                       |    8 +-
7783  drivers/mfd/da9052-i2c.c                           |    4 +-
7784  drivers/mmc/host/omap_hsmmc.c                      |    2 +-
7785  drivers/mtd/nand/bcm_umi_nand.c                    |   12 +-
7786  drivers/mtd/nand/nand_bcm_umi.h                    |   73 +++--
7787  drivers/mtd/nand/pxa3xx_nand.c                     |   85 +++++-
7788  drivers/net/can/mscan/mpc5xxx_can.c                |    4 +-
7789  drivers/pinctrl/pinctrl-coh901.c                   |  220 +++------------
7790  drivers/rtc/rtc-pxa.c                              |   11 +
7791  drivers/spi/spi-imx.c                              |    2 +-
7792  drivers/spi/spi-omap2-mcspi.c                      |    2 +-
7793  drivers/tty/serial/mpc52xx_uart.c                  |    2 +-
7794  drivers/watchdog/mpc8xxx_wdt.c                     |    2 +-
7795  include/linux/atmel_tc.h                           |    2 +-
7796  include/linux/leds.h                               |   16 ++
7797  include/linux/mod_devicetable.h                    |    2 +-
7798  include/linux/mv643xx_eth.h                        |    2 +
7799  .../linux/platform_data/pinctrl-coh901.h           |   13 +-
7800  309 files changed, 3739 insertions(+), 5789 deletions(-)
7801  create mode 100644 Documentation/arm/Marvell/README
7802  create mode 100644 Documentation/devicetree/bindings/arm/mrvl/tauros2.txt
7803  create mode 100644 Documentation/devicetree/bindings/mtd/pxa3xx-nand.txt
7804  create mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt
7805  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
7806  create mode 100644 arch/arm/boot/dts/pxa27x.dtsi
7807  create mode 100644 arch/arm/boot/dts/pxa2xx.dtsi
7808  create mode 100644 arch/arm/boot/dts/pxa3xx.dtsi
7809  delete mode 100644 arch/arm/include/asm/leds.h
7810  delete mode 100644 arch/arm/kernel/leds.c
7811  delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
7812  delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
7813  delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
7814  delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
7815  delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
7816  delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
7817  delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
7818  delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
7819  delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
7820  rename arch/arm/mach-bcmring/include/{cfg_global_defines.h => mach/cfg_global.h} (74%)
7821  rename arch/arm/mach-bcmring/include/{ => mach}/csp/dmacHw.h (99%)
7822  rename arch/arm/mach-bcmring/include/{ => mach}/csp/reg.h (81%)
7823  rename arch/arm/mach-bcmring/include/{ => mach}/csp/tmrHw.h (99%)
7824  delete mode 100644 arch/arm/mach-clps711x/p720t-leds.c
7825  delete mode 100644 arch/arm/mach-dove/include/mach/io.h
7826  delete mode 100644 arch/arm/mach-footbridge/ebsa285-leds.c
7827  delete mode 100644 arch/arm/mach-footbridge/netwinder-leds.c
7828  delete mode 100644 arch/arm/mach-integrator/include/mach/io.h
7829  delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h
7830  delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h
7831  delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h
7832  delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h
7833  delete mode 100644 arch/arm/mach-ks8695/leds.c
7834  delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h
7835  delete mode 100644 arch/arm/mach-omap1/leds-h2p2-debug.c
7836  delete mode 100644 arch/arm/mach-omap1/leds-innovator.c
7837  delete mode 100644 arch/arm/mach-omap1/leds-osk.c
7838  delete mode 100644 arch/arm/mach-omap1/leds.c
7839  delete mode 100644 arch/arm/mach-omap1/leds.h
7840  delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
7841  delete mode 100644 arch/arm/mach-pxa/leds-idp.c
7842  delete mode 100644 arch/arm/mach-pxa/leds-lubbock.c
7843  delete mode 100644 arch/arm/mach-pxa/leds-mainstone.c
7844  delete mode 100644 arch/arm/mach-pxa/leds.c
7845  delete mode 100644 arch/arm/mach-pxa/leds.h
7846  create mode 100644 arch/arm/mach-pxa/pxa-dt.c
7847  delete mode 100644 arch/arm/mach-sa1100/leds-assabet.c
7848  delete mode 100644 arch/arm/mach-sa1100/leds-badge4.c
7849  delete mode 100644 arch/arm/mach-sa1100/leds-cerf.c
7850  delete mode 100644 arch/arm/mach-sa1100/leds-hackkit.c
7851  delete mode 100644 arch/arm/mach-sa1100/leds-lart.c
7852  delete mode 100644 arch/arm/mach-sa1100/leds.c
7853  delete mode 100644 arch/arm/mach-sa1100/leds.h
7854  delete mode 100644 arch/arm/mach-shark/include/mach/io.h
7855  delete mode 100644 arch/arm/mach-tegra/include/mach/io.h
7856  rename arch/arm/mach-u300/{include/mach => }/dma_channels.h (88%)
7857  delete mode 100644 arch/arm/mach-u300/include/mach/clkdev.h
7858  delete mode 100644 arch/arm/mach-u300/include/mach/platform.h
7859  create mode 100644 arch/arm/mach-u300/timer.h
7860  delete mode 100644 arch/arm/mach-u300/u300.c
7861  delete mode 100644 arch/arm/mach-versatile/include/mach/io.h
7862  create mode 100644 drivers/leds/ledtrig-cpu.c
7863  rename arch/arm/mach-u300/include/mach/gpio-u300.h => include/linux/platform_data/pinctrl-coh901.h (72%)
7864 Merging ep93xx/ep93xx-for-next (fbad878 Merge branch 'ep93xx-cleanup' into ep93xx-for-next)
7865 $ git merge ep93xx/ep93xx-for-next
7866 Already up-to-date!
7867 Merge made by the 'recursive' strategy.
7868 Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-board)
7869 $ git merge renesas/next
7870 Already up-to-date.
7871 Merging samsung/for-next (c1f9bee Merge branch 'next/board-samsung' into for-next)
7872 $ git merge samsung/for-next
7873 Auto-merging include/video/samsung_fimd.h
7874 Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
7875 Auto-merging arch/arm/plat-samsung/devs.c
7876 Merge made by the 'recursive' strategy.
7877  arch/arm/mach-exynos/clock-exynos5.c               |    9 --
7878  arch/arm/mach-exynos/include/mach/map.h            |    1 -
7879  arch/arm/mach-exynos/mach-nuri.c                   |    2 +-
7880  arch/arm/mach-exynos/mach-origen.c                 |    9 +-
7881  arch/arm/mach-exynos/mach-smdk4x12.c               |    2 +-
7882  arch/arm/mach-exynos/mach-smdkv310.c               |    9 +-
7883  arch/arm/mach-exynos/mach-universal_c210.c         |    2 +-
7884  arch/arm/mach-exynos/setup-fimd0.c                 |    2 +-
7885  arch/arm/mach-s3c24xx/include/mach/dma.h           |    3 +-
7886  arch/arm/mach-s3c24xx/mach-smdk2416.c              |    2 +-
7887  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +-
7888  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |   36 ++++-
7889  arch/arm/mach-s3c64xx/mach-crag6410.c              |   14 +-
7890  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +-
7891  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +-
7892  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +-
7893  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +-
7894  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +-
7895  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +-
7896  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +-
7897  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    2 +-
7898  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    2 +-
7899  arch/arm/mach-s5pc100/mach-smdkc100.c              |    2 +-
7900  arch/arm/mach-s5pv210/mach-aquila.c                |    2 +-
7901  arch/arm/mach-s5pv210/mach-goni.c                  |    2 +-
7902  arch/arm/mach-s5pv210/mach-smdkv210.c              |    2 +-
7903  arch/arm/plat-s3c24xx/dma.c                        |    2 +-
7904  arch/arm/plat-samsung/devs.c                       |   29 +++-
7905  arch/arm/plat-samsung/include/plat/hdmi.h          |   16 ++
7906  arch/arm/plat-samsung/include/plat/regs-fb-v4.h    |  159 --------------------
7907  arch/arm/plat-samsung/pm.c                         |    2 +-
7908  drivers/gpu/drm/exynos/exynos_drm_fimd.c           |    2 +-
7909  drivers/video/s3c-fb.c                             |    2 +-
7910  .../plat/regs-fb.h => include/video/samsung_fimd.h |  152 +++++++++++++++++--
7911  34 files changed, 270 insertions(+), 213 deletions(-)
7912  create mode 100644 arch/arm/plat-samsung/include/plat/hdmi.h
7913  delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
7914  rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
7915 Merging tegra/for-next (782bbe1 Merge branch 'for-3.7/defconfig' into for-next)
7916 $ git merge tegra/for-next
7917 Removing arch/arm/mach-tegra/tegra2_clocks.c
7918 Removing arch/arm/mach-tegra/board-trimslice.h
7919 Removing arch/arm/mach-tegra/board-trimslice.c
7920 Removing arch/arm/mach-tegra/board-trimslice-pinmux.c
7921 Removing arch/arm/mach-tegra/board-paz00-pinmux.c
7922 Removing arch/arm/boot/dts/tegra30-cardhu.dts
7923 Auto-merging arch/arm/Kconfig
7924 Merge made by the 'recursive' strategy.
7925  arch/arm/Kconfig                             |    1 +
7926  arch/arm/boot/dts/tegra20-paz00.dts          |  173 ++
7927  arch/arm/boot/dts/tegra20-seaboard.dts       |  184 ++
7928  arch/arm/boot/dts/tegra20-ventana.dts        |  204 ++
7929  arch/arm/boot/dts/tegra20-whistler.dts       |  293 +++
7930  arch/arm/boot/dts/tegra30-cardhu-a02.dts     |   87 +
7931  arch/arm/boot/dts/tegra30-cardhu-a04.dts     |   98 +
7932  arch/arm/boot/dts/tegra30-cardhu.dts         |  171 --
7933  arch/arm/boot/dts/tegra30-cardhu.dtsi        |  473 +++++
7934  arch/arm/configs/tegra_defconfig             |   16 +-
7935  arch/arm/mach-tegra/Kconfig                  |   13 -
7936  arch/arm/mach-tegra/Makefile                 |   12 +-
7937  arch/arm/mach-tegra/Makefile.boot            |    3 +-
7938  arch/arm/mach-tegra/apbio.c                  |    4 +-
7939  arch/arm/mach-tegra/board-dt-tegra20.c       |   11 +-
7940  arch/arm/mach-tegra/board-paz00-pinmux.c     |  156 --
7941  arch/arm/mach-tegra/board-paz00.c            |  192 --
7942  arch/arm/mach-tegra/board-paz00.h            |   17 +-
7943  arch/arm/mach-tegra/board-trimslice-pinmux.c |  155 --
7944  arch/arm/mach-tegra/board-trimslice.c        |  183 --
7945  arch/arm/mach-tegra/board-trimslice.h        |   30 -
7946  arch/arm/mach-tegra/clock.c                  |  574 +-----
7947  arch/arm/mach-tegra/clock.h                  |   40 +-
7948  arch/arm/mach-tegra/common.c                 |    4 +-
7949  arch/arm/mach-tegra/fuse.c                   |    4 +-
7950  arch/arm/mach-tegra/headsmp.S                |    6 +-
7951  arch/arm/mach-tegra/hotplug.c                |  118 +-
7952  arch/arm/mach-tegra/include/mach/clk.h       |    3 +
7953  arch/arm/mach-tegra/platsmp.c                |   29 +-
7954  arch/arm/mach-tegra/sleep-t20.S              |   82 +
7955  arch/arm/mach-tegra/sleep-t30.S              |  107 ++
7956  arch/arm/mach-tegra/sleep.S                  |   33 +-
7957  arch/arm/mach-tegra/sleep.h                  |   85 +
7958  arch/arm/mach-tegra/tegra20_clocks.c         | 1596 ++++++++++++++++
7959  arch/arm/mach-tegra/tegra20_clocks.h         |   41 +
7960  arch/arm/mach-tegra/tegra20_clocks_data.c    | 1111 +++++++++++
7961  arch/arm/mach-tegra/tegra2_clocks.c          | 2484 -------------------------
7962  arch/arm/mach-tegra/tegra30_clocks.c         | 2581 +++++++++-----------------
7963  arch/arm/mach-tegra/tegra30_clocks.h         |   53 +
7964  arch/arm/mach-tegra/tegra30_clocks_data.c    | 1378 ++++++++++++++
7965  arch/arm/mach-tegra/tegra_cpu_car.h          |   87 +
7966  drivers/i2c/busses/i2c-tegra.c               |   46 +-
7967  42 files changed, 7080 insertions(+), 5858 deletions(-)
7968  create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a02.dts
7969  create mode 100644 arch/arm/boot/dts/tegra30-cardhu-a04.dts
7970  delete mode 100644 arch/arm/boot/dts/tegra30-cardhu.dts
7971  create mode 100644 arch/arm/boot/dts/tegra30-cardhu.dtsi
7972  delete mode 100644 arch/arm/mach-tegra/board-paz00-pinmux.c
7973  delete mode 100644 arch/arm/mach-tegra/board-trimslice-pinmux.c
7974  delete mode 100644 arch/arm/mach-tegra/board-trimslice.c
7975  delete mode 100644 arch/arm/mach-tegra/board-trimslice.h
7976  create mode 100644 arch/arm/mach-tegra/sleep-t20.S
7977  create mode 100644 arch/arm/mach-tegra/sleep-t30.S
7978  create mode 100644 arch/arm/mach-tegra/sleep.h
7979  create mode 100644 arch/arm/mach-tegra/tegra20_clocks.c
7980  create mode 100644 arch/arm/mach-tegra/tegra20_clocks.h
7981  create mode 100644 arch/arm/mach-tegra/tegra20_clocks_data.c
7982  delete mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
7983  create mode 100644 arch/arm/mach-tegra/tegra30_clocks.h
7984  create mode 100644 arch/arm/mach-tegra/tegra30_clocks_data.c
7985  create mode 100644 arch/arm/mach-tegra/tegra_cpu_car.h
7986 Merging kvmtool/master (5237deb kvm tools: Fix segfault on "lkvm run")
7987 $ git merge kvmtool/master
7988 Merge made by the 'recursive' strategy.
7989  tools/kvm/builtin-run.c  |    7 ++++---
7990  tools/kvm/net/uip/dhcp.c |    3 +--
7991  tools/kvm/virtio/net.c   |    3 +--
7992  3 files changed, 6 insertions(+), 7 deletions(-)
7993 Merging dma-mapping/dma-mapping-next (d9e0d14 ARM: dma-mapping: fix incorrect freeing of atomic allocations)
7994 $ git merge dma-mapping/dma-mapping-next
7995 Already up-to-date.
7996 Merging pwm/for-next (026b4d7 pwm: core: Fix coding style issues)
7997 $ git merge pwm/for-next
7998 Merge made by the 'recursive' strategy.
7999  Documentation/driver-model/devres.txt |    4 ++
8000  Documentation/pwm.txt                 |    3 +-
8001  drivers/pwm/core.c                    |   92 ++++++++++++++++++++++++++++++---
8002  drivers/pwm/pwm-samsung.c             |    1 +
8003  drivers/pwm/pwm-tegra.c               |    4 +-
8004  drivers/pwm/pwm-tiecap.c              |    4 +-
8005  drivers/pwm/pwm-tiehrpwm.c            |    4 +-
8006  drivers/pwm/pwm-vt8500.c              |    2 +-
8007  include/linux/pwm.h                   |   26 ++++++++++
8008  9 files changed, 123 insertions(+), 17 deletions(-)
8009 Merging dma-buf/for-next (42a579a Merge branches 'timers-urgent-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
8010 $ git merge dma-buf/for-next
8011 Already up-to-date.
8012 Merging userns/for-next (898132a ipv6: move dereference after check in fl_free())
8013 $ git merge userns/for-next
8014 Auto-merging net/sctp/proc.c
8015 Auto-merging net/packet/af_packet.c
8016 Auto-merging net/key/af_key.c
8017 Auto-merging net/ipv6/tcp_ipv6.c
8018 Auto-merging net/ipv4/udp.c
8019 Auto-merging net/ipv4/tcp_ipv4.c
8020 Auto-merging net/core/sock.c
8021 Auto-merging net/core/scm.c
8022 Auto-merging net/core/dev.c
8023 Auto-merging init/Kconfig
8024 Auto-merging include/net/tcp.h
8025 Auto-merging include/net/sock.h
8026 Auto-merging include/net/ipv6.h
8027 Auto-merging drivers/net/tun.c
8028 Merge made by the 'recursive' strategy.
8029  drivers/net/tun.c             |   46 +++++++++++++++++++++++++++------------
8030  drivers/net/wireless/airo.c   |   48 ++++++++++++++++++++++++-----------------
8031  fs/namei.c                    |    6 +++---
8032  fs/seq_file.c                 |    4 ++++
8033  include/linux/inet_diag.h     |    1 +
8034  include/linux/netlink.h       |    1 +
8035  include/linux/seq_file.h      |   14 ++++++++++++
8036  include/net/ax25.h            |    4 ++--
8037  include/net/ipv6.h            |    5 ++++-
8038  include/net/netns/ipv4.h      |    3 ++-
8039  include/net/sch_generic.h     |    3 ++-
8040  include/net/sock.h            |   11 +++++++++-
8041  include/net/tcp.h             |    3 ++-
8042  init/Kconfig                  |   19 ----------------
8043  kernel/pid.c                  |    1 +
8044  kernel/pid_namespace.c        |    2 ++
8045  net/appletalk/atalk_proc.c    |    3 ++-
8046  net/ax25/ax25_uid.c           |   21 ++++++++++++------
8047  net/core/dev.c                |    7 +++---
8048  net/core/scm.c                |   31 +++++++++++++++++++-------
8049  net/core/sock.c               |   10 ++++-----
8050  net/ipv4/inet_diag.c          |   21 ++++++++++++------
8051  net/ipv4/ping.c               |   22 ++++++++-----------
8052  net/ipv4/raw.c                |    4 +++-
8053  net/ipv4/sysctl_net_ipv4.c    |   42 +++++++++++++++++++++++-------------
8054  net/ipv4/tcp_ipv4.c           |    6 +++---
8055  net/ipv4/udp.c                |    4 +++-
8056  net/ipv4/udp_diag.c           |    5 ++++-
8057  net/ipv6/ip6_flowlabel.c      |   47 ++++++++++++++++++++++++++++++++++------
8058  net/ipv6/raw.c                |    3 ++-
8059  net/ipv6/tcp_ipv6.c           |    6 +++---
8060  net/ipv6/udp.c                |    3 ++-
8061  net/ipx/ipx_proc.c            |    3 ++-
8062  net/key/af_key.c              |    2 +-
8063  net/llc/llc_proc.c            |    2 +-
8064  net/netfilter/nfnetlink_log.c |   14 ++++++++----
8065  net/netfilter/xt_LOG.c        |   16 ++++++++------
8066  net/netfilter/xt_owner.c      |   30 ++++++++++++++++++++------
8067  net/netfilter/xt_recent.c     |   13 +++++++++--
8068  net/netlink/af_netlink.c      |    6 ++++--
8069  net/packet/af_packet.c        |    2 +-
8070  net/phonet/socket.c           |    6 ++++--
8071  net/sched/cls_api.c           |    2 +-
8072  net/sched/cls_basic.c         |    3 ++-
8073  net/sched/cls_cgroup.c        |    3 ++-
8074  net/sched/cls_flow.c          |   19 +++++++++++-----
8075  net/sched/cls_fw.c            |    3 ++-
8076  net/sched/cls_route.c         |    3 ++-
8077  net/sched/cls_rsvp.h          |    3 ++-
8078  net/sched/cls_tcindex.c       |    3 ++-
8079  net/sched/cls_u32.c           |    3 ++-
8080  net/sctp/proc.c               |    6 ++++--
8081  52 files changed, 368 insertions(+), 180 deletions(-)
8082 Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
8083 $ git merge ktest/for-next
8084 Already up-to-date.
8085 Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics into C function")
8086 $ git merge signal/from-sfr
8087 Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
8088 Resolved 'arch/powerpc/kernel/entry_64.S' using previous resolution.
8089 Resolved 'arch/x86/kernel/signal.c' using previous resolution.
8090 Auto-merging kernel/timer.c
8091 Auto-merging kernel/sched/core.c
8092 Auto-merging arch/xtensa/kernel/signal.c
8093 Auto-merging arch/x86/kernel/vm86_32.c
8094 Auto-merging arch/x86/kernel/signal.c
8095 CONFLICT (content): Merge conflict in arch/x86/kernel/signal.c
8096 Auto-merging arch/x86/kernel/process.c
8097 Auto-merging arch/x86/include/asm/thread_info.h
8098 Auto-merging arch/sh/kernel/cpu/sh5/entry.S
8099 Auto-merging arch/s390/include/asm/thread_info.h
8100 Auto-merging arch/powerpc/kernel/entry_64.S
8101 CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S
8102 Auto-merging arch/powerpc/include/asm/thread_info.h
8103 Auto-merging arch/mn10300/kernel/signal.c
8104 Auto-merging arch/mn10300/include/asm/thread_info.h
8105 Auto-merging arch/mips/kernel/scall64-o32.S
8106 Auto-merging arch/mips/kernel/scall64-n32.S
8107 Auto-merging arch/mips/kernel/scall64-64.S
8108 Auto-merging arch/mips/kernel/scall32-o32.S
8109 Auto-merging arch/mips/include/asm/thread_info.h
8110 Auto-merging arch/m32r/kernel/signal.c
8111 Auto-merging arch/h8300/kernel/signal.c
8112 Auto-merging arch/frv/kernel/signal.c
8113 Auto-merging arch/avr32/kernel/signal.c
8114 Auto-merging arch/arm/kernel/signal.c
8115 Auto-merging arch/arm/include/asm/thread_info.h
8116 CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
8117 Automatic merge failed; fix conflicts and then commit the result.
8118 $ git commit -v -a
8119 [master a4a565f] Merge branch 'signal/from-sfr'
8120 $ git diff -M --stat --summary HEAD^..
8121  arch/alpha/include/asm/ptrace.h           |    5 +-
8122  arch/alpha/include/asm/thread_info.h      |    3 +-
8123  arch/alpha/kernel/alpha_ksyms.c           |    1 -
8124  arch/alpha/kernel/entry.S                 |  161 -----------------------------
8125  arch/alpha/kernel/osf_sys.c               |   49 +++++++++
8126  arch/alpha/kernel/process.c               |   29 ++++++
8127  arch/alpha/kernel/systbls.S               |    2 +-
8128  arch/arm/include/asm/thread_info.h        |    2 -
8129  arch/arm/kernel/signal.c                  |    1 -
8130  arch/avr32/include/asm/thread_info.h      |   17 +--
8131  arch/avr32/kernel/signal.c                |    1 -
8132  arch/blackfin/include/asm/thread_info.h   |    4 -
8133  arch/blackfin/kernel/signal.c             |    1 -
8134  arch/c6x/include/asm/thread_info.h        |    1 -
8135  arch/c6x/kernel/asm-offsets.c             |    1 -
8136  arch/cris/include/asm/thread_info.h       |    3 -
8137  arch/frv/include/asm/thread_info.h        |    3 -
8138  arch/frv/kernel/signal.c                  |    9 --
8139  arch/h8300/include/asm/thread_info.h      |    7 +-
8140  arch/h8300/kernel/signal.c                |    1 -
8141  arch/hexagon/include/asm/thread_info.h    |    5 -
8142  arch/hexagon/kernel/signal.c              |    1 -
8143  arch/ia64/include/asm/thread_info.h       |    2 -
8144  arch/ia64/kernel/signal.c                 |    8 --
8145  arch/m32r/include/asm/thread_info.h       |    9 +-
8146  arch/m32r/kernel/signal.c                 |    3 -
8147  arch/microblaze/include/asm/thread_info.h |    3 +-
8148  arch/microblaze/kernel/entry-nommu.S      |   21 +++-
8149  arch/microblaze/kernel/entry.S            |   62 ++++++-----
8150  arch/microblaze/kernel/signal.c           |   16 +--
8151  arch/mips/include/asm/thread_info.h       |    9 +-
8152  arch/mips/kernel/entry.S                  |   15 ++-
8153  arch/mips/kernel/scall32-o32.S            |   13 +--
8154  arch/mips/kernel/scall64-64.S             |   13 +--
8155  arch/mips/kernel/scall64-n32.S            |   13 +--
8156  arch/mips/kernel/scall64-o32.S            |   13 +--
8157  arch/mips/kernel/signal.c                 |    8 --
8158  arch/mn10300/include/asm/thread_info.h    |    3 +-
8159  arch/mn10300/kernel/entry.S               |    4 +
8160  arch/mn10300/kernel/signal.c              |    9 --
8161  arch/openrisc/include/asm/thread_info.h   |    3 +-
8162  arch/parisc/hpux/gate.S                   |    2 +-
8163  arch/parisc/include/asm/thread_info.h     |    5 +-
8164  arch/parisc/kernel/signal.c               |   45 +++-----
8165  arch/parisc/kernel/syscall.S              |    9 +-
8166  arch/powerpc/include/asm/thread_info.h    |    2 +
8167  arch/powerpc/kernel/signal_32.c           |    1 -
8168  arch/s390/include/asm/thread_info.h       |    4 -
8169  arch/score/include/asm/thread_info.h      |    4 -
8170  arch/score/kernel/signal.c                |    1 +
8171  arch/sh/include/asm/thread_info.h         |    3 +
8172  arch/sh/kernel/cpu/sh5/entry.S            |    2 +-
8173  arch/sh/kernel/entry-common.S             |    2 +-
8174  arch/sh/kernel/signal_32.c                |    1 -
8175  arch/sh/kernel/signal_64.c                |    1 -
8176  arch/sparc/include/asm/thread_info_32.h   |    3 +-
8177  arch/sparc/include/asm/thread_info_64.h   |    3 +
8178  arch/tile/kernel/compat_signal.c          |    9 --
8179  arch/tile/kernel/signal.c                 |   12 +--
8180  arch/um/include/asm/thread_info.h         |    3 -
8181  arch/unicore32/include/asm/thread_info.h  |    4 +-
8182  arch/unicore32/kernel/entry.S             |    2 -
8183  arch/unicore32/kernel/signal.c            |    1 -
8184  arch/x86/include/asm/thread_info.h        |    2 -
8185  arch/x86/kernel/entry_32.S                |   17 ++-
8186  arch/x86/kernel/process.c                 |    2 +-
8187  arch/x86/kernel/signal.c                  |    4 -
8188  arch/x86/kernel/vm86_32.c                 |    2 +-
8189  arch/xtensa/include/asm/thread_info.h     |    5 -
8190  arch/xtensa/kernel/signal.c               |    4 -
8191  kernel/sched/core.c                       |    2 +-
8192  kernel/timer.c                            |    9 --
8193  72 files changed, 227 insertions(+), 473 deletions(-)
8194 Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK)
8195 $ git merge clk/clk-next
8196 Already up-to-date.
8197 Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
8198 $ git merge random/dev
8199 Already up-to-date.
8200 Merging scsi-post-merge/merge-base:master ()
8201 $ git clone -s -l -n -q . ../rebase-tmp
8202 $ cd ../rebase-tmp
8203 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
8204 From ../next
8205  * [new branch]      akpm/master -> akpm
8206 $ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
8207 From ../next
8208  * [new branch]      akpm/base  -> akpm-base
8209 $ git checkout akpm
8210 Switched to branch 'akpm'
8211 $ git rebase --onto master akpm-base
8212 First, rewinding head to replay your work on top of it...
8213 Applying: cs5535-clockevt: typo, it's MFGPT, not MFPGT
8214 Applying: mm: change nr_ptes BUG_ON to WARN_ON
8215 Applying: Documentation: update mount option in filesystem/vfat.txt
8216 Applying: cciss: fix incorrect scsi status reporting
8217 Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
8218 Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
8219 Applying: acpi_memhotplug.c: remove memory info from list before freeing it
8220 Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
8221 Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
8222 Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
8223 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
8224 Applying: arch/x86/include/asm/spinlock.h: fix comment
8225 Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
8226 Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
8227 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
8228 Applying: timeconst.pl: remove deprecated defined(@array)
8229 Applying: time: don't inline EXPORT_SYMBOL functions
8230 Applying: thermal: add generic cpufreq cooling implementation
8231 Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory
8232 Applying: thermal: exynos5: add exynos5 thermal sensor driver support
8233 Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer
8234 Applying: ARM: exynos: add thermal sensor driver platform data support
8235 Applying: drivers/scsi/atp870u.c: fix bad use of udelay
8236 Applying: vfs: increment iversion when a file is truncated
8237 Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems
8238 Applying: mm/slab: remove duplicate check
8239 Applying: mm: remove __GFP_NO_KSWAPD
8240 Applying: mm: remove __GFP_NO_KSWAPD fixes
8241 Applying: remove-__gfp_no_kswapd-fixes-fix
8242 Applying: x86, pat: remove the dependency on 'vm_pgoff' in track/untrack pfn vma routines
8243 Applying: x86, pat: separate the pfn attribute tracking for remap_pfn_range and vm_insert_pfn
8244 Applying: x86-pat-separate-the-pfn-attribute-tracking-for-remap_pfn_range-and-vm_insert_pfn-fix
8245 Applying: mm, x86, pat: rework linear pfn-mmap tracking
8246 Applying: mm: introduce arch-specific vma flag VM_ARCH_1
8247 Applying: mm: kill vma flag VM_INSERTPAGE
8248 Applying: mm: kill vma flag VM_CAN_NONLINEAR
8249 Applying: mm: use mm->exe_file instead of first VM_EXECUTABLE vma->vm_file
8250 Applying: mm: kill vma flag VM_EXECUTABLE and mm->num_exe_file_vmas
8251 Applying: mm: prepare VM_DONTDUMP for using in drivers
8252 Applying: mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
8253 Applying: mm-kill-vma-flag-vm_reserved-and-mm-reserved_vm-counter-fix
8254 Applying: frv: kill used but uninitialized variable
8255 Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
8256 Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
8257 Applying: rbtree: empty nodes have no color
8258 Applying: rbtree-empty-nodes-have-no-color-fix
8259 Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
8260 Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
8261 Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
8262 Applying: rbtree: performance and correctness test
8263 Applying: rbtree-performance-and-correctness-test-fix
8264 Applying: rbtree: break out of rb_insert_color loop after tree rotation
8265 Applying: rbtree: adjust root color in rb_insert_color() only when necessary
8266 Applying: rbtree: low level optimizations in rb_insert_color()
8267 Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
8268 Applying: rbtree: optimize case selection logic in __rb_erase_color()
8269 Applying: rbtree: low level optimizations in __rb_erase_color()
8270 Applying: rbtree: coding style adjustments
8271 Applying: rbtree: rb_erase updates and comments
8272 Applying: rbtree: optimize fetching of sibling node
8273 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
8274 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
8275 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
8276 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
8277 Applying: fat (exportfs): move NFS support code
8278 Applying: fat (exportfs): fix dentry reconnection
8279 Applying: ipc/sem.c: alternatives to preempt_disable()
8280 $ cd ../next
8281 $ git fetch -f ../rebase-tmp akpm:akpm/master
8282 From ../rebase-tmp
8283  + d85532ea...a96005b akpm       -> akpm/master  (forced update)
8284 $ rm -rf ../rebase-tmp
8285 Merging akpm/master (a96005b ipc/sem.c: alternatives to preempt_disable())
8286 $ git merge --no-ff akpm/master
8287 Auto-merging include/linux/platform_data/exynos_thermal.h
8288 Removing drivers/hwmon/exynos4_tmu.c
8289 Auto-merging Documentation/thermal/exynos_thermal
8290 Merge made by the 'recursive' strategy.
8291  Documentation/filesystems/vfat.txt                 |   11 +
8292  Documentation/thermal/cpu-cooling-api.txt          |   60 ++
8293  .../{hwmon/exynos4_tmu => thermal/exynos_thermal}  |   35 +-
8294  Documentation/vm/unevictable-lru.txt               |    4 +-
8295  arch/alpha/kernel/pci-sysfs.c                      |    2 +-
8296  arch/frv/kernel/pm.c                               |   19 +-
8297  arch/ia64/kernel/perfmon.c                         |    2 +-
8298  arch/ia64/mm/init.c                                |    3 +-
8299  arch/mn10300/Makefile                              |    2 +-
8300  arch/powerpc/kvm/book3s_hv.c                       |    2 +-
8301  arch/powerpc/oprofile/cell/spu_task_sync.c         |   15 +-
8302  arch/sparc/kernel/pci.c                            |    2 +-
8303  arch/tile/mm/elf.c                                 |   19 +-
8304  arch/unicore32/kernel/process.c                    |    2 +-
8305  arch/x86/include/asm/spinlock.h                    |    3 +-
8306  arch/x86/mm/pat.c                                  |   87 +-
8307  arch/x86/platform/iris/iris.c                      |   67 +-
8308  arch/x86/xen/mmu.c                                 |    3 +-
8309  drivers/acpi/acpi_memhotplug.c                     |  123 ++-
8310  drivers/block/cciss_scsi.c                         |   11 +-
8311  drivers/char/mbcs.c                                |    2 +-
8312  drivers/char/mem.c                                 |    2 +-
8313  drivers/char/mspec.c                               |    2 +-
8314  drivers/clocksource/cs5535-clockevt.c              |    4 +-
8315  drivers/dma/dmaengine.c                            |    2 +-
8316  drivers/firmware/dmi_scan.c                        |   78 +-
8317  drivers/gpu/drm/drm_gem.c                          |    2 +-
8318  drivers/gpu/drm/drm_vm.c                           |   10 +-
8319  drivers/gpu/drm/exynos/exynos_drm_gem.c            |    2 +-
8320  drivers/gpu/drm/gma500/framebuffer.c               |    3 +-
8321  drivers/gpu/drm/ttm/ttm_bo_vm.c                    |    4 +-
8322  drivers/gpu/drm/udl/udl_fb.c                       |    2 +-
8323  drivers/hwmon/Kconfig                              |   10 -
8324  drivers/hwmon/Makefile                             |    1 -
8325  drivers/hwmon/exynos4_tmu.c                        |  518 -----------
8326  drivers/infiniband/hw/ehca/ehca_uverbs.c           |    4 +-
8327  drivers/infiniband/hw/ipath/ipath_file_ops.c       |    2 +-
8328  drivers/infiniband/hw/qib/qib_file_ops.c           |    2 +-
8329  drivers/media/video/meye.c                         |    2 +-
8330  drivers/media/video/omap/omap_vout.c               |    2 +-
8331  drivers/media/video/sn9c102/sn9c102_core.c         |    3 +-
8332  drivers/media/video/usbvision/usbvision-video.c    |    3 +-
8333  drivers/media/video/videobuf-dma-sg.c              |    2 +-
8334  drivers/media/video/videobuf-vmalloc.c             |    2 +-
8335  drivers/media/video/videobuf2-memops.c             |    2 +-
8336  drivers/media/video/vino.c                         |    2 +-
8337  drivers/misc/carma/carma-fpga.c                    |    2 -
8338  drivers/misc/sgi-gru/grufile.c                     |    5 +-
8339  drivers/mtd/mtdchar.c                              |    2 +-
8340  drivers/mtd/mtdcore.c                              |    6 +-
8341  drivers/oprofile/buffer_sync.c                     |   17 +-
8342  drivers/pcmcia/cs.c                                |   37 +-
8343  drivers/scsi/atp870u.c                             |   11 +-
8344  drivers/scsi/sg.c                                  |    2 +-
8345  drivers/staging/android/ashmem.c                   |    1 -
8346  drivers/staging/omapdrm/omap_gem_dmabuf.c          |    2 +-
8347  drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +-
8348  drivers/thermal/Kconfig                            |   20 +
8349  drivers/thermal/Makefile                           |    4 +-
8350  drivers/thermal/cpu_cooling.c                      |  483 ++++++++++
8351  drivers/thermal/exynos_thermal.c                   |  960 ++++++++++++++++++++
8352  drivers/uio/uio.c                                  |    4 +-
8353  drivers/usb/mon/mon_bin.c                          |    2 +-
8354  drivers/vfio/pci/vfio_pci.c                        |    2 +-
8355  drivers/video/68328fb.c                            |    2 +-
8356  drivers/video/aty/atyfb_base.c                     |    3 +-
8357  drivers/video/fb-puv3.c                            |    3 +-
8358  drivers/video/fb_defio.c                           |    2 +-
8359  drivers/video/fbmem.c                              |    3 +-
8360  drivers/video/gbefb.c                              |    2 +-
8361  drivers/video/omap2/omapfb/omapfb-main.c           |    2 +-
8362  drivers/video/sbuslib.c                            |    5 +-
8363  drivers/video/smscufx.c                            |    1 -
8364  drivers/video/udlfb.c                              |    1 -
8365  drivers/video/vermilion/vermilion.c                |    1 -
8366  drivers/video/vfb.c                                |    1 -
8367  drivers/xen/gntalloc.c                             |    2 +-
8368  drivers/xen/gntdev.c                               |    2 +-
8369  drivers/xen/privcmd.c                              |    3 +-
8370  fs/9p/v9fs.c                                       |    5 +
8371  fs/9p/vfs_file.c                                   |    1 +
8372  fs/adfs/super.c                                    |    5 +
8373  fs/affs/super.c                                    |    5 +
8374  fs/afs/super.c                                     |    5 +
8375  fs/attr.c                                          |    5 +
8376  fs/befs/linuxvfs.c                                 |    5 +
8377  fs/bfs/inode.c                                     |    5 +
8378  fs/binfmt_elf.c                                    |    4 +-
8379  fs/binfmt_elf_fdpic.c                              |    2 +-
8380  fs/btrfs/extent_io.c                               |    6 +
8381  fs/btrfs/file.c                                    |    2 +-
8382  fs/btrfs/inode.c                                   |    5 +
8383  fs/ceph/addr.c                                     |    2 +-
8384  fs/ceph/super.c                                    |    5 +
8385  fs/cifs/cifsfs.c                                   |    5 +
8386  fs/cifs/file.c                                     |    1 +
8387  fs/coda/inode.c                                    |    5 +
8388  fs/ecryptfs/main.c                                 |    6 +
8389  fs/efs/super.c                                     |    5 +
8390  fs/exofs/super.c                                   |    5 +
8391  fs/ext2/super.c                                    |    5 +
8392  fs/ext3/super.c                                    |    5 +
8393  fs/ext4/file.c                                     |    2 +-
8394  fs/ext4/super.c                                    |    5 +
8395  fs/fat/Makefile                                    |    2 +-
8396  fs/fat/dir.c                                       |   20 +-
8397  fs/fat/fat.h                                       |   23 +-
8398  fs/fat/inode.c                                     |  178 ++--
8399  fs/fat/namei_msdos.c                               |    5 +-
8400  fs/fat/namei_vfat.c                                |    5 +-
8401  fs/fat/nfs.c                                       |  101 ++
8402  fs/freevxfs/vxfs_super.c                           |    5 +
8403  fs/fuse/file.c                                     |    1 +
8404  fs/fuse/inode.c                                    |    6 +
8405  fs/gfs2/file.c                                     |    2 +-
8406  fs/hfs/super.c                                     |    6 +
8407  fs/hfsplus/super.c                                 |    6 +
8408  fs/hpfs/super.c                                    |    5 +
8409  fs/hugetlbfs/inode.c                               |    7 +-
8410  fs/isofs/inode.c                                   |    5 +
8411  fs/jffs2/readinode.c                               |   13 +-
8412  fs/jffs2/super.c                                   |    6 +
8413  fs/jfs/super.c                                     |    6 +
8414  fs/logfs/inode.c                                   |    5 +
8415  fs/minix/inode.c                                   |    5 +
8416  fs/ncpfs/inode.c                                   |    5 +
8417  fs/nfs/file.c                                      |    1 +
8418  fs/nfs/inode.c                                     |    5 +
8419  fs/nilfs2/file.c                                   |    2 +-
8420  fs/nilfs2/super.c                                  |    6 +
8421  fs/ntfs/super.c                                    |    6 +
8422  fs/ocfs2/dlmfs/dlmfs.c                             |    5 +
8423  fs/ocfs2/mmap.c                                    |    2 +-
8424  fs/ocfs2/super.c                                   |    5 +
8425  fs/openpromfs/inode.c                              |    5 +
8426  fs/proc/proc_sysctl.c                              |    5 +-
8427  fs/proc/task_mmu.c                                 |    2 +-
8428  fs/qnx4/inode.c                                    |    5 +
8429  fs/qnx6/inode.c                                    |    5 +
8430  fs/reiserfs/super.c                                |    5 +
8431  fs/romfs/super.c                                   |    5 +
8432  fs/squashfs/super.c                                |    5 +
8433  fs/super.c                                         |    6 -
8434  fs/sysv/inode.c                                    |    5 +
8435  fs/ubifs/file.c                                    |    1 +
8436  fs/ubifs/super.c                                   |    6 +
8437  fs/udf/super.c                                     |    5 +
8438  fs/ufs/super.c                                     |    5 +
8439  fs/xfs/xfs_file.c                                  |    2 +-
8440  fs/xfs/xfs_super.c                                 |    5 +
8441  include/asm-generic/pgtable.h                      |   57 +-
8442  include/linux/cpu_cooling.h                        |   99 ++
8443  include/linux/fs.h                                 |    2 +
8444  include/linux/gfp.h                                |    5 +-
8445  include/linux/mempolicy.h                          |    2 +-
8446  include/linux/mm.h                                 |   69 +-
8447  include/linux/mm_types.h                           |    2 -
8448  include/linux/mman.h                               |    1 -
8449  .../{exynos4_tmu.h => exynos_thermal.h}            |   31 +-
8450  include/linux/rbtree.h                             |  112 +--
8451  include/linux/timerqueue.h                         |    2 +-
8452  include/trace/events/gfpflags.h                    |    1 -
8453  ipc/mqueue.c                                       |    3 -
8454  ipc/sem.c                                          |  250 +++--
8455  kernel/auditsc.c                                   |   13 +-
8456  kernel/events/core.c                               |    2 +-
8457  kernel/fork.c                                      |   24 +-
8458  kernel/time.c                                      |    4 +-
8459  kernel/timeconst.pl                                |    2 +-
8460  lib/Kconfig.debug                                  |    7 +
8461  lib/Makefile                                       |    2 +
8462  lib/rbtree.c                                       |  597 +++++++-----
8463  lib/rbtree_test.c                                  |  135 +++
8464  mm/filemap.c                                       |    2 +-
8465  mm/filemap_xip.c                                   |    3 +-
8466  mm/fremap.c                                        |   14 +-
8467  mm/huge_memory.c                                   |   22 +-
8468  mm/ksm.c                                           |    8 +-
8469  mm/madvise.c                                       |    8 +-
8470  mm/memory.c                                        |   62 +-
8471  mm/mlock.c                                         |    2 +-
8472  mm/mmap.c                                          |   34 +-
8473  mm/nommu.c                                         |   21 +-
8474  mm/page_alloc.c                                    |   10 +-
8475  mm/shmem.c                                         |    3 +-
8476  mm/vmalloc.c                                       |    3 +-
8477  net/ceph/osd_client.c                              |    1 -
8478  security/selinux/selinuxfs.c                       |    2 +-
8479  security/tomoyo/util.c                             |    9 +-
8480  sound/core/pcm_native.c                            |    6 +-
8481  sound/usb/usx2y/us122l.c                           |    2 +-
8482  sound/usb/usx2y/usX2Yhwdep.c                       |    2 +-
8483  sound/usb/usx2y/usx2yhwdeppcm.c                    |    2 +-
8484  193 files changed, 3400 insertions(+), 1600 deletions(-)
8485  create mode 100644 Documentation/thermal/cpu-cooling-api.txt
8486  rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
8487  delete mode 100644 drivers/hwmon/exynos4_tmu.c
8488  create mode 100644 drivers/thermal/cpu_cooling.c
8489  create mode 100644 drivers/thermal/exynos_thermal.c
8490  create mode 100644 fs/fat/nfs.c
8491  create mode 100644 include/linux/cpu_cooling.h
8492  rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (74%)
8493  create mode 100644 lib/rbtree_test.c