Next/merge.log

   1 $ date
   2 Tuesday 13 November  10:27:35 EST 2012
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 77b6706 Linux 3.7-rc5
   7 Merging origin/master (77b6706 Linux 3.7-rc5)
   8 $ git merge origin/master
   9 Already up-to-date.
  10 Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
  11 $ git merge fixes/master
  12 Already up-to-date.
  13 Merging kbuild-current/rc-fixes (bad9955 menuconfig: Replace CIRCLEQ by list_head-style lists.)
  14 $ git merge kbuild-current/rc-fixes
  15 Merge made by the 'recursive' strategy.
  16  scripts/kconfig/expr.h      |    5 +--
  17  scripts/kconfig/list.h      |   91 +++++++++++++++++++++++++++++++++++++++++++
  18  scripts/kconfig/lkc_proto.h |    4 +-
  19  scripts/kconfig/mconf.c     |    6 +--
  20  scripts/kconfig/menu.c      |   14 ++++---
  21  5 files changed, 106 insertions(+), 14 deletions(-)
  22  create mode 100644 scripts/kconfig/list.h
  23 Merging arm-current/fixes (6404f0b ARM: 7569/1: mm: uninitialized warning corrections)
  24 $ git merge arm-current/fixes
  25 Already up-to-date.
  26 Merging m68k-current/for-linus (8a745ee m68k: Wire up kcmp)
  27 $ git merge m68k-current/for-linus
  28 Already up-to-date.
  29 Merging powerpc-merge/merge (8c23f40 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
  30 $ git merge powerpc-merge/merge
  31 Already up-to-date.
  32 Merging sparc/master (b251f0f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
  33 $ git merge sparc/master
  34 Already up-to-date.
  35 Merging net/master (0c9f79b ipv4: avoid undefined behavior in do_ip_setsockopt())
  36 $ git merge net/master
  37 Merge made by the 'recursive' strategy.
  38  net/ipv4/ip_sockglue.c |   35 ++++++++++++++++++++++-------------
  39  1 file changed, 22 insertions(+), 13 deletions(-)
  40 Merging sound-current/for-linus (0519363 ALSA: hda - Add a missing quirk entry for iMac 9,1)
  41 $ git merge sound-current/for-linus
  42 Merge made by the 'recursive' strategy.
  43  sound/pci/hda/patch_realtek.c |    1 +
  44  1 file changed, 1 insertion(+)
  45 Merging pci-current/for-linus (ff8e59b PCI/portdrv: Don't create hotplug slots unless port supports hotplug)
  46 $ git merge pci-current/for-linus
  47 Already up-to-date.
  48 Merging wireless/master (6fe7cc7 ath9k: Test for TID only in BlockAcks while checking tx status)
  49 $ git merge wireless/master
  50 Already up-to-date.
  51 Merging driver-core.current/driver-core-linus (8f0d816 Linux 3.7-rc3)
  52 $ git merge driver-core.current/driver-core-linus
  53 Already up-to-date.
  54 Merging tty.current/tty-linus (8f0d816 Linux 3.7-rc3)
  55 $ git merge tty.current/tty-linus
  56 Already up-to-date.
  57 Merging usb.current/usb-linus (d99e65b USB: fix build with XEN and EARLY_PRINTK_DBGP enabled but USB_SUPPORT disabled)
  58 $ git merge usb.current/usb-linus
  59 Merge made by the 'recursive' strategy.
  60  drivers/usb/early/ehci-dbgp.c  |   15 +++++++++------
  61  drivers/usb/musb/musb_gadget.c |   30 ++++++++++++++++++++++++++----
  62  drivers/usb/musb/ux500.c       |    2 +-
  63  drivers/usb/otg/Kconfig        |    4 ++--
  64  drivers/usb/serial/usb_wwan.c  |   10 +++++-----
  65  5 files changed, 43 insertions(+), 18 deletions(-)
  66 Merging staging.current/staging-linus (77b6706 Linux 3.7-rc5)
  67 $ git merge staging.current/staging-linus
  68 Already up-to-date.
  69 Merging char-misc.current/char-misc-linus (8f0d816 Linux 3.7-rc3)
  70 $ git merge char-misc.current/char-misc-linus
  71 Already up-to-date.
  72 Merging input-current/for-linus (40a8120 Input: MT - document new 'flags' argument of input_mt_init_slots())
  73 $ git merge input-current/for-linus
  74 Merge made by the 'recursive' strategy.
  75  drivers/input/input-mt.c |    4 ++++
  76  1 file changed, 4 insertions(+)
  77 Merging md-current/for-linus (ed30be0 MD RAID10: Fix oops when creating RAID10 arrays via dm-raid.c)
  78 $ git merge md-current/for-linus
  79 Already up-to-date.
  80 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
  81 $ git merge audit-current/for-linus
  82 Already up-to-date.
  83 Merging crypto-current/master (9efade1 crypto: cryptd - disable softirqs in cryptd_queue_worker to prevent data corruption)
  84 $ git merge crypto-current/master
  85 Already up-to-date.
  86 Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
  87 $ git merge ide/master
  88 Already up-to-date.
  89 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
  90 $ git merge dwmw2/master
  91 Already up-to-date.
  92 Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
  93 $ git merge sh-current/sh-fixes-for-linus
  94 Already up-to-date.
  95 Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
  96 $ git merge irqdomain-current/irqdomain/merge
  97 Already up-to-date.
  98 Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
  99 $ git merge devicetree-current/devicetree/merge
 100 Auto-merging drivers/of/base.c
 101 Merge made by the 'recursive' strategy.
 102  drivers/of/base.c |    2 ++
 103  1 file changed, 2 insertions(+)
 104 Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
 105 $ git merge spi-current/spi/merge
 106 Auto-merging drivers/spi/spi.c
 107 Auto-merging drivers/spi/spi-s3c64xx.c
 108 Auto-merging drivers/spi/spi-bcm63xx.c
 109 Merge made by the 'recursive' strategy.
 110  drivers/spi/spi-bcm63xx.c |   16 ++++++----------
 111  drivers/spi/spi-s3c64xx.c |   10 ++++------
 112  drivers/spi/spi.c         |    5 ++++-
 113  3 files changed, 14 insertions(+), 17 deletions(-)
 114 Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
 115 $ git merge gpio-current/gpio/merge
 116 Already up-to-date.
 117 Merging rr-fixes/fixes (237242b virtio: Don't access index after unregister.)
 118 $ git merge rr-fixes/fixes
 119 Already up-to-date.
 120 Merging asm-generic/master (9b04ebd asm-generic/io.h: remove asm/cacheflush.h include)
 121 $ git merge asm-generic/master
 122 Merge made by the 'recursive' strategy.
 123  arch/openrisc/include/asm/io.h |    1 +
 124  include/asm-generic/io.h       |    1 -
 125  2 files changed, 1 insertion(+), 1 deletion(-)
 126 Merging arm/for-next (ee05d61 Merge remote-tracking branch 'wildea/asids' into for-next)
 127 $ git merge arm/for-next
 128 Merge made by the 'recursive' strategy.
 129  arch/arm/Kconfig                              |    1 +
 130  arch/arm/common/vic.c                         |   18 +-
 131  arch/arm/include/asm/hardware/cache-l2x0.h    |    5 +
 132  arch/arm/include/asm/hardware/vic.h           |    2 +-
 133  arch/arm/include/asm/mmu.h                    |   11 +-
 134  arch/arm/include/asm/mmu_context.h            |   82 +-------
 135  arch/arm/kernel/process.c                     |    1 +
 136  arch/arm/kernel/smp_twd.c                     |   54 +++--
 137  arch/arm/kernel/vmlinux.lds.S                 |   19 +-
 138  arch/arm/mm/cache-aurora-l2.h                 |   55 +++++
 139  arch/arm/mm/cache-l2x0.c                      |  278 ++++++++++++++++++++++---
 140  arch/arm/mm/context.c                         |  207 +++++++++---------
 141  arch/arm/mm/proc-v7.S                         |    2 +-
 142  arch/arm/plat-omap/include/plat/omap-serial.h |   55 -----
 143  drivers/mmc/host/mmci.c                       |   58 ++++--
 144  drivers/mmc/host/mmci.h                       |    4 +
 145  drivers/tty/serial/omap-serial.c              |  235 +++++++++++++--------
 146  drivers/tty/serial/serial_core.c              |   71 +++++--
 147  include/linux/serial_core.h                   |    6 +
 148  scripts/sortextable.c                         |    1 +
 149  20 files changed, 742 insertions(+), 423 deletions(-)
 150  create mode 100644 arch/arm/mm/cache-aurora-l2.h
 151 Merging arm-perf/for-next/perf (ae0c7b2 Merge branch 'hw-breakpoint' into for-next/perf)
 152 $ git merge arm-perf/for-next/perf
 153 Merge made by the 'recursive' strategy.
 154  arch/arm/include/asm/hw_breakpoint.h |    8 +-
 155  arch/arm/include/asm/perf_event.h    |    5 +
 156  arch/arm/include/asm/pmu.h           |   28 ++--
 157  arch/arm/kernel/hw_breakpoint.c      |  154 +++++++++++----------
 158  arch/arm/kernel/perf_event.c         |   85 ++++++++----
 159  arch/arm/kernel/perf_event_cpu.c     |   74 ++++++----
 160  arch/arm/kernel/perf_event_v6.c      |  126 ++++++++---------
 161  arch/arm/kernel/perf_event_v7.c      |  246 ++++++++++++++++------------------
 162  arch/arm/kernel/perf_event_xscale.c  |  157 +++++++++++-----------
 163  arch/arm/mach-omap2/pmu.c            |    2 -
 164  10 files changed, 474 insertions(+), 411 deletions(-)
 165 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
 166 $ git merge davinci/davinci-next
 167 Already up-to-date.
 168 Merging xilinx/arm-next (e06f1a9 ARM: zynq: dts: split up device tree)
 169 $ git merge xilinx/arm-next
 170 Auto-merging arch/arm/boot/dts/zynq-zc702.dts
 171 Auto-merging arch/arm/boot/dts/zynq-7000.dtsi
 172 Auto-merging arch/arm/Kconfig
 173 Merge made by the 'recursive' strategy.
 174  arch/arm/Kconfig                                   |    1 -
 175  arch/arm/Kconfig.debug                             |   17 ++++++++
 176  arch/arm/Makefile                                  |    1 -
 177  arch/arm/boot/dts/Makefile                         |    1 +
 178  .../boot/dts/{zynq-ep107.dts => zynq-7000.dtsi}    |   45 +++++++++++---------
 179  .../mach/clkdev.h => boot/dts/zynq-zc702.dts}      |   32 +++++++-------
 180  arch/arm/mach-zynq/common.c                        |   43 ++++++++++++-------
 181  arch/arm/mach-zynq/common.h                        |    4 +-
 182  arch/arm/mach-zynq/include/mach/zynq_soc.h         |   45 +++++++++++---------
 183  arch/arm/mach-zynq/timer.c                         |   10 +----
 184  10 files changed, 112 insertions(+), 87 deletions(-)
 185  rename arch/arm/boot/dts/{zynq-ep107.dts => zynq-7000.dtsi} (56%)
 186  rename arch/arm/{mach-zynq/include/mach/clkdev.h => boot/dts/zynq-zc702.dts} (56%)
 187 Merging arm64/upstream (42656f6 Merge branch 'execve' into upstream)
 188 $ git merge arm64/upstream
 189 Merge made by the 'recursive' strategy.
 190  arch/arm64/Kconfig                 |    2 +
 191  arch/arm64/include/asm/processor.h |    5 ---
 192  arch/arm64/include/asm/syscalls.h  |    3 --
 193  arch/arm64/include/asm/unistd.h    |    1 +
 194  arch/arm64/include/asm/unistd32.h  |    2 +-
 195  arch/arm64/kernel/entry.S          |   12 +++---
 196  arch/arm64/kernel/process.c        |   77 +++++++++++-------------------------
 197  arch/arm64/kernel/sys.c            |   65 ------------------------------
 198  arch/arm64/kernel/sys32.S          |    5 ---
 199  arch/arm64/kernel/sys_compat.c     |   18 ---------
 200  arch/arm64/mm/fault.c              |   13 +++++-
 201  11 files changed, 44 insertions(+), 159 deletions(-)
 202 Merging blackfin/for-linus (9d84601 Blackfin: dpmc: use module_platform_driver macro)
 203 $ git merge blackfin/for-linus
 204 Removing arch/blackfin/include/asm/kvm_para.h
 205 Merge made by the 'recursive' strategy.
 206  arch/blackfin/include/asm/Kbuild                   |    6 +-
 207  arch/blackfin/include/asm/bfin_sport.h             |  128 +-----
 208  arch/blackfin/include/asm/bfin_twi.h               |    2 +-
 209  arch/blackfin/include/asm/fixed_code.h             |   30 +-
 210  arch/blackfin/include/asm/kvm_para.h               |    1 -
 211  arch/blackfin/include/asm/pgtable.h                |    2 -
 212  arch/blackfin/include/asm/ptrace.h                 |  161 +-------
 213  arch/blackfin/include/asm/uaccess.h                |   41 +-
 214  arch/blackfin/include/asm/unistd.h                 |  430 +------------------
 215  arch/blackfin/include/uapi/asm/Kbuild              |   16 +
 216  arch/blackfin/include/uapi/asm/bfin_sport.h        |  136 ++++++
 217  arch/blackfin/include/{ => uapi}/asm/byteorder.h   |    0
 218  arch/blackfin/include/{ => uapi}/asm/cachectl.h    |    0
 219  arch/blackfin/include/{ => uapi}/asm/fcntl.h       |    0
 220  arch/blackfin/include/uapi/asm/fixed_code.h        |   38 ++
 221  arch/blackfin/include/{ => uapi}/asm/ioctls.h      |    0
 222  arch/blackfin/include/{ => uapi}/asm/poll.h        |    0
 223  arch/blackfin/include/{ => uapi}/asm/posix_types.h |    0
 224  arch/blackfin/include/uapi/asm/ptrace.h            |  170 ++++++++
 225  arch/blackfin/include/{ => uapi}/asm/sigcontext.h  |    0
 226  arch/blackfin/include/{ => uapi}/asm/siginfo.h     |    0
 227  arch/blackfin/include/{ => uapi}/asm/signal.h      |    0
 228  arch/blackfin/include/{ => uapi}/asm/stat.h        |    0
 229  arch/blackfin/include/{ => uapi}/asm/swab.h        |    0
 230  arch/blackfin/include/uapi/asm/unistd.h            |  437 ++++++++++++++++++++
 231  arch/blackfin/mach-common/dpmc.c                   |   19 +-
 232  26 files changed, 817 insertions(+), 800 deletions(-)
 233  delete mode 100644 arch/blackfin/include/asm/kvm_para.h
 234  create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
 235  rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
 236  rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
 237  rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
 238  create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
 239  rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
 240  rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
 241  rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
 242  create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
 243  rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
 244  rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
 245  rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
 246  rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
 247  rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
 248  create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
 249 Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
 250 $ git merge c6x/for-linux-next
 251 Already up-to-date.
 252 Merging cris/for-next (eacb25c UAPI: Fix up empty files in arch/cris/)
 253 $ git merge cris/for-next
 254 Auto-merging arch/cris/include/asm/Kbuild
 255 Merge made by the 'recursive' strategy.
 256  arch/cris/include/arch-v10/arch/Kbuild             |    5 +-
 257  arch/cris/include/arch-v32/arch/Kbuild             |    3 +-
 258  arch/cris/include/arch-v32/arch/cryptocop.h        |  116 +------
 259  arch/cris/include/arch-v32/arch/spinlock.h         |    2 +-
 260  arch/cris/include/asm/Kbuild                       |    5 -
 261  arch/cris/include/asm/ptrace.h                     |    5 +-
 262  arch/cris/include/asm/signal.h                     |  122 +------
 263  arch/cris/include/asm/swab.h                       |    3 +-
 264  arch/cris/include/asm/termios.h                    |   43 +--
 265  arch/cris/include/asm/types.h                      |    5 +-
 266  arch/cris/include/asm/unistd.h                     |  342 +------------------
 267  arch/cris/include/uapi/arch-v10/arch/Kbuild        |    4 +
 268  .../include/{ => uapi}/arch-v10/arch/sv_addr.agh   |    0
 269  .../include/{ => uapi}/arch-v10/arch/sv_addr_ag.h  |    0
 270  .../cris/include/{ => uapi}/arch-v10/arch/svinto.h |    0
 271  arch/cris/include/{ => uapi}/arch-v10/arch/user.h  |    0
 272  arch/cris/include/uapi/arch-v32/arch/Kbuild        |    2 +
 273  arch/cris/include/uapi/arch-v32/arch/cryptocop.h   |  122 +++++++
 274  arch/cris/include/{ => uapi}/arch-v32/arch/user.h  |    0
 275  arch/cris/include/uapi/asm/Kbuild                  |   34 ++
 276  arch/cris/include/{ => uapi}/asm/auxvec.h          |    0
 277  arch/cris/include/{ => uapi}/asm/bitsperlong.h     |    0
 278  arch/cris/include/{ => uapi}/asm/byteorder.h       |    0
 279  arch/cris/include/{ => uapi}/asm/errno.h           |    0
 280  arch/cris/include/{ => uapi}/asm/ethernet.h        |    0
 281  arch/cris/include/{ => uapi}/asm/etraxgpio.h       |    0
 282  arch/cris/include/{ => uapi}/asm/fcntl.h           |    0
 283  arch/cris/include/{ => uapi}/asm/ioctl.h           |    0
 284  arch/cris/include/{ => uapi}/asm/ioctls.h          |    0
 285  arch/cris/include/{ => uapi}/asm/ipcbuf.h          |    0
 286  arch/cris/include/{ => uapi}/asm/mman.h            |    0
 287  arch/cris/include/{ => uapi}/asm/msgbuf.h          |    0
 288  arch/cris/include/{ => uapi}/asm/param.h           |    0
 289  arch/cris/include/{ => uapi}/asm/poll.h            |    0
 290  arch/cris/include/{ => uapi}/asm/posix_types.h     |    0
 291  arch/cris/include/uapi/asm/ptrace.h                |    1 +
 292  arch/cris/include/{ => uapi}/asm/resource.h        |    0
 293  arch/cris/include/{ => uapi}/asm/rs485.h           |    0
 294  arch/cris/include/{ => uapi}/asm/sembuf.h          |    0
 295  arch/cris/include/{ => uapi}/asm/setup.h           |    0
 296  arch/cris/include/{ => uapi}/asm/shmbuf.h          |    0
 297  arch/cris/include/{ => uapi}/asm/sigcontext.h      |    0
 298  arch/cris/include/{ => uapi}/asm/siginfo.h         |    0
 299  arch/cris/include/uapi/asm/signal.h                |  122 +++++++
 300  arch/cris/include/{ => uapi}/asm/socket.h          |    0
 301  arch/cris/include/{ => uapi}/asm/sockios.h         |    0
 302  arch/cris/include/{ => uapi}/asm/stat.h            |    0
 303  arch/cris/include/{ => uapi}/asm/statfs.h          |    0
 304  arch/cris/include/uapi/asm/swab.h                  |    3 +
 305  arch/cris/include/{ => uapi}/asm/sync_serial.h     |    0
 306  arch/cris/include/{ => uapi}/asm/termbits.h        |    0
 307  arch/cris/include/uapi/asm/termios.h               |   45 +++
 308  arch/cris/include/uapi/asm/types.h                 |    1 +
 309  arch/cris/include/uapi/asm/unistd.h                |  344 ++++++++++++++++++++
 310  arch/cris/kernel/asm-offsets.c                     |    6 +-
 311  55 files changed, 689 insertions(+), 646 deletions(-)
 312  rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr.agh (100%)
 313  rename arch/cris/include/{ => uapi}/arch-v10/arch/sv_addr_ag.h (100%)
 314  rename arch/cris/include/{ => uapi}/arch-v10/arch/svinto.h (100%)
 315  rename arch/cris/include/{ => uapi}/arch-v10/arch/user.h (100%)
 316  create mode 100644 arch/cris/include/uapi/arch-v32/arch/cryptocop.h
 317  rename arch/cris/include/{ => uapi}/arch-v32/arch/user.h (100%)
 318  rename arch/cris/include/{ => uapi}/asm/auxvec.h (100%)
 319  rename arch/cris/include/{ => uapi}/asm/bitsperlong.h (100%)
 320  rename arch/cris/include/{ => uapi}/asm/byteorder.h (100%)
 321  rename arch/cris/include/{ => uapi}/asm/errno.h (100%)
 322  rename arch/cris/include/{ => uapi}/asm/ethernet.h (100%)
 323  rename arch/cris/include/{ => uapi}/asm/etraxgpio.h (100%)
 324  rename arch/cris/include/{ => uapi}/asm/fcntl.h (100%)
 325  rename arch/cris/include/{ => uapi}/asm/ioctl.h (100%)
 326  rename arch/cris/include/{ => uapi}/asm/ioctls.h (100%)
 327  rename arch/cris/include/{ => uapi}/asm/ipcbuf.h (100%)
 328  rename arch/cris/include/{ => uapi}/asm/mman.h (100%)
 329  rename arch/cris/include/{ => uapi}/asm/msgbuf.h (100%)
 330  rename arch/cris/include/{ => uapi}/asm/param.h (100%)
 331  rename arch/cris/include/{ => uapi}/asm/poll.h (100%)
 332  rename arch/cris/include/{ => uapi}/asm/posix_types.h (100%)
 333  create mode 100644 arch/cris/include/uapi/asm/ptrace.h
 334  rename arch/cris/include/{ => uapi}/asm/resource.h (100%)
 335  rename arch/cris/include/{ => uapi}/asm/rs485.h (100%)
 336  rename arch/cris/include/{ => uapi}/asm/sembuf.h (100%)
 337  rename arch/cris/include/{ => uapi}/asm/setup.h (100%)
 338  rename arch/cris/include/{ => uapi}/asm/shmbuf.h (100%)
 339  rename arch/cris/include/{ => uapi}/asm/sigcontext.h (100%)
 340  rename arch/cris/include/{ => uapi}/asm/siginfo.h (100%)
 341  create mode 100644 arch/cris/include/uapi/asm/signal.h
 342  rename arch/cris/include/{ => uapi}/asm/socket.h (100%)
 343  rename arch/cris/include/{ => uapi}/asm/sockios.h (100%)
 344  rename arch/cris/include/{ => uapi}/asm/stat.h (100%)
 345  rename arch/cris/include/{ => uapi}/asm/statfs.h (100%)
 346  create mode 100644 arch/cris/include/uapi/asm/swab.h
 347  rename arch/cris/include/{ => uapi}/asm/sync_serial.h (100%)
 348  rename arch/cris/include/{ => uapi}/asm/termbits.h (100%)
 349  create mode 100644 arch/cris/include/uapi/asm/termios.h
 350  create mode 100644 arch/cris/include/uapi/asm/types.h
 351  create mode 100644 arch/cris/include/uapi/asm/unistd.h
 352 Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
 353 $ git merge hexagon/linux-next
 354 Already up-to-date.
 355 Merging ia64/next (4fafc8c [IA64] Resolve name space collision for cache_show())
 356 $ git merge ia64/next
 357 Merge made by the 'recursive' strategy.
 358  arch/ia64/kernel/topology.c |    4 ++--
 359  1 file changed, 2 insertions(+), 2 deletions(-)
 360 Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
 361 $ git merge m68k/for-next
 362 Already up-to-date.
 363 Merging m68knommu/for-next (e561d37 m68k: fix unused variable warning in mempcy.c)
 364 $ git merge m68knommu/for-next
 365 Removing arch/m68k/include/asm/m5249sim.h
 366 Merge made by the 'recursive' strategy.
 367  arch/m68k/Kconfig.cpu                   |    3 +-
 368  arch/m68k/include/asm/m5249sim.h        |  269 -------------------------------
 369  arch/m68k/include/asm/m525xsim.h        |  116 ++++++++++++-
 370  arch/m68k/include/asm/mcfsim.h          |    5 +-
 371  arch/m68k/include/asm/page_no.h         |    2 +-
 372  arch/m68k/lib/memcpy.c                  |    3 +-
 373  arch/m68k/platform/coldfire/intc-5249.c |    8 +-
 374  arch/m68k/platform/coldfire/m5249.c     |    8 +-
 375  8 files changed, 129 insertions(+), 285 deletions(-)
 376  delete mode 100644 arch/m68k/include/asm/m5249sim.h
 377 $ git am -3 ../patches/0001-m68k-fix-up-for-UAPI-changes.patch
 378 Applying: m68k: fix up for UAPI changes
 379 $ git reset HEAD^
 380 Unstaged changes after reset:
 381 M       arch/m68k/include/uapi/asm/Kbuild
 382 $ git add -A .
 383 $ git commit -v -a --amend
 384 [master d64eaf0] Merge remote-tracking branch 'm68knommu/for-next'
 385 Merging microblaze/next (f229605 microblaze: dma-mapping: Support debug_dma_mapping_error)
 386 $ git merge microblaze/next
 387 Merge made by the 'recursive' strategy.
 388  arch/microblaze/include/asm/Kbuild                 |    2 -
 389  arch/microblaze/include/asm/dma-mapping.h          |    2 +
 390  arch/microblaze/include/asm/elf.h                  |   97 +----
 391  arch/microblaze/include/asm/ptrace.h               |   62 +--
 392  arch/microblaze/include/asm/setup.h                |    6 +-
 393  arch/microblaze/include/asm/uaccess.h              |    3 +-
 394  arch/microblaze/include/asm/unistd.h               |  390 +------------------
 395  arch/microblaze/include/uapi/asm/Kbuild            |   32 ++
 396  arch/microblaze/include/{ => uapi}/asm/auxvec.h    |    0
 397  .../include/{ => uapi}/asm/bitsperlong.h           |    0
 398  arch/microblaze/include/{ => uapi}/asm/byteorder.h |    0
 399  arch/microblaze/include/uapi/asm/elf.h             |  121 ++++++
 400  arch/microblaze/include/{ => uapi}/asm/errno.h     |    0
 401  arch/microblaze/include/{ => uapi}/asm/fcntl.h     |    0
 402  arch/microblaze/include/{ => uapi}/asm/ioctl.h     |    0
 403  arch/microblaze/include/{ => uapi}/asm/ioctls.h    |    0
 404  arch/microblaze/include/{ => uapi}/asm/ipcbuf.h    |    0
 405  arch/microblaze/include/{ => uapi}/asm/kvm_para.h  |    0
 406  arch/microblaze/include/{ => uapi}/asm/mman.h      |    0
 407  arch/microblaze/include/{ => uapi}/asm/msgbuf.h    |    0
 408  arch/microblaze/include/{ => uapi}/asm/param.h     |    0
 409  arch/microblaze/include/{ => uapi}/asm/poll.h      |    0
 410  .../include/{ => uapi}/asm/posix_types.h           |    0
 411  arch/microblaze/include/uapi/asm/ptrace.h          |   72 ++++
 412  arch/microblaze/include/{ => uapi}/asm/resource.h  |    0
 413  arch/microblaze/include/{ => uapi}/asm/sembuf.h    |    0
 414  arch/microblaze/include/uapi/asm/setup.h           |   19 +
 415  arch/microblaze/include/{ => uapi}/asm/shmbuf.h    |    0
 416  .../microblaze/include/{ => uapi}/asm/sigcontext.h |    0
 417  arch/microblaze/include/{ => uapi}/asm/siginfo.h   |    0
 418  arch/microblaze/include/{ => uapi}/asm/signal.h    |    0
 419  arch/microblaze/include/{ => uapi}/asm/socket.h    |    0
 420  arch/microblaze/include/{ => uapi}/asm/sockios.h   |    0
 421  arch/microblaze/include/{ => uapi}/asm/stat.h      |    0
 422  arch/microblaze/include/{ => uapi}/asm/statfs.h    |    0
 423  arch/microblaze/include/{ => uapi}/asm/swab.h      |    0
 424  arch/microblaze/include/{ => uapi}/asm/termbits.h  |    0
 425  arch/microblaze/include/{ => uapi}/asm/termios.h   |    0
 426  arch/microblaze/include/{ => uapi}/asm/types.h     |    0
 427  arch/microblaze/include/uapi/asm/unistd.h          |  400 ++++++++++++++++++++
 428  arch/microblaze/kernel/entry-nommu.S               |    1 -
 429  arch/microblaze/kernel/entry.S                     |    2 +-
 430  arch/microblaze/kernel/process.c                   |    1 -
 431  43 files changed, 653 insertions(+), 557 deletions(-)
 432  rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
 433  rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
 434  rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
 435  create mode 100644 arch/microblaze/include/uapi/asm/elf.h
 436  rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
 437  rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
 438  rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
 439  rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
 440  rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
 441  rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
 442  rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
 443  rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
 444  rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
 445  rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
 446  rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
 447  create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
 448  rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
 449  rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
 450  create mode 100644 arch/microblaze/include/uapi/asm/setup.h
 451  rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
 452  rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
 453  rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
 454  rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
 455  rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
 456  rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
 457  rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
 458  rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
 459  rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
 460  rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
 461  rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
 462  rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
 463  create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
 464 Merging mips/mips-for-linux-next (e950ae1 Merge branch 'current/for-linus' into mips-for-linux-next)
 465 $ git merge mips/mips-for-linux-next
 466 Merge made by the 'recursive' strategy.
 467  MAINTAINERS                                  |    9 ++
 468  arch/mips/Kconfig                            |   17 ++-
 469  arch/mips/cavium-octeon/executive/cvmx-l2c.c |    1 +
 470  arch/mips/cavium-octeon/octeon-memcpy.S      |   27 ----
 471  arch/mips/cavium-octeon/setup.c              |   40 +++--
 472  arch/mips/configs/cavium_octeon_defconfig    |   98 +++++++++---
 473  arch/mips/include/asm/bitops.h               |  128 +++++-----------
 474  arch/mips/include/asm/compat.h               |    2 +-
 475  arch/mips/include/asm/cpu.h                  |    6 +-
 476  arch/mips/include/asm/io.h                   |    1 +
 477  arch/mips/include/asm/irqflags.h             |  207 ++++++++++----------------
 478  arch/mips/include/asm/mipsregs.h             |    2 +-
 479  arch/mips/include/asm/page.h                 |    8 +-
 480  arch/mips/include/asm/pgtable-64.h           |    2 +-
 481  arch/mips/include/asm/pgtable-bits.h         |   13 +-
 482  arch/mips/include/asm/pgtable.h              |  168 ++++++++++++++++++++-
 483  arch/mips/include/asm/processor.h            |    4 -
 484  arch/mips/include/asm/sparsemem.h            |    2 +-
 485  arch/mips/include/asm/thread_info.h          |    6 -
 486  arch/mips/include/asm/tlbdebug.h             |    1 +
 487  arch/mips/kernel/asm-offsets.c               |    4 -
 488  arch/mips/kernel/mips_ksyms.c                |    2 +-
 489  arch/mips/kernel/scall64-n32.S               |    6 -
 490  arch/mips/kernel/signal.c                    |   13 +-
 491  arch/mips/lib/Makefile                       |    5 +-
 492  arch/mips/lib/bitops.c                       |  179 ++++++++++++++++++++++
 493  arch/mips/lib/dump_tlb.c                     |   47 ++++++
 494  arch/mips/lib/mips-atomic.c                  |  176 ++++++++++++++++++++++
 495  arch/mips/mm/c-octeon.c                      |   46 +++---
 496  arch/mips/mm/pgtable-64.c                    |   31 ++++
 497  arch/mips/mm/tlb-r4k.c                       |   22 ++-
 498  arch/mips/mm/tlbex.c                         |   93 ++++++++----
 499  arch/mips/pci/pci-octeon.c                   |    4 +
 500  drivers/edac/Kconfig                         |   33 +++-
 501  drivers/edac/Makefile                        |    5 +
 502  drivers/edac/octeon_edac-l2c.c               |  118 +++++++++++++++
 503  drivers/edac/octeon_edac-lmc.c               |  150 +++++++++++++++++++
 504  drivers/edac/octeon_edac-lmc.h               |   78 ++++++++++
 505  drivers/edac/octeon_edac-pc.c                |  140 +++++++++++++++++
 506  drivers/edac/octeon_edac-pci.c               |  135 +++++++++++++++++
 507  40 files changed, 1657 insertions(+), 372 deletions(-)
 508  create mode 100644 arch/mips/lib/bitops.c
 509  create mode 100644 arch/mips/lib/mips-atomic.c
 510  create mode 100644 drivers/edac/octeon_edac-l2c.c
 511  create mode 100644 drivers/edac/octeon_edac-lmc.c
 512  create mode 100644 drivers/edac/octeon_edac-lmc.h
 513  create mode 100644 drivers/edac/octeon_edac-pc.c
 514  create mode 100644 drivers/edac/octeon_edac-pci.c
 515 Merging openrisc/for-upstream (634bd40 openrisc: use kbuild.h instead of defining macros in asm-offset.c)
 516 $ git merge openrisc/for-upstream
 517 Removing arch/openrisc/include/uapi/asm/kvm_para.h
 518 Merge made by the 'recursive' strategy.
 519  arch/openrisc/include/asm/Kbuild          |    1 +
 520  arch/openrisc/include/uapi/asm/kvm_para.h |    1 -
 521  arch/openrisc/kernel/asm-offsets.c        |    6 +-----
 522  3 files changed, 2 insertions(+), 6 deletions(-)
 523  delete mode 100644 arch/openrisc/include/uapi/asm/kvm_para.h
 524 Merging parisc/for-next (559fd14 Merge tag 'disintegrate-parisc-20121016' into for-next)
 525 $ git merge parisc/for-next
 526 Already up-to-date!
 527 Merge made by the 'recursive' strategy.
 528 Merging powerpc/next (83dac59 cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.)
 529 $ git merge powerpc/next
 530 Already up-to-date.
 531 Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
 532 $ git merge 4xx/next
 533 Already up-to-date.
 534 Merging mpc5xxx/next (fa9b24a powerpc/mpc5200: move lpbfifo node and fix its interrupt property)
 535 $ git merge mpc5xxx/next
 536 Merge made by the 'recursive' strategy.
 537  arch/powerpc/boot/dts/mpc5200b.dtsi       |    6 ++++++
 538  arch/powerpc/boot/dts/o2d.dtsi            |    6 ------
 539  arch/powerpc/boot/dts/pcm030.dts          |    7 ++++++-
 540  arch/powerpc/platforms/52xx/mpc52xx_pic.c |    9 +++++----
 541  4 files changed, 17 insertions(+), 11 deletions(-)
 542 Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
 543 $ git merge galak/next
 544 Already up-to-date.
 545 Merging s390/features (52305ab s390/topology: cleanup topology code)
 546 $ git merge s390/features
 547 Merge made by the 'recursive' strategy.
 548  arch/s390/Kconfig                      |    1 +
 549  arch/s390/crypto/aes_s390.c            |   18 ++--
 550  arch/s390/crypto/des_s390.c            |   12 ++-
 551  arch/s390/crypto/ghash_s390.c          |   21 +++--
 552  arch/s390/crypto/sha_common.c          |    9 +-
 553  arch/s390/include/asm/ccwdev.h         |    6 +-
 554  arch/s390/include/asm/compat.h         |    2 +-
 555  arch/s390/include/asm/page.h           |    2 +
 556  arch/s390/include/asm/pgtable.h        |   11 ++-
 557  arch/s390/include/asm/topology.h       |   33 ++++---
 558  arch/s390/include/uapi/asm/ptrace.h    |    4 +-
 559  arch/s390/kernel/Makefile              |    2 +-
 560  arch/s390/kernel/compat_signal.c       |   14 ++-
 561  arch/s390/kernel/entry.h               |   21 ++++-
 562  arch/s390/kernel/entry64.S             |    4 +-
 563  arch/s390/kernel/pgm_check.S           |  152 ++++++++++++++++++++++++++++++++
 564  arch/s390/kernel/setup.c               |   36 +-------
 565  arch/s390/kernel/signal.c              |   14 ++-
 566  arch/s390/kernel/topology.c            |  136 ++++++++++++++--------------
 567  arch/s390/kernel/traps.c               |   52 ++---------
 568  arch/s390/mm/Makefile                  |   12 +--
 569  arch/s390/mm/dump_pagetables.c         |    7 +-
 570  arch/s390/mm/fault.c                   |   12 ++-
 571  arch/s390/mm/init.c                    |   29 ------
 572  arch/s390/mm/pageattr.c                |   82 ++++++++++++++++-
 573  arch/s390/mm/pgtable.c                 |   16 ----
 574  arch/s390/mm/vmem.c                    |   46 ++++++++--
 575  drivers/s390/block/dasd_eckd.c         |   76 ++++++++--------
 576  drivers/s390/block/dasd_fba.c          |   23 +++--
 577  drivers/s390/block/dasd_ioctl.c        |   11 ++-
 578  drivers/s390/char/sclp_cmd.c           |   17 ++--
 579  drivers/s390/cio/device.c              |   11 ---
 580  drivers/s390/cio/device.h              |    2 -
 581  drivers/s390/cio/device_ops.c          |   17 ++--
 582  drivers/s390/cio/qdio_main.c           |   52 +++--------
 583  drivers/s390/cio/qdio_setup.c          |    7 +-
 584  drivers/s390/cio/qdio_thinint.c        |    2 -
 585  drivers/s390/crypto/zcrypt_msgtype50.c |   68 ++++++--------
 586  drivers/s390/crypto/zcrypt_msgtype50.h |    2 +
 587  39 files changed, 611 insertions(+), 431 deletions(-)
 588  create mode 100644 arch/s390/kernel/pgm_check.S
 589 Merging sh/sh-latest (0dd4d5c sh: Fix up more fallout from pointless ARM __iomem churn.)
 590 $ git merge sh/sh-latest
 591 Already up-to-date.
 592 Merging sparc-next/master (43c422e apparmor: fix apparmor OOPS in audit_log_untrustedstring+0x1c/0x40)
 593 $ git merge sparc-next/master
 594 Already up-to-date.
 595 Merging tile/master (ddffeb8 Linux 3.7-rc1)
 596 $ git merge tile/master
 597 Already up-to-date.
 598 Merging unicore32/unicore32 (7bf2799 arch/unicore32: remove CONFIG_EXPERIMENTAL)
 599 $ git merge unicore32/unicore32
 600 Auto-merging arch/unicore32/include/uapi/asm/unistd.h
 601 Removing arch/unicore32/include/asm/kvm_para.h
 602 Merge made by the 'recursive' strategy.
 603  arch/unicore32/Kconfig                             |    7 +-
 604  arch/unicore32/include/asm/Kbuild                  |    1 -
 605  arch/unicore32/include/asm/bug.h                   |    5 --
 606  arch/unicore32/include/asm/cmpxchg.h               |    2 +-
 607  arch/unicore32/include/asm/kvm_para.h              |    1 -
 608  arch/unicore32/include/asm/processor.h             |    5 --
 609  arch/unicore32/include/asm/ptrace.h                |   76 +----------------
 610  arch/unicore32/include/uapi/asm/Kbuild             |    7 ++
 611  arch/unicore32/include/{ => uapi}/asm/byteorder.h  |    0
 612  arch/unicore32/include/uapi/asm/ptrace.h           |   90 ++++++++++++++++++++
 613  arch/unicore32/include/{ => uapi}/asm/sigcontext.h |    0
 614  arch/unicore32/include/{ => uapi}/asm/unistd.h     |    1 +
 615  arch/unicore32/kernel/entry.S                      |   20 ++---
 616  arch/unicore32/kernel/process.c                    |   58 +++----------
 617  arch/unicore32/kernel/setup.h                      |    6 ++
 618  arch/unicore32/kernel/sys.c                        |   63 --------------
 619  arch/unicore32/mm/fault.c                          |   37 +++++---
 620  17 files changed, 160 insertions(+), 219 deletions(-)
 621  delete mode 100644 arch/unicore32/include/asm/kvm_para.h
 622  rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%)
 623  create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h
 624  rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%)
 625  rename arch/unicore32/include/{ => uapi}/asm/unistd.h (92%)
 626 Merging xtensa/for_next (d83ac75 xtensa: add xtavnet DTS)
 627 $ git merge xtensa/for_next
 628 Merge made by the 'recursive' strategy.
 629  arch/xtensa/Kconfig                                |   26 ++++
 630  arch/xtensa/Makefile                               |    6 +
 631  arch/xtensa/boot/Makefile                          |   23 +++-
 632  arch/xtensa/boot/boot-elf/Makefile                 |   24 ++--
 633  arch/xtensa/boot/boot-redboot/Makefile             |   25 ++--
 634  arch/xtensa/boot/boot-uboot/Makefile               |   13 ++
 635  arch/xtensa/boot/dts/xtavnet.dts                   |   47 +++++++
 636  arch/xtensa/include/asm/bootparam.h                |    1 +
 637  arch/xtensa/include/asm/prom.h                     |    1 +
 638  arch/xtensa/kernel/irq.c                           |   99 +++++++++-----
 639  arch/xtensa/kernel/setup.c                         |  143 ++++++++++++++++----
 640  arch/xtensa/kernel/time.c                          |    5 +-
 641  arch/xtensa/platforms/xtavnet/Makefile             |    9 ++
 642  .../platforms/xtavnet/include/platform/hardware.h  |   52 +++++++
 643  .../platforms/xtavnet/include/platform/lcd.h       |   20 +++
 644  .../platforms/xtavnet/include/platform/serial.h    |   38 ++++++
 645  .../platforms/xtavnet/include/platform/system.h    |   12 ++
 646  arch/xtensa/platforms/xtavnet/lcd.c                |   75 ++++++++++
 647  arch/xtensa/platforms/xtavnet/setup.c              |   88 ++++++++++++
 648  19 files changed, 616 insertions(+), 91 deletions(-)
 649  create mode 100644 arch/xtensa/boot/boot-uboot/Makefile
 650  create mode 100644 arch/xtensa/boot/dts/xtavnet.dts
 651  create mode 100644 arch/xtensa/include/asm/prom.h
 652  create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
 653  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
 654  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
 655  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
 656  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/system.h
 657  create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
 658  create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
 659 Merging btrfs/next (c37b2b6 Btrfs: do not bug when we fail to commit the transaction)
 660 $ git merge btrfs/next
 661 Already up-to-date.
 662 Merging ceph/master (3515297 rbd: activate v2 image support)
 663 $ git merge ceph/master
 664 Auto-merging net/ceph/messenger.c
 665 Merge made by the 'recursive' strategy.
 666  drivers/block/rbd.c  |  100 +++++++++++++++++++++++++++++++++++++++-----------
 667  net/ceph/messenger.c |   58 +++++++++++++----------------
 668  2 files changed, 104 insertions(+), 54 deletions(-)
 669 Merging cifs/for-next (5004f80 cifs: fix SID binary to string conversion)
 670 $ git merge cifs/for-next
 671 Merge made by the 'recursive' strategy.
 672  fs/cifs/cifsacl.c   |  748 ++++++++++++++++-----------------------------------
 673  fs/cifs/cifsacl.h   |   66 +++--
 674  fs/cifs/cifsfs.c    |   12 +-
 675  fs/cifs/cifsproto.h |    1 -
 676  fs/cifs/inode.c     |    7 +-
 677  fs/cifs/readdir.c   |   10 +
 678  6 files changed, 279 insertions(+), 565 deletions(-)
 679 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
 680 $ git merge configfs/linux-next
 681 Already up-to-date.
 682 Merging ecryptfs/next (e4bc652 eCryptfs: Avoid unnecessary disk read and data decryption during writing)
 683 $ git merge ecryptfs/next
 684 Merge made by the 'recursive' strategy.
 685  fs/ecryptfs/mmap.c |   12 ++++++++++--
 686  1 file changed, 10 insertions(+), 2 deletions(-)
 687 Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
 688 $ git merge ext3/for_next
 689 Already up-to-date.
 690 Merging ext4/dev (dffe9d8 ext4: do not use ext4_error() when there is no space in dir leaf for csum)
 691 $ git merge ext4/dev
 692 Merge made by the 'recursive' strategy.
 693  fs/ext4/Makefile            |    2 +-
 694  fs/ext4/acl.c               |    6 +-
 695  fs/ext4/ext4.h              |   10 +-
 696  fs/ext4/ext4_extents.h      |    3 +-
 697  fs/ext4/ext4_jbd2.h         |    7 -
 698  fs/ext4/extents.c           |  319 +++++----------------------
 699  fs/ext4/extents_status.c    |  500 +++++++++++++++++++++++++++++++++++++++++++
 700  fs/ext4/extents_status.h    |   45 ++++
 701  fs/ext4/file.c              |  334 ++++++++++++++++++++++++++++-
 702  fs/ext4/indirect.c          |    4 +-
 703  fs/ext4/inode.c             |  154 ++++++-------
 704  fs/ext4/mballoc.c           |   60 ++++--
 705  fs/ext4/namei.c             |   18 +-
 706  fs/ext4/page-io.c           |    2 +-
 707  fs/ext4/resize.c            |   17 +-
 708  fs/ext4/super.c             |   43 ++--
 709  fs/ext4/xattr.c             |    1 -
 710  fs/jbd2/journal.c           |    1 -
 711  fs/jbd2/transaction.c       |   11 -
 712  include/linux/jbd2.h        |    9 +-
 713  include/trace/events/ext4.h |  136 ++++++++++--
 714  21 files changed, 1213 insertions(+), 469 deletions(-)
 715  create mode 100644 fs/ext4/extents_status.c
 716  create mode 100644 fs/ext4/extents_status.h
 717 Merging fuse/for-next (8888785 fuse: remove unused variable in fuse_try_move_page())
 718 $ git merge fuse/for-next
 719 Merge made by the 'recursive' strategy.
 720  fs/Kconfig                |   10 --
 721  fs/fuse/Kconfig           |   16 ++-
 722  fs/fuse/cuse.c            |   10 +-
 723  fs/fuse/dev.c             |  122 ++++++++++++++++-------
 724  fs/fuse/dir.c             |  199 ++++++++++++++++++++++++++++++++-----
 725  fs/fuse/file.c            |  240 +++++++++++++++++++++++++++++----------------
 726  fs/fuse/fuse_i.h          |   58 ++++++++---
 727  fs/fuse/inode.c           |   11 ++-
 728  include/linux/fs.h        |    2 +-
 729  include/uapi/linux/fuse.h |   12 +++
 730  mm/filemap.c              |    2 +-
 731  11 files changed, 506 insertions(+), 176 deletions(-)
 732 Merging gfs2/master (9dbe961 GFS2: Add Orlov allocator)
 733 $ git merge gfs2/master
 734 Merge made by the 'recursive' strategy.
 735  fs/gfs2/aops.c       |    2 +-
 736  fs/gfs2/bmap.c       |    2 +-
 737  fs/gfs2/file.c       |    4 +-
 738  fs/gfs2/glock.c      |   14 ++--
 739  fs/gfs2/glock.h      |   54 +++++++--------
 740  fs/gfs2/glops.c      |   16 ++---
 741  fs/gfs2/incore.h     |    3 +-
 742  fs/gfs2/inode.c      |  182 +++++++++++++++++++++++++++-----------------------
 743  fs/gfs2/ops_fstype.c |    3 +
 744  fs/gfs2/quota.c      |    4 +-
 745  fs/gfs2/rgrp.c       |  134 +++++++++++++++++++++++++++++++++----
 746  fs/gfs2/rgrp.h       |    3 +-
 747  fs/gfs2/xattr.c      |    2 +-
 748  13 files changed, 275 insertions(+), 148 deletions(-)
 749 Merging jfs/jfs-next (4e7a4b0 jfs: Fix FITRIM argument handling)
 750 $ git merge jfs/jfs-next
 751 Already up-to-date.
 752 Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
 753 $ git merge logfs/master
 754 Merge made by the 'recursive' strategy.
 755  fs/logfs/dev_mtd.c |    2 +-
 756  1 file changed, 1 insertion(+), 1 deletion(-)
 757 Merging nfs/linux-next (8ede994 Merge branch 'bugfixes' into linux-next)
 758 $ git merge nfs/linux-next
 759 Merge made by the 'recursive' strategy.
 760  fs/lockd/clnt4xdr.c           |    8 --
 761  fs/lockd/clntproc.c           |    3 +-
 762  fs/lockd/clntxdr.c            |    8 --
 763  fs/lockd/host.c               |   15 +--
 764  fs/lockd/mon.c                |    3 -
 765  fs/nfs/cache_lib.c            |    1 -
 766  fs/nfs/callback_proc.c        |    1 -
 767  fs/nfs/client.c               |    6 +-
 768  fs/nfs/inode.c                |    4 +-
 769  fs/nfs/internal.h             |   12 --
 770  fs/nfs/mount_clnt.c           |    7 +-
 771  fs/nfs/nfs2xdr.c              |    4 +-
 772  fs/nfs/nfs3xdr.c              |    7 +-
 773  fs/nfs/nfs4_fs.h              |    5 +-
 774  fs/nfs/nfs4client.c           |    4 -
 775  fs/nfs/nfs4file.c             |    1 -
 776  fs/nfs/nfs4filelayout.c       |   43 +++----
 777  fs/nfs/nfs4filelayoutdev.c    |    2 -
 778  fs/nfs/nfs4proc.c             |  286 ++++++++++++++++-------------------------
 779  fs/nfs/nfs4state.c            |    5 +-
 780  fs/nfs/nfs4xdr.c              |    6 +-
 781  fs/nfs/objlayout/objlayout.c  |   11 --
 782  fs/nfs/pnfs.c                 |   17 +--
 783  fs/nfs/write.c                |   26 ++--
 784  include/linux/nfs_xdr.h       |    3 +-
 785  net/sunrpc/backchannel_rqst.c |    9 +-
 786  net/sunrpc/bc_svc.c           |    2 +-
 787  net/sunrpc/cache.c            |    4 +-
 788  net/sunrpc/clnt.c             |   45 ++++---
 789  net/sunrpc/rpc_pipe.c         |    9 +-
 790  net/sunrpc/rpcb_clnt.c        |    5 +-
 791  net/sunrpc/sched.c            |   27 +++-
 792  net/sunrpc/svc.c              |   12 +-
 793  net/sunrpc/svc_xprt.c         |   11 +-
 794  net/sunrpc/svcsock.c          |    6 +-
 795  net/sunrpc/xdr.c              |    5 +-
 796  net/sunrpc/xprtsock.c         |   13 +-
 797  37 files changed, 269 insertions(+), 367 deletions(-)
 798 Merging nfsd/nfsd-next (a0af710 nfsd: remove unused argument to nfs4_has_reclaimed_state)
 799 $ git merge nfsd/nfsd-next
 800 Auto-merging net/sunrpc/svc.c
 801 Merge made by the 'recursive' strategy.
 802  Documentation/filesystems/nfs/nfs41-server.txt |   16 +--
 803  fs/exportfs/expfs.c                            |    4 +-
 804  fs/fhandle.c                                   |    2 +-
 805  fs/nfsd/nfs4callback.c                         |   59 ++++++---
 806  fs/nfsd/nfs4proc.c                             |    6 +
 807  fs/nfsd/nfs4recover.c                          |    5 +-
 808  fs/nfsd/nfs4state.c                            |   39 ++++--
 809  fs/nfsd/nfs4xdr.c                              |  169 ++++++++++++++----------
 810  fs/nfsd/nfsfh.c                                |    4 +-
 811  fs/nfsd/state.h                                |   20 ++-
 812  fs/nfsd/vfs.c                                  |   26 +---
 813  fs/nfsd/xdr4.h                                 |    2 +
 814  include/linux/exportfs.h                       |    5 +
 815  net/sunrpc/svc.c                               |    5 +-
 816  14 files changed, 218 insertions(+), 144 deletions(-)
 817 Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
 818 $ git merge ocfs2/linux-next
 819 Auto-merging fs/ocfs2/cluster/heartbeat.c
 820 Merge made by the 'recursive' strategy.
 821  fs/ocfs2/cluster/heartbeat.c |   40 +++++++++-------------------------------
 822  fs/ocfs2/cluster/masklog.h   |    3 ++-
 823  fs/ocfs2/dlm/dlmmaster.c     |   10 ++++++++--
 824  fs/ocfs2/dlm/dlmrecovery.c   |    7 +++++++
 825  fs/ocfs2/symlink.c           |    2 +-
 826  5 files changed, 27 insertions(+), 35 deletions(-)
 827 Merging omfs/for-next (976d167 Linux 3.1-rc9)
 828 $ git merge omfs/for-next
 829 Already up-to-date.
 830 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
 831 $ git merge squashfs/master
 832 Already up-to-date.
 833 Merging v9fs/for-next (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
 834 $ git merge v9fs/for-next
 835 Merge made by the 'recursive' strategy.
 836 Merging ubifs/linux-next (a28ad42 UBIFS: fix mounting problems after power cuts)
 837 $ git merge ubifs/linux-next
 838 Merge made by the 'recursive' strategy.
 839  fs/ubifs/find.c   |   12 ++++++++++--
 840  fs/ubifs/lprops.c |    6 ++++++
 841  fs/ubifs/ubifs.h  |    3 +++
 842  3 files changed, 19 insertions(+), 2 deletions(-)
 843 Merging xfs/for-next (579b62f xfs: add background scanning to clear eofblocks inodes)
 844 $ git merge xfs/for-next
 845 Auto-merging fs/xfs/xfs_log_recover.c
 846 Auto-merging fs/xfs/xfs_log.c
 847 Auto-merging fs/xfs/xfs_iomap.c
 848 Auto-merging fs/xfs/xfs_ioctl.c
 849 Auto-merging fs/xfs/xfs_inode.c
 850 Removing fs/xfs/xfs_iget.c
 851 Auto-merging fs/xfs/xfs_icache.h
 852 Auto-merging fs/xfs/xfs_icache.c
 853 Auto-merging fs/xfs/xfs_ialloc.c
 854 Auto-merging fs/xfs/xfs_fsops.c
 855 Merge made by the 'recursive' strategy.
 856  Documentation/filesystems/xfs.txt   |   11 +-
 857  fs/xfs/Makefile                     |    3 +-
 858  fs/xfs/xfs_ag.h                     |    1 +
 859  fs/xfs/xfs_export.c                 |    1 +
 860  fs/xfs/xfs_file.c                   |   13 +-
 861  fs/xfs/xfs_fs.h                     |   33 +-
 862  fs/xfs/xfs_fsops.c                  |    4 +-
 863  fs/xfs/xfs_globals.c                |    4 +-
 864  fs/xfs/xfs_ialloc.c                 |    6 +-
 865  fs/xfs/{xfs_sync.c => xfs_icache.c} |  914 ++++++++++++++++++++++++-----------
 866  fs/xfs/{xfs_sync.h => xfs_icache.h} |   28 +-
 867  fs/xfs/xfs_iget.c                   |  705 ---------------------------
 868  fs/xfs/xfs_inode.c                  |  306 +++++++++++-
 869  fs/xfs/xfs_inode.h                  |   11 +-
 870  fs/xfs/xfs_ioctl.c                  |   21 +
 871  fs/xfs/xfs_iomap.c                  |   31 +-
 872  fs/xfs/xfs_iops.c                   |    4 +
 873  fs/xfs/xfs_itable.c                 |    1 +
 874  fs/xfs/xfs_linux.h                  |    1 +
 875  fs/xfs/xfs_log.c                    |  103 +++-
 876  fs/xfs/xfs_log.h                    |    4 +
 877  fs/xfs/xfs_log_priv.h               |    1 +
 878  fs/xfs/xfs_log_recover.c            |    1 +
 879  fs/xfs/xfs_mount.c                  |   33 +-
 880  fs/xfs/xfs_mount.h                  |    9 +-
 881  fs/xfs/xfs_qm.c                     |    1 +
 882  fs/xfs/xfs_qm_syscalls.c            |    6 +-
 883  fs/xfs/xfs_rtalloc.c                |    1 +
 884  fs/xfs/xfs_super.c                  |  148 ++++--
 885  fs/xfs/xfs_super.h                  |    1 +
 886  fs/xfs/xfs_sysctl.c                 |    9 +
 887  fs/xfs/xfs_sysctl.h                 |    1 +
 888  fs/xfs/xfs_trace.h                  |    6 +
 889  fs/xfs/xfs_vnodeops.c               |   30 +-
 890  fs/xfs/xfs_vnodeops.h               |    1 +
 891  35 files changed, 1305 insertions(+), 1148 deletions(-)
 892  rename fs/xfs/{xfs_sync.c => xfs_icache.c} (55%)
 893  rename fs/xfs/{xfs_sync.h => xfs_icache.h} (64%)
 894  delete mode 100644 fs/xfs/xfs_iget.c
 895 Merging vfs/for-next (a736427 missing const in alpha callers of do_mount())
 896 $ git merge vfs/for-next
 897 Auto-merging arch/alpha/kernel/osf_sys.c
 898 Merge made by the 'recursive' strategy.
 899  arch/alpha/kernel/osf_sys.c |    6 +++---
 900  1 file changed, 3 insertions(+), 3 deletions(-)
 901 Merging pci/next (0dcccc5 Merge branch 'pci/mike-x86-tra' into next)
 902 $ git merge pci/next
 903 Auto-merging drivers/pci/pci.c
 904 Auto-merging drivers/pci/pci-driver.c
 905 Merge made by the 'recursive' strategy.
 906  arch/x86/pci/acpi.c         |   46 ++++++++++--
 907  arch/x86/pci/common.c       |    2 +-
 908  drivers/acpi/pci_bind.c     |   10 +--
 909  drivers/acpi/pci_irq.c      |   17 +++--
 910  drivers/acpi/pci_root.c     |  165 +++++++++++++++++++++++++------------------
 911  drivers/pci/irq.c           |   10 +--
 912  drivers/pci/pci-driver.c    |    6 +-
 913  drivers/pci/pci-stub.c      |    2 +-
 914  drivers/pci/pci.c           |   33 +++++----
 915  drivers/pci/pcie/aspm.c     |    7 +-
 916  drivers/pci/probe.c         |   22 ++++++
 917  drivers/pci/quirks.c        |   39 ++++++++++
 918  drivers/pci/remove.c        |   36 ++++++++++
 919  drivers/pci/setup-bus.c     |   22 +-----
 920  include/acpi/acpi_drivers.h |    4 +-
 921  include/linux/pci.h         |    5 +-
 922  16 files changed, 286 insertions(+), 140 deletions(-)
 923 Merging hid/for-next (f61aaf1 Merge branch 'for-3.8/roccat' into for-next)
 924 $ git merge hid/for-next
 925 Auto-merging drivers/hid/hid-ids.h
 926 Auto-merging drivers/hid/hid-core.c
 927 Auto-merging drivers/hid/hid-apple.c
 928 Merge made by the 'recursive' strategy.
 929  .../ABI/obsolete/sysfs-driver-hid-roccat-koneplus  |   38 +++
 930  .../ABI/obsolete/sysfs-driver-hid-roccat-kovaplus  |   66 ++++
 931  .../ABI/obsolete/sysfs-driver-hid-roccat-pyra      |   73 ++++
 932  .../ABI/testing/sysfs-driver-hid-roccat-isku       |    8 +
 933  .../ABI/testing/sysfs-driver-hid-roccat-koneplus   |   48 +--
 934  .../ABI/testing/sysfs-driver-hid-roccat-kovaplus   |   69 +---
 935  .../ABI/testing/sysfs-driver-hid-roccat-lua        |    7 +
 936  .../ABI/testing/sysfs-driver-hid-roccat-pyra       |   76 +----
 937  .../ABI/testing/sysfs-driver-hid-roccat-savu       |    3 +-
 938  drivers/hid/Kconfig                                |    9 +
 939  drivers/hid/Makefile                               |    5 +-
 940  drivers/hid/hid-apple.c                            |    3 +-
 941  drivers/hid/hid-core.c                             |   13 +-
 942  drivers/hid/hid-icade.c                            |  259 +++++++++++++++
 943  drivers/hid/hid-ids.h                              |    6 +
 944  drivers/hid/hid-input.c                            |    9 +-
 945  drivers/hid/hid-roccat-isku.c                      |   44 +--
 946  drivers/hid/hid-roccat-isku.h                      |   78 +----
 947  drivers/hid/hid-roccat-koneplus.c                  |  348 ++++++--------------
 948  drivers/hid/hid-roccat-koneplus.h                  |  101 +-----
 949  drivers/hid/hid-roccat-kovaplus.c                  |  237 +++++++------
 950  drivers/hid/hid-roccat-kovaplus.h                  |   16 +-
 951  drivers/hid/hid-roccat-lua.c                       |  227 +++++++++++++
 952  drivers/hid/hid-roccat-lua.h                       |   29 ++
 953  drivers/hid/hid-roccat-pyra.c                      |  342 ++++++++-----------
 954  drivers/hid/hid-roccat-pyra.h                      |   24 +-
 955  drivers/hid/hid-roccat-savu.c                      |    4 +-
 956  27 files changed, 1209 insertions(+), 933 deletions(-)
 957  create mode 100644 Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus
 958  create mode 100644 Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra
 959  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-lua
 960  create mode 100644 drivers/hid/hid-icade.c
 961  create mode 100644 drivers/hid/hid-roccat-lua.c
 962  create mode 100644 drivers/hid/hid-roccat-lua.h
 963 Merging i2c/master (3d84243 i2c: Mention functionality flags in SMBus protocol documentation)
 964 $ git merge i2c/master
 965 Auto-merging MAINTAINERS
 966 Merge made by the 'recursive' strategy.
 967  Documentation/i2c/smbus-protocol    |   40 +++++++++++++++++------
 968  MAINTAINERS                         |   60 +++++++++++++++++++++++++++++------
 969  drivers/i2c/busses/i2c-i801.c       |   13 ++------
 970  drivers/i2c/busses/i2c-piix4.c      |    5 ++-
 971  drivers/i2c/muxes/i2c-mux-pinctrl.c |    2 +-
 972  5 files changed, 88 insertions(+), 32 deletions(-)
 973 Merging i2c-embedded/i2c-embedded/for-next (60f0a25 i2c: tegra: set irq name as device name)
 974 $ git merge i2c-embedded/i2c-embedded/for-next
 975 Merge made by the 'recursive' strategy.
 976 Merging jdelvare-hwmon/master (0cae218 hwmon: (it87) Support PECI for additional chips)
 977 $ git merge jdelvare-hwmon/master
 978 Merge made by the 'recursive' strategy.
 979  Documentation/hwmon/it87  |   10 +
 980  drivers/hwmon/it87.c      |  918 +++++++++++++++++++++++----------------------
 981  drivers/hwmon/w83627ehf.c |   99 ++++-
 982  drivers/hwmon/w83627hf.c  |   81 +++-
 983  4 files changed, 665 insertions(+), 443 deletions(-)
 984 Merging hwmon-staging/hwmon-next (d29d75d hwmon: (da9055) Fix chan_mux[DA9055_ADC_ADCIN3] setting)
 985 $ git merge hwmon-staging/hwmon-next
 986 Merge made by the 'recursive' strategy.
 987  Documentation/hwmon/ads7828           |   46 +++--
 988  Documentation/hwmon/coretemp          |    2 +
 989  Documentation/hwmon/da9055            |   47 +++++
 990  drivers/hwmon/Kconfig                 |   19 +-
 991  drivers/hwmon/Makefile                |    1 +
 992  drivers/hwmon/ads7828.c               |  247 ++++++++++--------------
 993  drivers/hwmon/coretemp.c              |   60 +++---
 994  drivers/hwmon/da9052-hwmon.c          |   27 +--
 995  drivers/hwmon/da9055-hwmon.c          |  336 +++++++++++++++++++++++++++++++++
 996  drivers/hwmon/ina2xx.c                |   13 +-
 997  include/linux/platform_data/ads7828.h |   29 +++
 998  11 files changed, 603 insertions(+), 224 deletions(-)
 999  create mode 100644 Documentation/hwmon/da9055
1000  create mode 100644 drivers/hwmon/da9055-hwmon.c
1001  create mode 100644 include/linux/platform_data/ads7828.h
1002 Merging v4l-dvb/master (54db30f Merge /home/v4l/v4l/patchwork)
1003 $ git merge v4l-dvb/master
1004 Removing include/linux/dvb/video.h
1005 Removing include/linux/dvb/dmx.h
1006 Removing include/linux/dvb/Kbuild
1007 Auto-merging MAINTAINERS
1008 Merge made by the 'recursive' strategy.
1009  Documentation/DocBook/media/v4l/io.xml             |    4 +-
1010  MAINTAINERS                                        |  173 +++++++++++++---
1011  drivers/hid/hid-picolcd_cir.c                      |    2 +-
1012  drivers/media/common/Kconfig                       |    7 +
1013  drivers/media/common/b2c2/Kconfig                  |    5 -
1014  drivers/media/common/siano/Kconfig                 |   18 +-
1015  drivers/media/common/siano/Makefile                |    6 +-
1016  drivers/media/common/siano/smscoreapi.c            |    2 +-
1017  drivers/media/common/siano/smsir.c                 |    2 +-
1018  drivers/media/common/siano/smsir.h                 |    9 +
1019  drivers/media/dvb-core/dmxdev.c                    |    2 +-
1020  drivers/media/dvb-core/dmxdev.h                    |    1 +
1021  drivers/media/dvb-core/dvb_frontend.c              |   10 -
1022  drivers/media/dvb-frontends/cx22700.c              |    4 +-
1023  drivers/media/dvb-frontends/cx24123.c              |    2 +-
1024  drivers/media/dvb-frontends/dib9000.h              |    2 +-
1025  drivers/media/dvb-frontends/drxd_hard.c            |    8 +-
1026  drivers/media/dvb-frontends/drxk_hard.c            |   24 +--
1027  drivers/media/dvb-frontends/drxk_hard.h            |    6 +-
1028  drivers/media/dvb-frontends/l64781.c               |    4 +-
1029  drivers/media/dvb-frontends/mt312.c                |    4 +-
1030  drivers/media/dvb-frontends/rtl2830.c              |    6 +-
1031  drivers/media/dvb-frontends/rtl2832.c              |    6 +-
1032  drivers/media/dvb-frontends/stb0899_drv.c          |    2 +-
1033  drivers/media/dvb-frontends/stv0367.c              |   19 +-
1034  drivers/media/dvb-frontends/stv0900_core.c         |    6 +-
1035  drivers/media/dvb-frontends/tda10071.c             |    6 +-
1036  drivers/media/dvb-frontends/tda18271c2dd.c         |    1 +
1037  drivers/media/firewire/firedtv.h                   |    1 +
1038  drivers/media/i2c/adv7183.c                        |   13 +-
1039  drivers/media/i2c/cx25840/cx25840-core.c           |    2 +-
1040  drivers/media/i2c/ir-kbd-i2c.c                     |   14 +-
1041  drivers/media/i2c/s5k4ecgx.c                       |    2 +-
1042  drivers/media/i2c/smiapp-pll.c                     |  215 +++++++++++---------
1043  drivers/media/i2c/smiapp-pll.h                     |   59 +++---
1044  drivers/media/i2c/smiapp/smiapp-core.c             |   68 +++----
1045  drivers/media/i2c/soc_camera/ov2640.c              |    6 +-
1046  drivers/media/i2c/vs6624.c                         |   13 +-
1047  drivers/media/mmc/siano/Kconfig                    |    3 +-
1048  drivers/media/pci/bt8xx/bttv-driver.c              |    7 +-
1049  drivers/media/pci/cx18/cx18-alsa-main.c            |    2 +-
1050  drivers/media/pci/cx18/cx18-alsa-pcm.c             |    1 +
1051  drivers/media/pci/cx18/cx18-i2c.c                  |    2 +-
1052  drivers/media/pci/cx18/cx18-streams.c              |    2 +-
1053  drivers/media/pci/cx23885/altera-ci.c              |   45 ++--
1054  drivers/media/pci/cx23885/cimax2.c                 |   17 +-
1055  drivers/media/pci/cx23885/cx23885-alsa.c           |    6 +-
1056  drivers/media/pci/cx23885/cx23885-av.c             |    1 +
1057  drivers/media/pci/cx23885/cx23885-cards.c          |    2 +-
1058  drivers/media/pci/cx23885/cx23885-core.c           |    8 +-
1059  drivers/media/pci/cx23885/cx23885-dvb.c            |    2 +-
1060  drivers/media/pci/cx23885/cx23885-f300.c           |    1 +
1061  drivers/media/pci/cx23885/cx23885-input.c          |    7 +-
1062  drivers/media/pci/cx23885/cx23885-input.h          |    2 +-
1063  drivers/media/pci/cx23885/cx23885-ioctl.c          |    2 +
1064  drivers/media/pci/cx23885/cx23885-ir.c             |    1 +
1065  drivers/media/pci/cx23885/cx23888-ir.c             |    1 +
1066  drivers/media/pci/cx23885/netup-init.c             |    1 +
1067  drivers/media/pci/cx25821/cx25821-audio-upstream.c |   16 +-
1068  drivers/media/pci/cx25821/cx25821-biffuncs.h       |    6 +-
1069  drivers/media/pci/cx25821/cx25821-i2c.c            |    4 +-
1070  .../media/pci/cx25821/cx25821-video-upstream-ch2.c |   24 ++-
1071  drivers/media/pci/cx25821/cx25821-video-upstream.c |   32 +--
1072  drivers/media/pci/cx25821/cx25821-video.c          |    8 +-
1073  drivers/media/pci/cx88/cx88-alsa.c                 |   14 +-
1074  drivers/media/pci/cx88/cx88-blackbird.c            |    7 +-
1075  drivers/media/pci/cx88/cx88-core.c                 |   12 +-
1076  drivers/media/pci/cx88/cx88-input.c                |    8 +-
1077  drivers/media/pci/cx88/cx88-mpeg.c                 |   18 +-
1078  drivers/media/pci/cx88/cx88.h                      |    4 +-
1079  drivers/media/pci/dm1105/dm1105.c                  |    4 +-
1080  drivers/media/pci/ivtv/ivtv-alsa-main.c            |    2 +-
1081  drivers/media/pci/ivtv/ivtv-alsa-pcm.c             |    6 +-
1082  drivers/media/pci/ivtv/ivtv-alsa-pcm.h             |    4 -
1083  drivers/media/pci/ivtv/ivtv-firmware.c             |    2 +-
1084  drivers/media/pci/ivtv/ivtv-i2c.c                  |    8 +-
1085  drivers/media/pci/ivtv/ivtv-ioctl.c                |    4 +-
1086  drivers/media/pci/mantis/mantis_input.c            |    5 +-
1087  drivers/media/pci/mantis/mantis_uart.c             |    2 +-
1088  drivers/media/pci/mantis/mantis_vp1033.c           |    6 +-
1089  drivers/media/pci/meye/meye.c                      |    2 +-
1090  drivers/media/pci/ngene/ngene-cards.c              |    4 +-
1091  drivers/media/pci/ngene/ngene-core.c               |    4 +-
1092  drivers/media/pci/saa7134/saa7134-core.c           |    3 +-
1093  drivers/media/pci/saa7134/saa7134-input.c          |    2 +-
1094  drivers/media/pci/saa7134/saa7134-video.c          |    2 +-
1095  drivers/media/pci/saa7164/saa7164-api.c            |   26 +--
1096  drivers/media/pci/saa7164/saa7164-bus.c            |    6 +-
1097  drivers/media/pci/saa7164/saa7164-cmd.c            |   16 +-
1098  drivers/media/pci/saa7164/saa7164-core.c           |    4 +-
1099  drivers/media/pci/saa7164/saa7164-encoder.c        |   15 +-
1100  drivers/media/pci/saa7164/saa7164-fw.c             |    8 +-
1101  drivers/media/pci/saa7164/saa7164-vbi.c            |    6 +-
1102  drivers/media/pci/ttpci/av7110.h                   |    1 +
1103  drivers/media/platform/blackfin/bfin_capture.c     |   14 +-
1104  drivers/media/platform/coda.c                      |    4 +-
1105  drivers/media/platform/exynos-gsc/gsc-core.c       |    8 +-
1106  drivers/media/platform/exynos-gsc/gsc-m2m.c        |    2 +-
1107  drivers/media/platform/fsl-viu.c                   |    6 +-
1108  drivers/media/platform/m2m-deinterlace.c           |   24 +--
1109  drivers/media/platform/mx2_emmaprp.c               |   14 +-
1110  drivers/media/platform/omap/omap_vout.c            |   36 +---
1111  drivers/media/platform/omap3isp/ispccdc.c          |    4 +-
1112  drivers/media/platform/omap3isp/ispstat.c          |    4 +-
1113  drivers/media/platform/omap3isp/ispstat.h          |    4 +-
1114  drivers/media/platform/omap3isp/ispvideo.c         |    2 +-
1115  drivers/media/platform/s5p-fimc/Kconfig            |    1 +
1116  drivers/media/platform/s5p-fimc/fimc-capture.c     |    4 +-
1117  drivers/media/platform/s5p-fimc/fimc-lite.c        |    4 +-
1118  drivers/media/platform/s5p-fimc/fimc-m2m.c         |    2 +-
1119  drivers/media/platform/s5p-fimc/fimc-mdevice.c     |   45 ++--
1120  drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |    2 +-
1121  drivers/media/platform/s5p-mfc/s5p_mfc_pm.c        |    2 +-
1122  drivers/media/platform/s5p-tv/mixer_video.c        |    1 -
1123  drivers/media/platform/soc_camera/soc_camera.c     |    4 +-
1124  drivers/media/platform/vivi.c                      |    1 -
1125  drivers/media/radio/radio-aimslab.c                |    2 +-
1126  drivers/media/radio/radio-isa.c                    |   10 +-
1127  drivers/media/radio/radio-sf16fmi.c                |    2 +-
1128  drivers/media/radio/radio-tea5764.c                |    4 +-
1129  drivers/media/radio/si4713-i2c.c                   |    2 +-
1130  drivers/media/radio/wl128x/fmdrv.h                 |    2 +-
1131  drivers/media/radio/wl128x/fmdrv_common.c          |    2 +-
1132  drivers/media/radio/wl128x/fmdrv_rx.c              |    2 +-
1133  drivers/media/rc/ati_remote.c                      |    2 +-
1134  drivers/media/rc/ene_ir.c                          |   33 ++-
1135  drivers/media/rc/fintek-cir.c                      |    6 +-
1136  drivers/media/rc/gpio-ir-recv.c                    |    2 +-
1137  drivers/media/rc/iguanair.c                        |    2 +-
1138  drivers/media/rc/imon.c                            |   40 ++--
1139  drivers/media/rc/ir-jvc-decoder.c                  |    4 +-
1140  drivers/media/rc/ir-lirc-codec.c                   |    4 +-
1141  drivers/media/rc/ir-mce_kbd-decoder.c              |    4 +-
1142  drivers/media/rc/ir-nec-decoder.c                  |    4 +-
1143  drivers/media/rc/ir-rc5-decoder.c                  |   14 +-
1144  drivers/media/rc/ir-rc5-sz-decoder.c               |    6 +-
1145  drivers/media/rc/ir-rc6-decoder.c                  |    8 +-
1146  drivers/media/rc/ir-rx51.c                         |   13 +-
1147  drivers/media/rc/ir-sanyo-decoder.c                |    4 +-
1148  drivers/media/rc/ir-sony-decoder.c                 |   17 +-
1149  drivers/media/rc/ite-cir.c                         |    6 +-
1150  drivers/media/rc/keymaps/rc-imon-mce.c             |    2 +-
1151  drivers/media/rc/keymaps/rc-rc6-mce.c              |    2 +-
1152  drivers/media/rc/mceusb.c                          |    2 +-
1153  drivers/media/rc/nuvoton-cir.c                     |   13 +-
1154  drivers/media/rc/nuvoton-cir.h                     |    1 -
1155  drivers/media/rc/rc-loopback.c                     |    2 +-
1156  drivers/media/rc/rc-main.c                         |   73 ++++---
1157  drivers/media/rc/redrat3.c                         |    2 +-
1158  drivers/media/rc/streamzap.c                       |    2 +-
1159  drivers/media/rc/ttusbir.c                         |    2 +-
1160  drivers/media/rc/winbond-cir.c                     |    6 +-
1161  drivers/media/tuners/max2165.c                     |    2 +-
1162  drivers/media/tuners/tua9001.c                     |    2 +-
1163  drivers/media/tuners/xc4000.c                      |    2 +-
1164  drivers/media/usb/au0828/au0828-cards.c            |    2 +-
1165  drivers/media/usb/au0828/au0828-dvb.c              |    5 +-
1166  drivers/media/usb/au0828/au0828-video.c            |   16 +-
1167  drivers/media/usb/cx231xx/cx231xx-avcore.c         |    9 +-
1168  drivers/media/usb/cx231xx/cx231xx-cards.c          |    8 +-
1169  drivers/media/usb/cx231xx/cx231xx-i2c.c            |    4 +-
1170  drivers/media/usb/cx231xx/cx231xx-input.c          |    2 +-
1171  drivers/media/usb/dvb-usb-v2/af9015.c              |    2 +-
1172  drivers/media/usb/dvb-usb-v2/af9035.c              |    4 +-
1173  drivers/media/usb/dvb-usb-v2/anysee.c              |    4 +-
1174  drivers/media/usb/dvb-usb-v2/az6007.c              |    2 +-
1175  drivers/media/usb/dvb-usb-v2/dvb_usb.h             |    2 +-
1176  drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        |   14 +-
1177  drivers/media/usb/dvb-usb-v2/it913x.c              |   12 +-
1178  drivers/media/usb/dvb-usb-v2/lmedm04.c             |    4 +-
1179  drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |    4 +-
1180  drivers/media/usb/dvb-usb-v2/usb_urb.c             |    8 +-
1181  drivers/media/usb/dvb-usb/az6027.c                 |   11 +-
1182  drivers/media/usb/dvb-usb/dib0700.h                |    2 +-
1183  drivers/media/usb/dvb-usb/dib0700_core.c           |   16 +-
1184  drivers/media/usb/dvb-usb/dib0700_devices.c        |  146 ++++++-------
1185  drivers/media/usb/dvb-usb/dvb-usb.h                |    2 +-
1186  drivers/media/usb/dvb-usb/pctv452e.c               |    4 +-
1187  drivers/media/usb/dvb-usb/technisat-usb2.c         |    2 +-
1188  drivers/media/usb/dvb-usb/ttusb2.c                 |    2 +-
1189  drivers/media/usb/dvb-usb/vp702x.c                 |    8 +-
1190  drivers/media/usb/em28xx/em28xx-cards.c            |   15 +-
1191  drivers/media/usb/em28xx/em28xx-dvb.c              |   84 +++++++-
1192  drivers/media/usb/em28xx/em28xx-input.c            |   16 +-
1193  drivers/media/usb/em28xx/em28xx.h                  |    1 +
1194  drivers/media/usb/gspca/gspca.c                    |    3 +-
1195  drivers/media/usb/gspca/gspca.h                    |    2 +-
1196  drivers/media/usb/gspca/jeilinj.c                  |    6 +-
1197  drivers/media/usb/gspca/m5602/m5602_s5k4aa.c       |    6 +
1198  drivers/media/usb/hdpvr/hdpvr-i2c.c                |    2 +-
1199  drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c       |    4 +-
1200  drivers/media/usb/pvrusb2/pvrusb2-v4l2.c           |    4 +-
1201  drivers/media/usb/pwc/pwc-if.c                     |    8 +-
1202  drivers/media/usb/s2255/s2255drv.c                 |    2 +-
1203  drivers/media/usb/siano/Kconfig                    |    3 +-
1204  drivers/media/usb/stk1160/stk1160-i2c.c            |    2 +-
1205  drivers/media/usb/tlg2300/pd-dvb.c                 |    1 +
1206  drivers/media/usb/tlg2300/pd-video.c               |    4 +-
1207  drivers/media/usb/tm6000/tm6000-input.c            |   20 +-
1208  drivers/media/usb/usbvision/usbvision.h            |    2 +-
1209  drivers/media/usb/zr364xx/zr364xx.c                |    3 +-
1210  drivers/media/v4l2-core/v4l2-common.c              |    3 +-
1211  drivers/media/v4l2-core/v4l2-mem2mem.c             |    6 +-
1212  drivers/staging/media/dt3155v4l/dt3155v4l.c        |    4 +-
1213  drivers/staging/media/go7007/go7007-v4l2.c         |    2 +-
1214  drivers/staging/media/go7007/s2250-board.c         |   13 +-
1215  drivers/staging/media/go7007/wis-ov7640.c          |   13 +-
1216  drivers/staging/media/go7007/wis-saa7113.c         |   13 +-
1217  drivers/staging/media/go7007/wis-saa7115.c         |   13 +-
1218  drivers/staging/media/go7007/wis-sony-tuner.c      |   13 +-
1219  drivers/staging/media/go7007/wis-tw2804.c          |   13 +-
1220  drivers/staging/media/go7007/wis-tw9903.c          |   13 +-
1221  drivers/staging/media/go7007/wis-uda1342.c         |   13 +-
1222  drivers/staging/media/lirc/lirc_serial.c           |    6 +-
1223  include/linux/dvb/dmx.h                            |   29 ---
1224  include/linux/dvb/video.h                          |   29 ---
1225  include/media/ir-kbd-i2c.h                         |    2 +-
1226  include/media/rc-core.h                            |    4 +-
1227  include/media/rc-map.h                             |   64 ++++--
1228  include/uapi/linux/videodev2.h                     |    2 +-
1229  220 files changed, 1242 insertions(+), 1134 deletions(-)
1230  delete mode 100644 include/linux/dvb/Kbuild
1231  delete mode 100644 include/linux/dvb/dmx.h
1232  delete mode 100644 include/linux/dvb/video.h
1233 $ git reset --hard HEAD^
1234 HEAD is now at a7d53a7 Merge remote-tracking branch 'hwmon-staging/hwmon-next'
1235 Merging refs/next/20121026/v4l-dvb
1236 $ git merge refs/next/20121026/v4l-dvb
1237 Already up-to-date!
1238 Merge made by the 'recursive' strategy.
1239 Merging kbuild/for-next (c582d2a Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
1240 $ git merge kbuild/for-next
1241 Already up-to-date!
1242 Merge made by the 'recursive' strategy.
1243 Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
1244 $ git merge kconfig/for-next
1245 Already up-to-date.
1246 Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
1247 $ git merge libata/NEXT
1248 Already up-to-date.
1249 Merging infiniband/for-next (1e3474d Merge branches 'cxgb4' and 'mlx4' into for-next)
1250 $ git merge infiniband/for-next
1251 Already up-to-date.
1252 Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
1253 $ git merge pstore/master
1254 Already up-to-date.
1255 Merging acpi/next (afee985 tools/power turbostat: print Processor TDP in Watts, when available)
1256 $ git merge acpi/next
1257 Merge made by the 'recursive' strategy.
1258  arch/x86/include/asm/msr-index.h                |   35 ++++++
1259  tools/power/x86/turbostat/Makefile              |    7 +-
1260  tools/power/x86/turbostat/turbostat.c           |  145 ++++++++++++++++++-----
1261  tools/power/x86/x86_energy_perf_policy/Makefile |    6 +-
1262  4 files changed, 161 insertions(+), 32 deletions(-)
1263 Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
1264 $ git merge cpuidle/cpuidle-next
1265 Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
1266 Resolved 'include/linux/cpuidle.h' using previous resolution.
1267 Auto-merging include/linux/cpuidle.h
1268 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
1269 Auto-merging drivers/cpuidle/coupled.c
1270 CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
1271 Automatic merge failed; fix conflicts and then commit the result.
1272 $ git commit -v -a
1273 [master 9f477e9] Merge remote-tracking branch 'cpuidle/cpuidle-next'
1274 $ git diff -M --stat --summary HEAD^..
1275 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
1276 $ git merge cpupowerutils/master
1277 Already up-to-date.
1278 Merging thermal/next (160b7d8 Thermal: Remove the cooling_cpufreq_list.)
1279 $ git merge thermal/next
1280 Merge made by the 'recursive' strategy.
1281  Documentation/thermal/sysfs-api.txt                |   64 ++
1282  drivers/acpi/thermal.c                             |    6 +-
1283  drivers/platform/x86/acerhdf.c                     |    2 +-
1284  drivers/platform/x86/intel_mid_thermal.c           |    2 +-
1285  drivers/power/power_supply_core.c                  |    2 +-
1286  drivers/staging/omap-thermal/omap-thermal-common.c |    2 +-
1287  drivers/thermal/Kconfig                            |   49 ++
1288  drivers/thermal/Makefile                           |    3 +
1289  drivers/thermal/cpu_cooling.c                      |  103 +--
1290  drivers/thermal/exynos_thermal.c                   |    2 +-
1291  drivers/thermal/fair_share.c                       |  133 ++++
1292  drivers/thermal/rcar_thermal.c                     |   20 +-
1293  drivers/thermal/spear_thermal.c                    |    2 +-
1294  drivers/thermal/step_wise.c                        |  194 ++++++
1295  drivers/thermal/thermal_core.h                     |   53 ++
1296  drivers/thermal/thermal_sys.c                      |  700 +++++++++++++-------
1297  drivers/thermal/user_space.c                       |   68 ++
1298  include/linux/thermal.h                            |  128 +++-
1299  18 files changed, 1152 insertions(+), 381 deletions(-)
1300  create mode 100644 drivers/thermal/fair_share.c
1301  create mode 100644 drivers/thermal/step_wise.c
1302  create mode 100644 drivers/thermal/thermal_core.h
1303  create mode 100644 drivers/thermal/user_space.c
1304 Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
1305 $ git merge ieee1394/for-next
1306 Already up-to-date.
1307 Merging ubi/linux-next (6a059ab UBI: use list_move_tail instead of list_del/list_add_tail)
1308 $ git merge ubi/linux-next
1309 Merge made by the 'recursive' strategy.
1310  drivers/mtd/ubi/fastmap.c |    6 ++----
1311  1 file changed, 2 insertions(+), 4 deletions(-)
1312 Merging dlm/next (a3de56b fs/dlm: remove CONFIG_EXPERIMENTAL)
1313 $ git merge dlm/next
1314 Merge made by the 'recursive' strategy.
1315  fs/dlm/Kconfig    |    2 +-
1316  fs/dlm/lowcomms.c |    5 ++---
1317  2 files changed, 3 insertions(+), 4 deletions(-)
1318 Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
1319 $ git merge swiotlb/linux-next
1320 Merge made by the 'recursive' strategy.
1321  drivers/xen/swiotlb-xen.c |   25 ++---
1322  include/linux/swiotlb.h   |   20 ++--
1323  lib/swiotlb.c             |  269 +++++++++++++++++++++++----------------------
1324  3 files changed, 163 insertions(+), 151 deletions(-)
1325 Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
1326 $ git merge scsi/for-next
1327 Already up-to-date.
1328 Merging target-updates/for-next (3735648 target: Update copyright information to 2012)
1329 $ git merge target-updates/for-next
1330 Merge made by the 'recursive' strategy.
1331  drivers/infiniband/ulp/srpt/ib_srpt.c        |   43 +-
1332  drivers/scsi/qla2xxx/tcm_qla2xxx.c           |    4 +-
1333  drivers/target/iscsi/iscsi_target.c          |   82 +-
1334  drivers/target/iscsi/iscsi_target_core.h     |    2 +-
1335  drivers/target/iscsi/iscsi_target_erl1.c     |   11 +-
1336  drivers/target/iscsi/iscsi_target_erl2.c     |    2 +-
1337  drivers/target/iscsi/iscsi_target_login.c    |   12 +-
1338  drivers/target/iscsi/iscsi_target_nego.c     |   10 +-
1339  drivers/target/iscsi/iscsi_target_tmr.c      |    4 +-
1340  drivers/target/iscsi/iscsi_target_tq.c       |    3 +-
1341  drivers/target/iscsi/iscsi_target_util.c     |    8 +-
1342  drivers/target/loopback/tcm_loop.h           |    1 -
1343  drivers/target/sbp/Kconfig                   |    2 +-
1344  drivers/target/target_core_alua.c            |  348 +++-----
1345  drivers/target/target_core_alua.h            |    9 +-
1346  drivers/target/target_core_configfs.c        |  691 +++++----------
1347  drivers/target/target_core_device.c          |  711 +++++++--------
1348  drivers/target/target_core_fabric_configfs.c |   21 +-
1349  drivers/target/target_core_fabric_lib.c      |    5 +-
1350  drivers/target/target_core_file.c            |  192 ++--
1351  drivers/target/target_core_file.h            |    2 +
1352  drivers/target/target_core_hba.c             |   11 +-
1353  drivers/target/target_core_iblock.c          |  338 +++----
1354  drivers/target/target_core_iblock.h          |    1 +
1355  drivers/target/target_core_internal.h        |   16 +-
1356  drivers/target/target_core_pr.c              | 1227 +++++++++++---------------
1357  drivers/target/target_core_pr.h              |   10 +-
1358  drivers/target/target_core_pscsi.c           |  351 +++-----
1359  drivers/target/target_core_pscsi.h           |    2 +-
1360  drivers/target/target_core_rd.c              |  128 +--
1361  drivers/target/target_core_rd.h              |    1 +
1362  drivers/target/target_core_sbc.c             |  158 ++--
1363  drivers/target/target_core_spc.c             |  574 ++++++++----
1364  drivers/target/target_core_stat.c            |  314 ++-----
1365  drivers/target/target_core_tmr.c             |   11 +-
1366  drivers/target/target_core_tpg.c             |    7 +-
1367  drivers/target/target_core_transport.c       |  642 ++++----------
1368  drivers/target/target_core_ua.c              |   22 +-
1369  drivers/target/target_core_ua.h              |    2 +-
1370  drivers/vhost/tcm_vhost.c                    |    4 -
1371  include/target/target_core_backend.h         |   46 +-
1372  include/target/target_core_base.h            |  207 ++---
1373  include/target/target_core_fabric.h          |   13 +-
1374  43 files changed, 2548 insertions(+), 3700 deletions(-)
1375 Merging target-merge/for-next-merge (6f0c058 Linux 3.7-rc2)
1376 $ git merge target-merge/for-next-merge
1377 Already up-to-date.
1378 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
1379 $ git merge ibft/linux-next
1380 Already up-to-date.
1381 Merging isci/all (6734092 isci: add a couple __iomem annotations)
1382 $ git merge isci/all
1383 Already up-to-date.
1384 Merging slave-dma/next (8007644 async_tx: use memchr_inv)
1385 $ git merge slave-dma/next
1386 Merge made by the 'recursive' strategy.
1387  Documentation/devicetree/bindings/dma/snps-dma.txt |   44 ++++++
1388  arch/arm/boot/dts/spear1340.dtsi                   |   19 +++
1389  arch/arm/boot/dts/spear13xx.dtsi                   |   38 +++++
1390  arch/arm/mach-spear13xx/include/mach/spear.h       |    2 -
1391  arch/arm/mach-spear13xx/spear1310.c                |    4 +-
1392  arch/arm/mach-spear13xx/spear1340.c                |   27 +---
1393  arch/arm/mach-spear13xx/spear13xx.c                |   54 +------
1394  crypto/async_tx/async_xor.c                        |    4 +-
1395  drivers/dma/Kconfig                                |    3 +-
1396  drivers/dma/amba-pl08x.c                           |    8 +-
1397  drivers/dma/at_hdmac_regs.h                        |    8 +-
1398  drivers/dma/dmatest.c                              |   16 +-
1399  drivers/dma/dw_dmac.c                              |  167 +++++++++++++++++---
1400  drivers/dma/dw_dmac_regs.h                         |    6 +
1401  drivers/dma/iop-adma.c                             |   45 +++---
1402  drivers/dma/mv_xor.c                               |   62 ++++----
1403  drivers/dma/pch_dma.c                              |   13 +-
1404  include/linux/dmaengine.h                          |   18 +--
1405  include/linux/dw_dmac.h                            |   45 ++++--
1406  19 files changed, 362 insertions(+), 221 deletions(-)
1407 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
1408 $ git merge dmaengine/next
1409 Already up-to-date.
1410 Merging net-next/master (9fafd65 ipv6 ndisc: Use pre-defined in6addr_linklocal_allnodes.)
1411 $ git merge net-next/master
1412 Removing kernel/time/timecompare.c
1413 Auto-merging include/uapi/linux/hdlc/ioctl.h
1414 Removing include/linux/timecompare.h
1415 Auto-merging drivers/vhost/tcm_vhost.c
1416 Removing drivers/net/ethernet/cadence/at91_ether.h
1417 Auto-merging arch/cris/include/uapi/asm/socket.h
1418 Removing arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1419 Auto-merging MAINTAINERS
1420 Merge made by the 'recursive' strategy.
1421  Documentation/ABI/testing/sysfs-bus-mdio           |    9 +
1422  .../devicetree/bindings/net/cdns-emac.txt          |   23 +
1423  Documentation/devicetree/bindings/net/cpsw.txt     |   20 +-
1424  Documentation/networking/batman-adv.txt            |    3 +-
1425  Documentation/networking/ip-sysctl.txt             |   14 +
1426  Documentation/networking/packet_mmap.txt           |  246 +++-
1427  MAINTAINERS                                        |    3 +
1428  arch/alpha/include/asm/socket.h                    |    1 +
1429  arch/arm/boot/dts/imx6q.dtsi                       |    5 +-
1430  arch/arm/mach-at91/Kconfig                         |    4 -
1431  arch/arm/mach-at91/board-csb337.c                  |    2 +
1432  arch/arm/mach-at91/include/mach/at91rm9200_emac.h  |  138 --
1433  arch/arm/mach-imx/mach-imx6q.c                     |   12 +
1434  arch/avr32/Kconfig                                 |    1 -
1435  arch/avr32/include/uapi/asm/socket.h               |    1 +
1436  arch/cris/include/uapi/asm/socket.h                |    1 +
1437  arch/frv/include/uapi/asm/socket.h                 |    1 +
1438  arch/h8300/include/asm/socket.h                    |    1 +
1439  arch/ia64/include/uapi/asm/socket.h                |    1 +
1440  arch/m32r/include/asm/socket.h                     |    1 +
1441  arch/m68k/include/uapi/asm/socket.h                |    1 +
1442  arch/mips/include/uapi/asm/socket.h                |    1 +
1443  arch/mn10300/include/uapi/asm/socket.h             |    1 +
1444  arch/parisc/include/uapi/asm/socket.h              |    1 +
1445  arch/powerpc/include/uapi/asm/socket.h             |    1 +
1446  arch/s390/include/uapi/asm/socket.h                |    1 +
1447  arch/sparc/include/uapi/asm/socket.h               |    1 +
1448  arch/sparc/net/bpf_jit_comp.c                      |   19 +
1449  arch/x86/net/bpf_jit_comp.c                        |   21 +
1450  arch/xtensa/include/uapi/asm/socket.h              |    1 +
1451  drivers/isdn/hardware/mISDN/hfcpci.c               |    2 +-
1452  drivers/isdn/hardware/mISDN/mISDNisar.c            |    2 +-
1453  drivers/isdn/hisax/callc.c                         |    2 +-
1454  drivers/isdn/hisax/hfc_pci.c                       |    2 +-
1455  drivers/isdn/hisax/hfc_sx.c                        |    2 +-
1456  drivers/isdn/mISDN/l1oip_core.c                    |    5 +-
1457  drivers/isdn/pcbit/layer2.c                        |    2 +-
1458  drivers/net/ethernet/adi/Kconfig                   |    2 +-
1459  drivers/net/ethernet/adi/bfin_mac.c                |  259 +++-
1460  drivers/net/ethernet/adi/bfin_mac.h                |   13 +-
1461  drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |  132 +-
1462  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  460 ++++---
1463  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   87 +-
1464  drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c    |    8 +-
1465  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    4 +-
1466  drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |   21 +-
1467  .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h   |   29 +-
1468  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |    2 +-
1469  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h   |    3 +-
1470  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  837 +++++++-----
1471  drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |   16 +
1472  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |   59 +-
1473  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   12 +
1474  drivers/net/ethernet/broadcom/tg3.c                |   17 +-
1475  drivers/net/ethernet/broadcom/tg3.h                |    2 +
1476  drivers/net/ethernet/cadence/Kconfig               |    9 +-
1477  drivers/net/ethernet/cadence/at91_ether.c          | 1276 ++++---------------
1478  drivers/net/ethernet/cadence/at91_ether.h          |  112 --
1479  drivers/net/ethernet/cadence/macb.c                |  524 +++++---
1480  drivers/net/ethernet/cadence/macb.h                |   50 +-
1481  drivers/net/ethernet/calxeda/xgmac.c               |   59 +-
1482  drivers/net/ethernet/chelsio/cxgb3/common.h        |    7 +-
1483  drivers/net/ethernet/dlink/dl2k.c                  |   16 +-
1484  drivers/net/ethernet/emulex/benet/be.h             |   51 +-
1485  drivers/net/ethernet/emulex/benet/be_cmds.c        |  409 +++++-
1486  drivers/net/ethernet/emulex/benet/be_cmds.h        |  177 ++-
1487  drivers/net/ethernet/emulex/benet/be_ethtool.c     |   80 +-
1488  drivers/net/ethernet/emulex/benet/be_hw.h          |   20 +-
1489  drivers/net/ethernet/emulex/benet/be_main.c        |  779 +++++++-----
1490  drivers/net/ethernet/emulex/benet/be_roce.c        |    5 +-
1491  drivers/net/ethernet/freescale/Kconfig             |    9 +
1492  drivers/net/ethernet/freescale/Makefile            |    1 +
1493  drivers/net/ethernet/freescale/fec.c               |  161 +--
1494  drivers/net/ethernet/freescale/fec.h               |  119 ++
1495  drivers/net/ethernet/freescale/fec_ptp.c           |  383 ++++++
1496  drivers/net/ethernet/freescale/gianfar.c           |   14 +-
1497  drivers/net/ethernet/ibm/emac/mal.c                |    6 +-
1498  drivers/net/ethernet/intel/Kconfig                 |   28 +-
1499  drivers/net/ethernet/intel/e1000/e1000_hw.c        |   17 +-
1500  drivers/net/ethernet/intel/e1000e/netdev.c         |   11 +
1501  drivers/net/ethernet/intel/igb/Makefile            |    4 +-
1502  drivers/net/ethernet/intel/igb/e1000_82575.c       |   20 +-
1503  drivers/net/ethernet/intel/igb/e1000_82575.h       |    3 +
1504  drivers/net/ethernet/intel/igb/e1000_defines.h     |   14 +
1505  drivers/net/ethernet/intel/igb/e1000_i210.c        |   94 ++
1506  drivers/net/ethernet/intel/igb/e1000_i210.h        |   11 +
1507  drivers/net/ethernet/intel/igb/e1000_mac.c         |    4 +
1508  drivers/net/ethernet/intel/igb/e1000_mac.h         |    1 +
1509  drivers/net/ethernet/intel/igb/e1000_nvm.c         |   71 ++
1510  drivers/net/ethernet/intel/igb/e1000_nvm.h         |   16 +
1511  drivers/net/ethernet/intel/igb/e1000_phy.c         |   49 +-
1512  drivers/net/ethernet/intel/igb/igb.h               |   76 +-
1513  drivers/net/ethernet/intel/igb/igb_ethtool.c       |   55 +-
1514  drivers/net/ethernet/intel/igb/igb_main.c          | 1340 ++++++++++++--------
1515  drivers/net/ethernet/intel/igb/igb_ptp.c           |   55 +-
1516  drivers/net/ethernet/intel/igbvf/netdev.c          |   13 +
1517  drivers/net/ethernet/intel/ixgbe/Makefile          |    3 +-
1518  drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   14 +-
1519  drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |  158 ++-
1520  drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |   73 +-
1521  drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    1 +
1522  drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |  104 +-
1523  drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c      |    4 +
1524  drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |   22 +-
1525  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  277 ++--
1526  drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h       |   31 +-
1527  drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |  124 +-
1528  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |  469 ++++---
1529  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    1 +
1530  drivers/net/ethernet/intel/ixgbevf/defines.h       |    7 +-
1531  drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    4 +-
1532  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |  225 +++-
1533  drivers/net/ethernet/intel/ixgbevf/mbx.h           |   10 +
1534  drivers/net/ethernet/intel/ixgbevf/vf.c            |   61 +
1535  drivers/net/ethernet/intel/ixgbevf/vf.h            |    2 +
1536  drivers/net/ethernet/marvell/pxa168_eth.c          |    7 +-
1537  drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    2 +-
1538  drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |    2 +-
1539  drivers/net/ethernet/micrel/ksz884x.c              |   13 +-
1540  drivers/net/ethernet/neterion/s2io.c               |    3 +-
1541  drivers/net/ethernet/oki-semi/pch_gbe/Kconfig      |   16 -
1542  drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h    |    2 -
1543  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |   14 -
1544  .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |   93 +-
1545  drivers/net/ethernet/qlogic/qla3xxx.c              |   16 +-
1546  drivers/net/ethernet/qlogic/qlge/qlge_dbg.c        |   16 +-
1547  drivers/net/ethernet/realtek/atp.c                 |   58 +-
1548  drivers/net/ethernet/realtek/atp.h                 |    2 -
1549  drivers/net/ethernet/realtek/r8169.c               |  110 +-
1550  drivers/net/ethernet/renesas/sh_eth.c              |    2 +-
1551  drivers/net/ethernet/sfc/Kconfig                   |    8 +-
1552  drivers/net/ethernet/sfc/Makefile                  |    3 +-
1553  drivers/net/ethernet/sfc/net_driver.h              |    2 -
1554  drivers/net/ethernet/sfc/nic.h                     |   26 -
1555  drivers/net/ethernet/ti/Kconfig                    |    8 +
1556  drivers/net/ethernet/ti/Makefile                   |    2 +-
1557  drivers/net/ethernet/ti/cpsw.c                     |  412 +++++-
1558  drivers/net/ethernet/ti/cpsw_ale.c                 |   31 +-
1559  drivers/net/ethernet/ti/cpsw_ale.h                 |    1 +
1560  drivers/net/ethernet/ti/cpts.c                     |  427 +++++++
1561  drivers/net/ethernet/ti/cpts.h                     |  146 +++
1562  drivers/net/hyperv/rndis_filter.c                  |    5 -
1563  drivers/net/irda/sh_irda.c                         |    4 -
1564  drivers/net/netconsole.c                           |    6 +
1565  drivers/net/phy/mdio_bus.c                         |   14 +
1566  drivers/net/ppp/ppp_generic.c                      |    2 +-
1567  drivers/net/tun.c                                  |  840 ++++++++----
1568  drivers/net/usb/Kconfig                            |   22 +
1569  drivers/net/usb/Makefile                           |    1 +
1570  drivers/net/usb/asix_common.c                      |  117 +-
1571  drivers/net/usb/cdc_mbim.c                         |  412 ++++++
1572  drivers/net/usb/cdc_ncm.c                          |  645 +++++-----
1573  drivers/net/usb/dm9601.c                           |  107 +-
1574  drivers/net/usb/int51x1.c                          |   52 +-
1575  drivers/net/usb/mcs7830.c                          |   85 +-
1576  drivers/net/usb/net1080.c                          |  110 +-
1577  drivers/net/usb/plusb.c                            |   11 +-
1578  drivers/net/usb/sierra_net.c                       |   47 +-
1579  drivers/net/usb/smsc75xx.c                         |  297 +++--
1580  drivers/net/usb/smsc95xx.c                         |  343 +++--
1581  drivers/net/usb/smsc95xx.h                         |    5 +
1582  drivers/net/usb/usbnet.c                           |  196 +++
1583  drivers/net/veth.c                                 |    1 +
1584  drivers/net/virtio_net.c                           |   12 +-
1585  drivers/net/vmxnet3/vmxnet3_drv.c                  |    2 +-
1586  drivers/net/vxlan.c                                |    3 +
1587  drivers/net/wan/Makefile                           |    4 +-
1588  drivers/net/wan/wanxlfw.S                          |    1 +
1589  drivers/pps/Kconfig                                |    1 -
1590  drivers/ptp/Kconfig                                |   19 +-
1591  drivers/ptp/ptp_chardev.c                          |   32 +
1592  drivers/vhost/net.c                                |  111 +-
1593  drivers/vhost/tcm_vhost.c                          |    1 +
1594  drivers/vhost/vhost.c                              |   52 +-
1595  drivers/vhost/vhost.h                              |   11 +-
1596  include/linux/etherdevice.h                        |   20 +
1597  include/linux/filter.h                             |    3 +
1598  include/linux/hdlc/Kbuild                          |    1 -
1599  include/linux/ktime.h                              |   19 +
1600  include/linux/netdevice.h                          |   10 +
1601  include/linux/platform_data/cpsw.h                 |    4 +
1602  include/linux/platform_data/macb.h                 |    1 +
1603  include/linux/rtnetlink.h                          |    3 +
1604  include/linux/skbuff.h                             |    7 +-
1605  include/linux/timecompare.h                        |  125 --
1606  include/linux/usb/cdc_ncm.h                        |  134 ++
1607  include/linux/usb/usbnet.h                         |   10 +
1608  include/net/af_unix.h                              |    1 -
1609  include/net/cls_cgroup.h                           |    6 +-
1610  include/net/ip6_fib.h                              |   20 +-
1611  include/net/ip_vs.h                                |  195 ++-
1612  include/net/netns/sctp.h                           |    3 +
1613  include/net/request_sock.h                         |   12 +-
1614  include/net/route.h                                |    9 +-
1615  include/net/sctp/command.h                         |   38 +-
1616  include/net/sctp/constants.h                       |    8 -
1617  include/net/sctp/structs.h                         |    1 +
1618  include/net/sctp/ulpqueue.h                        |    2 +-
1619  include/uapi/asm-generic/socket.h                  |    1 +
1620  include/uapi/linux/filter.h                        |    4 +-
1621  include/uapi/linux/hdlc/Kbuild                     |    1 +
1622  include/{ => uapi}/linux/hdlc/ioctl.h              |    7 +-
1623  include/uapi/linux/if_bridge.h                     |   18 +
1624  include/uapi/linux/if_ether.h                      |    1 +
1625  include/uapi/linux/if_packet.h                     |    1 +
1626  include/uapi/linux/if_tun.h                        |    5 +
1627  include/uapi/linux/if_tunnel.h                     |   14 +
1628  include/uapi/linux/inet_diag.h                     |    3 +-
1629  include/uapi/linux/netconf.h                       |   23 +
1630  include/uapi/linux/ptp_clock.h                     |   14 +
1631  include/uapi/linux/rtnetlink.h                     |    9 +
1632  include/uapi/linux/unix_diag.h                     |    1 +
1633  include/uapi/linux/usb/cdc.h                       |   23 +
1634  kernel/time/Makefile                               |    2 +-
1635  kernel/time/timecompare.c                          |  193 ---
1636  net/8021q/vlan.c                                   |    2 +-
1637  net/8021q/vlan_dev.c                               |   12 +-
1638  net/batman-adv/Kconfig                             |   10 +
1639  net/batman-adv/Makefile                            |    1 +
1640  net/batman-adv/bat_iv_ogm.c                        |   51 +-
1641  net/batman-adv/bitarray.c                          |   23 +-
1642  net/batman-adv/bridge_loop_avoidance.c             |   36 +-
1643  net/batman-adv/debugfs.c                           |   26 +-
1644  net/batman-adv/distributed-arp-table.c             | 1066 ++++++++++++++++
1645  net/batman-adv/distributed-arp-table.h             |  167 +++
1646  net/batman-adv/gateway_client.c                    |   19 +-
1647  net/batman-adv/hard-interface.c                    |    7 +-
1648  net/batman-adv/icmp_socket.c                       |   16 +-
1649  net/batman-adv/main.c                              |   55 +-
1650  net/batman-adv/main.h                              |   32 +-
1651  net/batman-adv/originator.c                        |   21 +-
1652  net/batman-adv/packet.h                            |   68 +-
1653  net/batman-adv/routing.c                           |  105 +-
1654  net/batman-adv/send.c                              |    4 +
1655  net/batman-adv/soft-interface.c                    |   84 +-
1656  net/batman-adv/sysfs.c                             |   56 +-
1657  net/batman-adv/translation-table.c                 |   97 +-
1658  net/batman-adv/translation-table.h                 |    6 +-
1659  net/batman-adv/types.h                             |   89 +-
1660  net/batman-adv/unicast.c                           |  135 +-
1661  net/batman-adv/unicast.h                           |   36 +-
1662  net/batman-adv/vis.c                               |    9 +-
1663  net/bridge/br_device.c                             |    4 +-
1664  net/bridge/br_input.c                              |   17 +-
1665  net/bridge/br_netlink.c                            |   75 +-
1666  net/bridge/br_private.h                            |   16 +-
1667  net/bridge/br_sysfs_br.c                           |   12 +-
1668  net/core/dev.c                                     |    1 -
1669  net/core/filter.c                                  |  139 ++
1670  net/core/netprio_cgroup.c                          |    2 +-
1671  net/core/pktgen.c                                  |   47 +-
1672  net/core/rtnetlink.c                               |  214 +++-
1673  net/core/skbuff.c                                  |   24 +-
1674  net/core/sock.c                                    |   17 +-
1675  net/dccp/minisocks.c                               |    3 +-
1676  net/ipv4/devinet.c                                 |  188 ++-
1677  net/ipv4/fib_semantics.c                           |    2 +-
1678  net/ipv4/inet_connection_sock.c                    |   25 +-
1679  net/ipv4/inet_diag.c                               |    5 +-
1680  net/ipv4/ipconfig.c                                |    6 +-
1681  net/ipv4/ipip.c                                    |   69 +-
1682  net/ipv4/syncookies.c                              |    2 +-
1683  net/ipv4/tcp.c                                     |    5 +-
1684  net/ipv4/tcp_input.c                               |   45 +-
1685  net/ipv4/tcp_ipv4.c                                |   25 +-
1686  net/ipv4/tcp_minisocks.c                           |    8 +-
1687  net/ipv4/tcp_timer.c                               |    8 +-
1688  net/ipv6/addrconf.c                                |  177 ++-
1689  net/ipv6/ah6.c                                     |   10 +-
1690  net/ipv6/anycast.c                                 |    2 +-
1691  net/ipv6/datagram.c                                |    2 +-
1692  net/ipv6/exthdrs.c                                 |   18 +-
1693  net/ipv6/fib6_rules.c                              |    2 +-
1694  net/ipv6/icmp.c                                    |    2 +-
1695  net/ipv6/ip6_fib.c                                 |   57 +
1696  net/ipv6/ip6_gre.c                                 |    2 +-
1697  net/ipv6/ip6_output.c                              |    9 +-
1698  net/ipv6/ip6_tunnel.c                              |   62 +-
1699  net/ipv6/ipv6_sockglue.c                           |    2 +-
1700  net/ipv6/mcast.c                                   |    4 +-
1701  net/ipv6/ndisc.c                                   |   12 +-
1702  net/ipv6/netfilter/ip6_tables.c                    |    6 +-
1703  net/ipv6/netfilter/ip6t_rpfilter.c                 |    2 +-
1704  net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |    4 +-
1705  net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |    4 +-
1706  net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |    6 +-
1707  net/ipv6/netfilter/nf_nat_proto_icmpv6.c           |    2 +-
1708  net/ipv6/raw.c                                     |    6 +-
1709  net/ipv6/route.c                                   |  174 ++-
1710  net/ipv6/sit.c                                     |   57 +-
1711  net/ipv6/syncookies.c                              |    2 +-
1712  net/ipv6/tcp_ipv6.c                                |   15 +-
1713  net/ipv6/xfrm6_policy.c                            |    4 +-
1714  net/ipv6/xfrm6_state.c                             |    4 +-
1715  net/l2tp/l2tp_netlink.c                            |    2 +-
1716  net/netfilter/ipvs/Kconfig                         |    7 +-
1717  net/netfilter/ipvs/ip_vs_conn.c                    |   15 +-
1718  net/netfilter/ipvs/ip_vs_core.c                    |  404 +++---
1719  net/netfilter/ipvs/ip_vs_dh.c                      |    2 +-
1720  net/netfilter/ipvs/ip_vs_lblc.c                    |    2 +-
1721  net/netfilter/ipvs/ip_vs_lblcr.c                   |    2 +-
1722  net/netfilter/ipvs/ip_vs_pe_sip.c                  |   18 +-
1723  net/netfilter/ipvs/ip_vs_proto.c                   |    6 +-
1724  net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |    9 +-
1725  net/netfilter/ipvs/ip_vs_proto_sctp.c              |   42 +-
1726  net/netfilter/ipvs/ip_vs_proto_tcp.c               |   40 +-
1727  net/netfilter/ipvs/ip_vs_proto_udp.c               |   41 +-
1728  net/netfilter/ipvs/ip_vs_sched.c                   |    2 +-
1729  net/netfilter/ipvs/ip_vs_sh.c                      |    2 +-
1730  net/netfilter/ipvs/ip_vs_xmit.c                    |   73 +-
1731  net/netfilter/xt_ipvs.c                            |    4 +-
1732  net/packet/af_packet.c                             |   48 +-
1733  net/packet/internal.h                              |    1 +
1734  net/sched/cls_cgroup.c                             |   24 +
1735  net/sched/sch_api.c                                |    9 +-
1736  net/sched/sch_cbq.c                                |    3 +-
1737  net/sched/sch_htb.c                                |  139 +-
1738  net/sctp/Kconfig                                   |   39 +-
1739  net/sctp/protocol.c                                |    9 +
1740  net/sctp/sm_sideeffect.c                           |   45 +-
1741  net/sctp/socket.c                                  |   11 +-
1742  net/sctp/sysctl.c                                  |   59 +
1743  net/sctp/ulpqueue.c                                |    3 +-
1744  net/socket.c                                       |    8 -
1745  net/unix/diag.c                                    |    3 +
1746  325 files changed, 14277 insertions(+), 6833 deletions(-)
1747  create mode 100644 Documentation/ABI/testing/sysfs-bus-mdio
1748  create mode 100644 Documentation/devicetree/bindings/net/cdns-emac.txt
1749  delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200_emac.h
1750  delete mode 100644 drivers/net/ethernet/cadence/at91_ether.h
1751  create mode 100644 drivers/net/ethernet/freescale/fec_ptp.c
1752  create mode 100644 drivers/net/ethernet/ti/cpts.c
1753  create mode 100644 drivers/net/ethernet/ti/cpts.h
1754  create mode 100644 drivers/net/usb/cdc_mbim.c
1755  delete mode 100644 include/linux/timecompare.h
1756  create mode 100644 include/linux/usb/cdc_ncm.h
1757  rename include/{ => uapi}/linux/hdlc/ioctl.h (96%)
1758  create mode 100644 include/uapi/linux/netconf.h
1759  delete mode 100644 kernel/time/timecompare.c
1760  create mode 100644 net/batman-adv/distributed-arp-table.c
1761  create mode 100644 net/batman-adv/distributed-arp-table.h
1762 Merging wireless-next/master (38141fc ar5523: make buffer size variable unsigned)
1763 $ git merge wireless-next/master
1764 Auto-merging drivers/nfc/pn544/pn544.c
1765 Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
1766 Auto-merging MAINTAINERS
1767 Merge made by the 'recursive' strategy.
1768  MAINTAINERS                                        |    6 +
1769  arch/mips/bcm47xx/nvram.c                          |    4 +-
1770  arch/mips/bcm47xx/wgt634u.c                        |    8 +-
1771  drivers/bcma/driver_chipcommon.c                   |   23 +-
1772  drivers/bcma/driver_chipcommon_nflash.c            |    3 +
1773  drivers/bcma/driver_chipcommon_pmu.c               |    5 +-
1774  drivers/bcma/driver_chipcommon_sflash.c            |   35 +-
1775  drivers/bcma/driver_mips.c                         |   48 +-
1776  drivers/bcma/driver_pci_host.c                     |   14 +-
1777  drivers/bcma/host_pci.c                            |    6 +-
1778  drivers/bcma/main.c                                |   54 +-
1779  drivers/bcma/sprom.c                               |    5 +-
1780  drivers/bluetooth/btmrvl_sdio.c                    |   28 +-
1781  drivers/net/ethernet/toshiba/ps3_gelic_wireless.c  |    4 +-
1782  drivers/net/wireless/airo.c                        |    2 +-
1783  drivers/net/wireless/ath/Kconfig                   |    1 +
1784  drivers/net/wireless/ath/Makefile                  |    1 +
1785  drivers/net/wireless/ath/ar5523/Kconfig            |    7 +
1786  drivers/net/wireless/ath/ar5523/Makefile           |    1 +
1787  drivers/net/wireless/ath/ar5523/ar5523.c           | 1806 +++++++++++++++
1788  drivers/net/wireless/ath/ar5523/ar5523.h           |  152 ++
1789  drivers/net/wireless/ath/ar5523/ar5523_hw.h        |  431 ++++
1790  drivers/net/wireless/ath/ath6kl/cfg80211.c         |    4 +-
1791  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |    5 +
1792  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   22 +-
1793  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |    8 +-
1794  drivers/net/wireless/ath/ath9k/ar9003_mci.c        |   70 +-
1795  drivers/net/wireless/ath/ath9k/ar9003_mci.h        |    8 +-
1796  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    1 +
1797  .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h   |    4 +-
1798  drivers/net/wireless/ath/ath9k/ath9k.h             |    9 +
1799  drivers/net/wireless/ath/ath9k/btcoex.c            |   62 +-
1800  drivers/net/wireless/ath/ath9k/btcoex.h            |    7 +
1801  drivers/net/wireless/ath/ath9k/calib.c             |    1 +
1802  drivers/net/wireless/ath/ath9k/debug.c             |   34 +-
1803  drivers/net/wireless/ath/ath9k/gpio.c              |  110 +-
1804  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   17 +
1805  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   20 -
1806  drivers/net/wireless/ath/ath9k/hw.c                |    6 +-
1807  drivers/net/wireless/ath/ath9k/hw.h                |    2 +
1808  drivers/net/wireless/ath/ath9k/init.c              |    1 +
1809  drivers/net/wireless/ath/ath9k/link.c              |   12 +-
1810  drivers/net/wireless/ath/ath9k/main.c              |   12 +-
1811  drivers/net/wireless/ath/ath9k/mci.c               |  171 +-
1812  drivers/net/wireless/ath/ath9k/mci.h               |   36 +
1813  drivers/net/wireless/ath/ath9k/recv.c              |    5 +-
1814  drivers/net/wireless/ath/ath9k/reg.h               |   13 +-
1815  drivers/net/wireless/ath/ath9k/wow.c               |    2 +-
1816  drivers/net/wireless/ath/carl9170/mac.c            |   21 +-
1817  drivers/net/wireless/ath/carl9170/rx.c             |   51 +-
1818  drivers/net/wireless/ath/carl9170/usb.c            |    7 +
1819  drivers/net/wireless/ath/hw.c                      |   20 +-
1820  drivers/net/wireless/b43/main.c                    |    2 +-
1821  drivers/net/wireless/brcm80211/brcmfmac/Makefile   |    1 +
1822  drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |   73 +-
1823  drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |    3 -
1824  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |   29 -
1825  .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |  453 ++--
1826  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c  |    2 +
1827  drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h  |    3 +
1828  .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |  198 +-
1829  .../net/wireless/brcm80211/brcmfmac/dhd_proto.h    |    8 +-
1830  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c |  174 +-
1831  drivers/net/wireless/brcm80211/brcmfmac/fwil.c     |  336 +++
1832  drivers/net/wireless/brcm80211/brcmfmac/fwil.h     |   39 +
1833  drivers/net/wireless/brcm80211/brcmfmac/usb.c      |   41 +-
1834  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  | 1218 +++++------
1835  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |  145 +-
1836  drivers/net/wireless/brcm80211/brcmsmac/aiutils.c  |    4 +-
1837  drivers/net/wireless/brcm80211/brcmsmac/main.c     |    2 +-
1838  drivers/net/wireless/hostap/hostap_80211_rx.c      |    2 +-
1839  drivers/net/wireless/ipw2x00/libipw_rx.c           |    6 +-
1840  drivers/net/wireless/iwlwifi/dvm/main.c            |    9 +-
1841  drivers/net/wireless/iwlwifi/iwl-devtrace.h        |   95 +-
1842  drivers/net/wireless/iwlwifi/iwl-io.c              |    4 +-
1843  drivers/net/wireless/iwlwifi/iwl-io.h              |    2 +-
1844  drivers/net/wireless/iwlwifi/iwl-prph.h            |    3 +
1845  drivers/net/wireless/iwlwifi/iwl-trans.h           |    8 +
1846  drivers/net/wireless/iwlwifi/pcie/rx.c             |    3 +-
1847  drivers/net/wireless/iwlwifi/pcie/trans.c          |    9 +-
1848  drivers/net/wireless/iwlwifi/pcie/tx.c             |   18 +-
1849  drivers/net/wireless/libertas/mesh.c               |    2 +-
1850  drivers/net/wireless/mwifiex/11n_rxreorder.c       |    8 +-
1851  drivers/net/wireless/mwifiex/cfg80211.c            |   20 +-
1852  drivers/net/wireless/mwifiex/cmdevt.c              |   21 +-
1853  drivers/net/wireless/mwifiex/init.c                |   19 +-
1854  drivers/net/wireless/mwifiex/main.c                |    8 +
1855  drivers/net/wireless/mwifiex/main.h                |   13 +-
1856  drivers/net/wireless/mwifiex/scan.c                |   55 +-
1857  drivers/net/wireless/mwifiex/sta_cmdresp.c         |    4 -
1858  drivers/net/wireless/mwifiex/sta_ioctl.c           |    4 +-
1859  drivers/net/wireless/mwifiex/sta_rx.c              |   26 +-
1860  drivers/net/wireless/mwifiex/txrx.c                |   10 +-
1861  drivers/net/wireless/mwifiex/uap_cmd.c             |   11 +-
1862  drivers/net/wireless/mwifiex/uap_txrx.c            |   17 +-
1863  drivers/net/wireless/mwifiex/util.c                |   19 +-
1864  drivers/net/wireless/orinoco/main.h                |    2 +-
1865  drivers/net/wireless/orinoco/orinoco_usb.c         |    9 +-
1866  drivers/net/wireless/rt2x00/rt2800lib.c            |  100 +-
1867  drivers/net/wireless/rtlwifi/cam.c                 |    7 +-
1868  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |  227 +-
1869  drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c |   88 +-
1870  drivers/net/wireless/rtlwifi/rtl8192ce/def.h       |    3 +
1871  drivers/net/wireless/rtlwifi/rtl8192ce/dm.c        |   30 +-
1872  drivers/net/wireless/rtlwifi/rtl8192ce/hw.c        |   93 +-
1873  drivers/net/wireless/rtlwifi/rtl8192ce/phy.c       |    2 +
1874  drivers/net/wireless/rtlwifi/rtl8192ce/rf.c        |   23 +-
1875  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    6 +-
1876  drivers/net/wireless/rtlwifi/rtl8192ce/trx.c       |   46 +-
1877  drivers/net/wireless/rtlwifi/rtl8192cu/dm.c        |   30 +-
1878  drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |   16 +-
1879  drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |   25 +-
1880  drivers/net/wireless/rtlwifi/rtl8192cu/rf.c        |   22 +-
1881  drivers/net/wireless/rtlwifi/rtl8192de/dm.c        |   95 +-
1882  drivers/net/wireless/rtlwifi/rtl8192de/phy.c       |   65 +-
1883  drivers/net/wireless/rtlwifi/rtl8192de/rf.c        |   18 +-
1884  drivers/net/wireless/rtlwifi/rtl8192de/trx.c       |   39 +-
1885  drivers/net/wireless/rtlwifi/rtl8192se/dm.c        |   89 +-
1886  drivers/net/wireless/rtlwifi/rtl8192se/hw.c        |    6 +-
1887  drivers/net/wireless/rtlwifi/rtl8192se/phy.c       |   64 +-
1888  drivers/net/wireless/rtlwifi/rtl8192se/rf.c        |   11 +-
1889  drivers/net/wireless/rtlwifi/rtl8192se/trx.c       |   21 +-
1890  drivers/net/wireless/rtlwifi/wifi.h                |   53 +-
1891  drivers/nfc/Makefile                               |    2 +-
1892  drivers/nfc/pn533.c                                |   18 +-
1893  drivers/nfc/pn544/Makefile                         |    7 +
1894  drivers/nfc/pn544/i2c.c                            |  500 +++++
1895  drivers/nfc/{pn544_hci.c => pn544/pn544.c}         |  679 +++---
1896  drivers/nfc/pn544/pn544.h                          |   32 +
1897  drivers/ssb/b43_pci_bridge.c                       |    1 +
1898  drivers/ssb/driver_chipcommon_pmu.c                |    3 +
1899  drivers/ssb/driver_mipscore.c                      |   16 +-
1900  include/linux/bcma/bcma.h                          |    2 +-
1901  include/linux/bcma/bcma_driver_chipcommon.h        |    5 +
1902  include/linux/bcma/bcma_driver_mips.h              |    3 +
1903  include/linux/bcma/bcma_regs.h                     |    5 +-
1904  include/linux/ieee80211.h                          |   47 +-
1905  include/linux/ssb/ssb_driver_mips.h                |   10 +-
1906  include/net/bluetooth/a2mp.h                       |   24 +-
1907  include/net/bluetooth/amp.h                        |   50 +
1908  include/net/bluetooth/bluetooth.h                  |    1 -
1909  include/net/bluetooth/hci.h                        |   40 +-
1910  include/net/bluetooth/hci_core.h                   |   48 +-
1911  include/net/bluetooth/l2cap.h                      |   14 +-
1912  include/net/cfg80211.h                             |   14 +
1913  include/net/mac80211.h                             |  114 +-
1914  include/net/nfc/hci.h                              |   18 +-
1915  include/net/nfc/nfc.h                              |    2 +-
1916  include/uapi/linux/nfc.h                           |   15 +
1917  include/uapi/linux/nl80211.h                       |   48 +
1918  net/bluetooth/Kconfig                              |    1 +
1919  net/bluetooth/Makefile                             |    2 +-
1920  net/bluetooth/a2mp.c                               |  459 +++-
1921  net/bluetooth/af_bluetooth.c                       |   10 +-
1922  net/bluetooth/amp.c                                |  374 ++++
1923  net/bluetooth/bnep/core.c                          |    3 +-
1924  net/bluetooth/cmtp/core.c                          |    2 +-
1925  net/bluetooth/hci_conn.c                           |   70 +-
1926  net/bluetooth/hci_core.c                           |   65 +-
1927  net/bluetooth/hci_event.c                          |  167 +-
1928  net/bluetooth/hci_sysfs.c                          |   10 +-
1929  net/bluetooth/hidp/core.c                          |    8 +-
1930  net/bluetooth/l2cap_core.c                         |  503 +++--
1931  net/bluetooth/l2cap_sock.c                         |   89 +-
1932  net/bluetooth/lib.c                                |   14 -
1933  net/bluetooth/mgmt.c                               |    5 +-
1934  net/bluetooth/rfcomm/core.c                        |   19 +-
1935  net/bluetooth/rfcomm/sock.c                        |    9 +-
1936  net/bluetooth/rfcomm/tty.c                         |    6 +-
1937  net/bluetooth/sco.c                                |   12 +-
1938  net/bluetooth/smp.c                                |    2 +-
1939  net/mac80211/Kconfig                               |    2 +-
1940  net/mac80211/Makefile                              |    1 +
1941  net/mac80211/aes_cmac.c                            |   17 +
1942  net/mac80211/cfg.c                                 |  284 +--
1943  net/mac80211/chan.c                                |  455 +++-
1944  net/mac80211/debugfs.h                             |    6 +-
1945  net/mac80211/debugfs_netdev.c                      |   10 +-
1946  net/mac80211/driver-ops.h                          |   65 +
1947  net/mac80211/ibss.c                                |   88 +-
1948  net/mac80211/ieee80211_i.h                         |  171 +-
1949  net/mac80211/iface.c                               |   44 +-
1950  net/mac80211/main.c                                |  105 +-
1951  net/mac80211/mesh.c                                |   52 +-
1952  net/mac80211/mesh.h                                |    4 +-
1953  net/mac80211/mesh_plink.c                          |   14 +-
1954  net/mac80211/mesh_sync.c                           |   55 +-
1955  net/mac80211/mlme.c                                |  228 +-
1956  net/mac80211/offchannel.c                          |    9 +-
1957  net/mac80211/pm.c                                  |    2 +
1958  net/mac80211/rate.h                                |   12 +-
1959  net/mac80211/rx.c                                  |   32 +-
1960  net/mac80211/scan.c                                |   29 +-
1961  net/mac80211/sta_info.c                            |   59 +-
1962  net/mac80211/status.c                              |   15 +-
1963  net/mac80211/trace.h                               |  146 +-
1964  net/mac80211/tx.c                                  |  281 ++-
1965  net/mac80211/util.c                                |  145 +-
1966  net/mac80211/vht.c                                 |   35 +
1967  net/nfc/Kconfig                                    |    4 +-
1968  net/nfc/core.c                                     |   33 +-
1969  net/nfc/hci/command.c                              |   24 +-
1970  net/nfc/hci/core.c                                 |   71 +-
1971  net/nfc/hci/llc.c                                  |    2 +-
1972  net/nfc/hci/llc_shdlc.c                            |    7 +-
1973  net/nfc/llcp/Kconfig                               |    4 +-
1974  net/nfc/llcp/commands.c                            |  120 +-
1975  net/nfc/llcp/llcp.c                                |  226 +-
1976  net/nfc/llcp/llcp.h                                |   13 +
1977  net/nfc/llcp/sock.c                                |   42 +-
1978  net/nfc/nci/Kconfig                                |    4 +-
1979  net/nfc/nci/core.c                                 |   29 +-
1980  net/nfc/netlink.c                                  |  157 +-
1981  net/nfc/nfc.h                                      |    6 +
1982  net/nfc/rawsock.c                                  |    1 -
1983  net/wireless/Makefile                              |    4 +-
1984  net/wireless/ap.c                                  |    3 +-
1985  net/wireless/chan.c                                |   16 +-
1986  net/wireless/core.c                                |   16 +-
1987  net/wireless/core.h                                |    6 +-
1988  net/wireless/ethtool.c                             |   15 +-
1989  net/wireless/ibss.c                                |    9 +-
1990  net/wireless/mesh.c                                |   11 +-
1991  net/wireless/mlme.c                                |   92 +-
1992  net/wireless/nl80211.c                             |  259 ++-
1993  net/wireless/rdev-ops.h                            |  879 ++++++++
1994  net/wireless/scan.c                                |  138 +-
1995  net/wireless/sme.c                                 |   12 +-
1996  net/wireless/sysfs.c                               |    5 +-
1997  net/wireless/trace.c                               |    7 +
1998  net/wireless/trace.h                               | 2296 ++++++++++++++++++++
1999  net/wireless/util.c                                |   14 +-
2000  net/wireless/wext-compat.c                         |   48 +-
2001  233 files changed, 13900 insertions(+), 4289 deletions(-)
2002  create mode 100644 drivers/net/wireless/ath/ar5523/Kconfig
2003  create mode 100644 drivers/net/wireless/ath/ar5523/Makefile
2004  create mode 100644 drivers/net/wireless/ath/ar5523/ar5523.c
2005  create mode 100644 drivers/net/wireless/ath/ar5523/ar5523.h
2006  create mode 100644 drivers/net/wireless/ath/ar5523/ar5523_hw.h
2007  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil.c
2008  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwil.h
2009  create mode 100644 drivers/nfc/pn544/Makefile
2010  create mode 100644 drivers/nfc/pn544/i2c.c
2011  rename drivers/nfc/{pn544_hci.c => pn544/pn544.c} (58%)
2012  create mode 100644 drivers/nfc/pn544/pn544.h
2013  create mode 100644 include/net/bluetooth/amp.h
2014  create mode 100644 net/bluetooth/amp.c
2015  create mode 100644 net/mac80211/vht.c
2016  create mode 100644 net/wireless/rdev-ops.h
2017  create mode 100644 net/wireless/trace.c
2018  create mode 100644 net/wireless/trace.h
2019 Merging bluetooth/master (5187464 Bluetooth: Fix updating advertising state flags and data)
2020 $ git merge bluetooth/master
2021 Merge made by the 'recursive' strategy.
2022  include/net/bluetooth/amp.h      |    4 +
2023  include/net/bluetooth/hci.h      |   27 +
2024  include/net/bluetooth/hci_core.h |   48 +-
2025  include/net/bluetooth/l2cap.h    |   38 +-
2026  net/bluetooth/Kconfig            |    1 -
2027  net/bluetooth/a2mp.c             |    4 +-
2028  net/bluetooth/amp.c              |   93 ++++
2029  net/bluetooth/bnep/netdev.c      |    1 -
2030  net/bluetooth/cmtp/capi.c        |    2 +-
2031  net/bluetooth/cmtp/sock.c        |    2 +-
2032  net/bluetooth/hci_conn.c         |    6 +
2033  net/bluetooth/hci_core.c         |  161 ++++--
2034  net/bluetooth/hci_event.c        |  351 ++++++++++++-
2035  net/bluetooth/l2cap_core.c       | 1000 +++++++++++++++++++++++++++++++++++---
2036  net/bluetooth/l2cap_sock.c       |    5 +
2037  net/bluetooth/mgmt.c             |  100 ++--
2038  16 files changed, 1649 insertions(+), 194 deletions(-)
2039 Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
2040 $ git merge mtd/master
2041 Merge made by the 'recursive' strategy.
2042  drivers/mtd/nand/nand_base.c |    9 +++++----
2043  drivers/mtd/ofpart.c         |    2 +-
2044  2 files changed, 6 insertions(+), 5 deletions(-)
2045 Merging l2-mtd/master (33a9d7c mtd: Fix kernel-doc content to avoid warning.)
2046 $ git merge l2-mtd/master
2047 Removing include/linux/platform_data/mtd-nomadik-nand.h
2048 Removing include/linux/mtd/gpmi-nand.h
2049 Removing drivers/mtd/nand/nomadik_nand.c
2050 Auto-merging drivers/mtd/nand/nand_base.c
2051 Removing arch/arm/mach-nomadik/include/mach/fsmc.h
2052 Auto-merging arch/arm/boot/dts/spear13xx.dtsi
2053 Merge made by the 'recursive' strategy.
2054  .../devicetree/bindings/mtd/denali-nand.txt        |   23 ++
2055  .../devicetree/bindings/mtd/flctl-nand.txt         |   49 ++++
2056  .../devicetree/bindings/mtd/fsmc-nand.txt          |   12 +-
2057  Documentation/devicetree/bindings/mtd/m25p80.txt   |   29 ++
2058  arch/arm/boot/dts/spear13xx.dtsi                   |   10 +-
2059  arch/arm/boot/dts/spear300.dtsi                    |    8 +-
2060  arch/arm/boot/dts/spear310.dtsi                    |    8 +-
2061  arch/arm/boot/dts/spear320.dtsi                    |    8 +-
2062  arch/arm/boot/dts/spear600.dtsi                    |    8 +-
2063  arch/arm/configs/nhk8815_defconfig                 |    2 +-
2064  arch/arm/mach-nomadik/board-nhk8815.c              |   73 ++---
2065  arch/arm/mach-nomadik/include/mach/fsmc.h          |   29 --
2066  arch/arm/mach-u300/core.c                          |   14 +-
2067  drivers/clk/clk-nomadik.c                          |    1 +
2068  drivers/mtd/cmdlinepart.c                          |   80 +++---
2069  drivers/mtd/devices/m25p80.c                       |   36 ++-
2070  drivers/mtd/devices/slram.c                        |    2 +-
2071  drivers/mtd/devices/spear_smi.c                    |   13 +-
2072  drivers/mtd/mtdoops.c                              |   15 +-
2073  drivers/mtd/nand/Kconfig                           |   26 +-
2074  drivers/mtd/nand/Makefile                          |    3 +-
2075  drivers/mtd/nand/denali.c                          |  162 ++---------
2076  drivers/mtd/nand/denali.h                          |    5 +
2077  drivers/mtd/nand/denali_dt.c                       |  167 +++++++++++
2078  drivers/mtd/nand/denali_pci.c                      |  144 ++++++++++
2079  drivers/mtd/nand/fsl_elbc_nand.c                   |   15 -
2080  drivers/mtd/nand/fsmc_nand.c                       |  102 +++----
2081  drivers/mtd/nand/gpio.c                            |   22 +-
2082  drivers/mtd/nand/gpmi-nand/gpmi-lib.c              |    1 -
2083  drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |   21 +-
2084  drivers/mtd/nand/gpmi-nand/gpmi-nand.h             |    1 -
2085  drivers/mtd/nand/nand_base.c                       |    4 +-
2086  drivers/mtd/nand/nomadik_nand.c                    |  235 ---------------
2087  drivers/mtd/nand/sh_flctl.c                        |  302 ++++++++++++++++++--
2088  drivers/mtd/onenand/onenand_base.c                 |    2 +-
2089  drivers/mtd/tests/mtd_nandbiterrs.c                |   73 ++---
2090  drivers/mtd/tests/mtd_nandecctest.c                |    6 +-
2091  drivers/mtd/tests/mtd_oobtest.c                    |  171 ++++++-----
2092  drivers/mtd/tests/mtd_pagetest.c                   |  152 +++++-----
2093  drivers/mtd/tests/mtd_readtest.c                   |   42 +--
2094  drivers/mtd/tests/mtd_speedtest.c                  |   88 +++---
2095  drivers/mtd/tests/mtd_stresstest.c                 |   44 +--
2096  drivers/mtd/tests/mtd_subpagetest.c                |  124 ++++----
2097  drivers/mtd/tests/mtd_torturetest.c                |   73 ++---
2098  fs/jffs2/file.c                                    |   39 +--
2099  include/linux/mtd/fsmc.h                           |    3 -
2100  include/linux/mtd/gpmi-nand.h                      |   68 -----
2101  include/linux/mtd/mtd.h                            |    2 +-
2102  include/linux/mtd/nand.h                           |    4 +-
2103  include/linux/mtd/sh_flctl.h                       |   14 +-
2104  include/linux/platform_data/mtd-nomadik-nand.h     |   16 --
2105  51 files changed, 1390 insertions(+), 1161 deletions(-)
2106  create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
2107  create mode 100644 Documentation/devicetree/bindings/mtd/flctl-nand.txt
2108  create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
2109  delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
2110  create mode 100644 drivers/mtd/nand/denali_dt.c
2111  create mode 100644 drivers/mtd/nand/denali_pci.c
2112  delete mode 100644 drivers/mtd/nand/nomadik_nand.c
2113  delete mode 100644 include/linux/mtd/gpmi-nand.h
2114  delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
2115 Merging crypto/master (a465348 crypto: s5p-sss - Fix compilation error)
2116 $ git merge crypto/master
2117 Auto-merging arch/x86/crypto/crc32c-intel_glue.c
2118 Merge made by the 'recursive' strategy.
2119  arch/x86/crypto/Makefile                           |    5 +
2120  arch/x86/crypto/camellia-aesni-avx-asm_64.S        | 1102 ++++
2121  arch/x86/crypto/camellia_aesni_avx_glue.c          |  558 ++
2122  arch/x86/crypto/camellia_glue.c                    |   92 +-
2123  arch/x86/crypto/cast5-avx-x86_64-asm_64.S          |  332 +-
2124  arch/x86/crypto/cast5_avx_glue.c                   |   79 +-
2125  arch/x86/crypto/cast6-avx-x86_64-asm_64.S          |  190 +-
2126  arch/x86/crypto/cast6_avx_glue.c                   |   77 +-
2127  .../crypto/{crc32c-intel.c => crc32c-intel_glue.c} |   81 +
2128  arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |  460 ++
2129  arch/x86/crypto/glue_helper-asm-avx.S              |   91 +
2130  arch/x86/crypto/glue_helper.c                      |   12 +-
2131  arch/x86/crypto/serpent-avx-x86_64-asm_64.S        |  166 +-
2132  arch/x86/crypto/serpent_avx_glue.c                 |   49 +-
2133  arch/x86/crypto/serpent_sse2_glue.c                |   12 +-
2134  arch/x86/crypto/twofish-avx-x86_64-asm_64.S        |  208 +-
2135  arch/x86/crypto/twofish_avx_glue.c                 |   73 +-
2136  arch/x86/crypto/twofish_glue_3way.c                |   20 +-
2137  arch/x86/include/asm/crypto/camellia.h             |   82 +
2138  arch/x86/include/asm/crypto/glue_helper.h          |   28 +-
2139  arch/x86/include/asm/crypto/serpent-avx.h          |   27 +-
2140  arch/x86/include/asm/crypto/twofish.h              |    4 +-
2141  crypto/Kconfig                                     |   32 +
2142  crypto/tcrypt.c                                    |   29 +
2143  crypto/testmgr.c                                   |   92 +
2144  crypto/testmgr.h                                   | 5641 +++++++++++++++++++-
2145  crypto/vmac.c                                      |   47 +-
2146  drivers/crypto/Kconfig                             |    1 +
2147  drivers/crypto/picoxcell_crypto.c                  |    1 +
2148  drivers/crypto/s5p-sss.c                           |    2 +-
2149  drivers/crypto/talitos.c                           |    3 +-
2150  drivers/crypto/tegra-aes.c                         |   10 +-
2151  include/crypto/vmac.h                              |    2 +
2152  33 files changed, 8833 insertions(+), 775 deletions(-)
2153  create mode 100644 arch/x86/crypto/camellia-aesni-avx-asm_64.S
2154  create mode 100644 arch/x86/crypto/camellia_aesni_avx_glue.c
2155  rename arch/x86/crypto/{crc32c-intel.c => crc32c-intel_glue.c} (69%)
2156  create mode 100644 arch/x86/crypto/crc32c-pcl-intel-asm_64.S
2157  create mode 100644 arch/x86/crypto/glue_helper-asm-avx.S
2158  create mode 100644 arch/x86/include/asm/crypto/camellia.h
2159 Merging drm/drm-next (6380813 gma500: medfield: drop bogus NULL check in mdfld_dsi_output_init())
2160 $ git merge drm/drm-next
2161 Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
2162 Merge made by the 'recursive' strategy.
2163  drivers/gpu/drm/drm_crtc.c                |   13 +-
2164  drivers/gpu/drm/drm_modes.c               |    8 +-
2165  drivers/gpu/drm/gma500/mdfld_dsi_output.c |    2 +-
2166  drivers/gpu/drm/gma500/oaktrail.h         |    6 +
2167  drivers/gpu/drm/gma500/oaktrail_crtc.c    |    8 +
2168  drivers/gpu/drm/gma500/oaktrail_device.c  |    2 +-
2169  drivers/gpu/drm/gma500/oaktrail_hdmi.c    |  365 +++++++++++++++++++++++++++--
2170  drivers/gpu/drm/radeon/radeon_gart.c      |    2 +-
2171  drivers/gpu/drm/radeon/radeon_object.c    |    6 +-
2172  drivers/gpu/drm/radeon/radeon_object.h    |    2 +-
2173  drivers/gpu/drm/ttm/ttm_bo.c              |   12 +-
2174  drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c    |    2 +-
2175  include/drm/drm_crtc.h                    |    8 +-
2176  include/drm/ttm/ttm_bo_api.h              |   14 ++
2177  14 files changed, 412 insertions(+), 38 deletions(-)
2178 Merging sound/for-next (b7838c2 Merge branch 'stanton-cs1-driver' of git://git.alsa-project.org/alsa-kprivate into for-next)
2179 $ git merge sound/for-next
2180 Auto-merging sound/pci/hda/patch_realtek.c
2181 Merge made by the 'recursive' strategy.
2182  include/sound/Kbuild                        |   10 -
2183  include/sound/asequencer.h                  |  594 +----------------
2184  include/sound/asound.h                      |  935 +-------------------------
2185  include/sound/emu10k1.h                     |  355 +---------
2186  include/sound/pcm.h                         |    3 +
2187  include/sound/sb16_csp.h                    |  104 +--
2188  include/uapi/sound/Kbuild                   |   10 +
2189  include/uapi/sound/asequencer.h             |  614 +++++++++++++++++
2190  include/uapi/sound/asound.h                 |  961 +++++++++++++++++++++++++++
2191  include/{ => uapi}/sound/asound_fm.h        |    0
2192  include/{ => uapi}/sound/compress_offload.h |    0
2193  include/{ => uapi}/sound/compress_params.h  |    0
2194  include/uapi/sound/emu10k1.h                |  373 +++++++++++
2195  include/{ => uapi}/sound/hdsp.h             |    0
2196  include/{ => uapi}/sound/hdspm.h            |    0
2197  include/uapi/sound/sb16_csp.h               |  122 ++++
2198  include/{ => uapi}/sound/sfnt_info.h        |    0
2199  sound/core/pcm_compat.c                     |   20 +-
2200  sound/core/pcm_lib.c                        |   57 +-
2201  sound/core/pcm_native.c                     |    2 +
2202  sound/drivers/Kconfig                       |    1 -
2203  sound/drivers/aloop.c                       |   36 +-
2204  sound/drivers/dummy.c                       |   73 +-
2205  sound/firewire/Kconfig                      |   13 +
2206  sound/firewire/Makefile                     |    2 +
2207  sound/firewire/scs1x.c                      |  527 +++++++++++++++
2208  sound/isa/Kconfig                           |    4 +-
2209  sound/pci/Kconfig                           |    2 +-
2210  sound/pci/asihpi/hpidspcd.c                 |   22 +-
2211  sound/pci/asihpi/hpioctl.c                  |   17 +-
2212  sound/pci/au88x0/au88x0_core.c              |    7 +-
2213  sound/pci/hda/Kconfig                       |    5 +-
2214  sound/pci/hda/Makefile                      |    1 +
2215  sound/pci/hda/hda_codec.c                   |  130 +++-
2216  sound/pci/hda/hda_codec.h                   |    6 +
2217  sound/pci/hda/hda_intel.c                   |  128 +++-
2218  sound/pci/hda/hda_intel_trace.h             |   62 ++
2219  sound/pci/hda/hda_jack.c                    |   24 +
2220  sound/pci/hda/hda_jack.h                    |    2 +
2221  sound/pci/hda/hda_local.h                   |    8 +-
2222  sound/pci/hda/patch_cirrus.c                |   16 +-
2223  sound/pci/hda/patch_conexant.c              |   77 ++-
2224  sound/pci/hda/patch_hdmi.c                  |   15 +-
2225  sound/pci/hda/patch_realtek.c               |   11 +-
2226  sound/pci/hda/patch_sigmatel.c              |   20 +-
2227  sound/pci/hda/patch_via.c                   |   12 +-
2228  sound/pci/ice1712/Makefile                  |    2 +-
2229  sound/pci/ice1712/amp.c                     |    1 -
2230  sound/pci/ice1712/aureon.c                  |    4 +-
2231  sound/pci/ice1712/delta.c                   |    1 -
2232  sound/pci/ice1712/ews.c                     |    5 +-
2233  sound/pci/ice1712/hoontech.c                |    1 -
2234  sound/pci/ice1712/ice1712.c                 |    9 +-
2235  sound/pci/ice1712/ice1712.h                 |   12 +-
2236  sound/pci/ice1712/ice1724.c                 |   23 +-
2237  sound/pci/ice1712/juli.c                    |    4 +-
2238  sound/pci/ice1712/maya44.c                  |    5 +-
2239  sound/pci/ice1712/phase.c                   |    3 +-
2240  sound/pci/ice1712/pontis.c                  |    1 -
2241  sound/pci/ice1712/prodigy192.c              |    5 +-
2242  sound/pci/ice1712/prodigy_hifi.c            |    1 -
2243  sound/pci/ice1712/psc724.c                  |  464 +++++++++++++
2244  sound/pci/ice1712/psc724.h                  |   13 +
2245  sound/pci/ice1712/quartet.c                 |   10 +-
2246  sound/pci/ice1712/revo.c                    |    1 -
2247  sound/pci/ice1712/se.c                      |   11 +-
2248  sound/pci/ice1712/vt1720_mobo.c             |    1 -
2249  sound/pci/ice1712/wm8766.c                  |  361 ++++++++++
2250  sound/pci/ice1712/wm8766.h                  |  163 +++++
2251  sound/pci/ice1712/wm8776.c                  |  633 ++++++++++++++++++
2252  sound/pci/ice1712/wm8776.h                  |  226 +++++++
2253  sound/pci/ice1712/wtm.c                     |    1 -
2254  sound/pci/oxygen/virtuoso.c                 |    1 +
2255  sound/pci/oxygen/xonar_wm87x6.c             |    6 +-
2256  sound/usb/Kconfig                           |    2 +-
2257  sound/usb/pcm.c                             |    3 -
2258  sound/usb/quirks-table.h                    |   75 +++
2259  77 files changed, 5262 insertions(+), 2167 deletions(-)
2260  create mode 100644 include/uapi/sound/asequencer.h
2261  create mode 100644 include/uapi/sound/asound.h
2262  rename include/{ => uapi}/sound/asound_fm.h (100%)
2263  rename include/{ => uapi}/sound/compress_offload.h (100%)
2264  rename include/{ => uapi}/sound/compress_params.h (100%)
2265  create mode 100644 include/uapi/sound/emu10k1.h
2266  rename include/{ => uapi}/sound/hdsp.h (100%)
2267  rename include/{ => uapi}/sound/hdspm.h (100%)
2268  create mode 100644 include/uapi/sound/sb16_csp.h
2269  rename include/{ => uapi}/sound/sfnt_info.h (100%)
2270  create mode 100644 sound/firewire/scs1x.c
2271  create mode 100644 sound/pci/hda/hda_intel_trace.h
2272  create mode 100644 sound/pci/ice1712/psc724.c
2273  create mode 100644 sound/pci/ice1712/psc724.h
2274  create mode 100644 sound/pci/ice1712/wm8766.c
2275  create mode 100644 sound/pci/ice1712/wm8766.h
2276  create mode 100644 sound/pci/ice1712/wm8776.c
2277  create mode 100644 sound/pci/ice1712/wm8776.h
2278 Merging sound-asoc/for-next (064153e Merge branches 'fix/core', 'fix/cs42l52', 'fix/mxs', 'fix/samsung', 'fix/wm8978', 'topic/ak4104', 'topic/atmel', 'topic/cs4271', 'topic/da9055', 'topic/davinci', 'topic/fsi', 'topic/fsl', 'topic/jack', 'topic/jz4740', 'topic/samsung', 'topic/si476x', 'topic/tlv320aic32x4', 'topic/ux500', 'topic/wm0010', 'topic/wm2200', 'topic/wm8750', 'topic/wm8770', 'topic/wm8971' and 'topic/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-next)
2279 $ git merge sound-asoc/for-next
2280 Auto-merging sound/soc/codecs/wm8994.c
2281 Auto-merging sound/soc/codecs/cs42l52.c
2282 Merge made by the 'recursive' strategy.
2283  .../devicetree/bindings/misc/atmel-ssc.txt         |   15 +
2284  Documentation/devicetree/bindings/sound/ak4104.txt |   17 +
2285  Documentation/devicetree/bindings/sound/cs4271.txt |    2 +
2286  arch/arm/boot/dts/at91sam9260.dtsi                 |    8 +
2287  arch/arm/boot/dts/at91sam9263.dtsi                 |   16 +
2288  arch/arm/boot/dts/at91sam9g45.dtsi                 |   16 +
2289  arch/arm/boot/dts/at91sam9x5.dtsi                  |    8 +
2290  arch/arm/mach-at91/at91rm9200.c                    |    9 +-
2291  arch/arm/mach-at91/at91rm9200_devices.c            |    6 +-
2292  arch/arm/mach-at91/at91sam9260.c                   |    3 +-
2293  arch/arm/mach-at91/at91sam9260_devices.c           |   11 +-
2294  arch/arm/mach-at91/at91sam9261.c                   |    9 +-
2295  arch/arm/mach-at91/at91sam9261_devices.c           |    6 +-
2296  arch/arm/mach-at91/at91sam9263.c                   |    6 +-
2297  arch/arm/mach-at91/at91sam9263_devices.c           |    4 +-
2298  arch/arm/mach-at91/at91sam9g45.c                   |    6 +-
2299  arch/arm/mach-at91/at91sam9g45_devices.c           |    4 +-
2300  arch/arm/mach-at91/at91sam9rl.c                    |    6 +-
2301  arch/arm/mach-at91/at91sam9rl_devices.c            |    4 +-
2302  arch/arm/mach-at91/at91sam9x5.c                    |    1 +
2303  arch/arm/mach-at91/board-sam9g20ek.c               |   17 +
2304  arch/arm/mach-davinci/board-da850-evm.c            |   24 +-
2305  drivers/base/regmap/internal.h                     |    2 +
2306  drivers/base/regmap/regmap-debugfs.c               |   50 +-
2307  drivers/base/regmap/regmap.c                       |  154 +++--
2308  drivers/misc/atmel-ssc.c                           |  133 +++--
2309  include/linux/atmel-ssc.h                          |    5 +
2310  include/linux/mfd/wm8994/pdata.h                   |    5 +
2311  include/linux/platform_data/davinci_asp.h          |    3 +
2312  include/linux/regmap.h                             |    6 +-
2313  include/sound/cs4271.h                             |    1 +
2314  include/sound/sh_fsi.h                             |    6 +
2315  include/sound/tlv320aic32x4.h                      |    1 +
2316  sound/soc/atmel/sam9g20_wm8731.c                   |   51 +-
2317  sound/soc/codecs/Kconfig                           |   12 +
2318  sound/soc/codecs/Makefile                          |    4 +
2319  sound/soc/codecs/ak4104.c                          |   29 +-
2320  sound/soc/codecs/arizona.h                         |   47 +-
2321  sound/soc/codecs/cs4271.c                          |   21 +-
2322  sound/soc/codecs/cs42l52.c                         |    3 +-
2323  sound/soc/codecs/da9055.c                          |   43 +-
2324  sound/soc/codecs/jz4740.c                          |  142 ++---
2325  sound/soc/codecs/si476x.c                          |  255 +++++++++
2326  sound/soc/codecs/tlv320aic32x4.c                   |   24 +
2327  sound/soc/codecs/tlv320aic32x4.h                   |    3 +
2328  sound/soc/codecs/wm0010.c                          |  393 +++++++------
2329  sound/soc/codecs/wm2200.c                          |  260 +++++++--
2330  sound/soc/codecs/wm5102.c                          |  594 +++++++++++++++++++-
2331  sound/soc/codecs/wm8750.c                          |   86 ++-
2332  sound/soc/codecs/wm8770.c                          |  217 ++++---
2333  sound/soc/codecs/wm8958-dsp2.c                     |   31 +-
2334  sound/soc/codecs/wm8971.c                          |   80 ++-
2335  sound/soc/codecs/wm8978.c                          |    2 +-
2336  sound/soc/codecs/wm8994.c                          |  100 ++--
2337  sound/soc/codecs/wm_adsp.c                         |  571 +++++++++++++++++++
2338  sound/soc/codecs/wm_adsp.h                         |   54 ++
2339  sound/soc/codecs/wmfw.h                            |  128 +++++
2340  sound/soc/davinci/davinci-evm.c                    |    5 +
2341  sound/soc/davinci/davinci-mcasp.c                  |   93 ++-
2342  sound/soc/davinci/davinci-mcasp.h                  |    2 +-
2343  sound/soc/davinci/davinci-pcm.c                    |   53 +-
2344  sound/soc/davinci/davinci-pcm.h                    |    2 +
2345  sound/soc/fsl/Kconfig                              |   16 +-
2346  sound/soc/fsl/Makefile                             |    4 +
2347  sound/soc/fsl/p1022_rdk.c                          |  392 +++++++++++++
2348  sound/soc/fsl/pcm030-audio-fabric.c                |    4 +-
2349  sound/soc/mxs/mxs-saif.c                           |   17 +-
2350  sound/soc/samsung/Kconfig                          |    2 +
2351  sound/soc/samsung/ac97.c                           |    6 +-
2352  sound/soc/samsung/bells.c                          |  222 ++++++--
2353  sound/soc/samsung/i2s.c                            |    8 +-
2354  sound/soc/samsung/pcm.c                            |   12 +-
2355  sound/soc/samsung/spdif.c                          |   12 +-
2356  sound/soc/sh/fsi.c                                 |  441 +++++++++++++--
2357  sound/soc/soc-core.c                               |    5 +-
2358  sound/soc/soc-dapm.c                               |    2 +-
2359  sound/soc/soc-jack.c                               |    3 -
2360  sound/soc/ux500/ux500_msp_dai.c                    |   42 +-
2361  sound/soc/ux500/ux500_msp_dai.h                    |    1 +
2362  79 files changed, 4208 insertions(+), 850 deletions(-)
2363  create mode 100644 Documentation/devicetree/bindings/misc/atmel-ssc.txt
2364  create mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt
2365  create mode 100644 sound/soc/codecs/si476x.c
2366  create mode 100644 sound/soc/codecs/wm_adsp.c
2367  create mode 100644 sound/soc/codecs/wm_adsp.h
2368  create mode 100644 sound/soc/codecs/wmfw.h
2369  create mode 100644 sound/soc/fsl/p1022_rdk.c
2370 Merging modules/modules-next (56713a2 MODSIGN: Add modules_sign make target)
2371 $ git merge modules/modules-next
2372 Auto-merging kernel/module.c
2373 Auto-merging Makefile
2374 Merge made by the 'recursive' strategy.
2375  Documentation/ABI/testing/ima_policy   |    3 +-
2376  Makefile                               |    6 +
2377  arch/arm/include/uapi/asm/unistd.h     |    1 +
2378  arch/arm/kernel/calls.S                |    1 +
2379  arch/powerpc/include/asm/systbl.h      |    1 +
2380  arch/powerpc/include/asm/unistd.h      |    2 +-
2381  arch/powerpc/include/uapi/asm/unistd.h |    1 +
2382  arch/x86/syscalls/syscall_32.tbl       |    1 +
2383  arch/x86/syscalls/syscall_64.tbl       |    1 +
2384  include/linux/ima.h                    |    6 +
2385  include/linux/security.h               |   13 ++
2386  include/linux/syscalls.h               |    1 +
2387  include/uapi/asm-generic/unistd.h      |    4 +-
2388  include/uapi/linux/module.h            |    8 +
2389  kernel/module.c                        |  402 ++++++++++++++++++++------------
2390  kernel/sys_ni.c                        |    1 +
2391  scripts/Makefile.modsign               |   32 +++
2392  security/capability.c                  |    6 +
2393  security/integrity/ima/ima.h           |    2 +-
2394  security/integrity/ima/ima_api.c       |    4 +-
2395  security/integrity/ima/ima_main.c      |   21 ++
2396  security/integrity/ima/ima_policy.c    |    3 +
2397  security/security.c                    |   10 +
2398  23 files changed, 370 insertions(+), 160 deletions(-)
2399  create mode 100644 include/uapi/linux/module.h
2400  create mode 100644 scripts/Makefile.modsign
2401 Merging virtio/virtio-next (41395df virtio: Convert dev_printk(KERN_<LEVEL> to dev_<level>()
2402 $ git merge virtio/virtio-next
2403 Auto-merging drivers/net/virtio_net.c
2404 Merge made by the 'recursive' strategy.
2405  drivers/char/virtio_console.c    |   14 ++++---
2406  drivers/lguest/core.c            |    2 +-
2407  drivers/net/virtio_net.c         |   48 +++++++++-------------
2408  drivers/rpmsg/virtio_rpmsg_bus.c |    6 +--
2409  drivers/scsi/virtio_scsi.c       |   24 ++++++-----
2410  drivers/virtio/virtio_balloon.c  |    7 ++--
2411  drivers/virtio/virtio_mmio.c     |    4 +-
2412  drivers/virtio/virtio_pci.c      |   20 ++-------
2413  drivers/virtio/virtio_ring.c     |   46 +++++++++------------
2414  include/linux/virtio.h           |   10 ++++-
2415  include/linux/virtio_scsi.h      |   28 ++++++++++++-
2416  mm/highmem.c                     |    1 +
2417  net/9p/trans_virtio.c            |    3 +-
2418  tools/lguest/lguest.c            |   84 ++++++++++++++++----------------------
2419  tools/virtio/virtio_test.c       |    4 +-
2420  15 files changed, 145 insertions(+), 156 deletions(-)
2421 Merging input/next (544a46c Input: add Retu power button driver.)
2422 $ git merge input/next
2423 Auto-merging drivers/input/input-mt.c
2424 Merge made by the 'recursive' strategy.
2425  .../devicetree/bindings/input/pwm-beeper.txt       |    7 +
2426  .../bindings/input/touchscreen/mms114.txt          |   34 +++
2427  drivers/input/input-mt.c                           |    2 +-
2428  drivers/input/input.c                              |  181 +++++++++++--
2429  drivers/input/joystick/as5011.c                    |   19 +-
2430  drivers/input/keyboard/Kconfig                     |    2 +-
2431  drivers/input/keyboard/nomadik-ske-keypad.c        |   34 ++-
2432  drivers/input/keyboard/qt2160.c                    |   19 +-
2433  drivers/input/keyboard/spear-keyboard.c            |   88 +++----
2434  drivers/input/keyboard/stmpe-keypad.c              |   72 ++---
2435  drivers/input/misc/Kconfig                         |   29 ++-
2436  drivers/input/misc/Makefile                        |    2 +
2437  drivers/input/misc/da9055_onkey.c                  |  171 ++++++++++++
2438  drivers/input/misc/pwm-beeper.c                    |   14 +-
2439  drivers/input/misc/retu-pwrbutton.c                |   99 +++++++
2440  drivers/input/misc/wm831x-on.c                     |    5 +-
2441  drivers/input/mouse/alps.c                         |   10 +-
2442  drivers/input/serio/Kconfig                        |    9 +
2443  drivers/input/serio/Makefile                       |    1 +
2444  drivers/input/serio/arc_ps2.c                      |  274 ++++++++++++++++++++
2445  drivers/input/serio/hil_mlc.c                      |   11 +-
2446  drivers/input/serio/i8042-io.h                     |    2 +-
2447  drivers/input/tablet/wacom_sys.c                   |   58 +++--
2448  drivers/input/tablet/wacom_wac.c                   |   21 +-
2449  drivers/input/tablet/wacom_wac.h                   |    2 +
2450  drivers/input/touchscreen/cy8ctmg110_ts.c          |   13 +-
2451  drivers/input/touchscreen/edt-ft5x06.c             |   10 +-
2452  drivers/input/touchscreen/mms114.c                 |   62 ++++-
2453  drivers/input/touchscreen/stmpe-ts.c               |   68 ++---
2454  drivers/input/touchscreen/wm831x-ts.c              |    6 +-
2455  include/linux/input.h                              |   10 +-
2456  31 files changed, 1079 insertions(+), 256 deletions(-)
2457  create mode 100644 Documentation/devicetree/bindings/input/pwm-beeper.txt
2458  create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
2459  create mode 100644 drivers/input/misc/da9055_onkey.c
2460  create mode 100644 drivers/input/misc/retu-pwrbutton.c
2461  create mode 100644 drivers/input/serio/arc_ps2.c
2462 Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
2463 $ git merge input-mt/for-next
2464 Already up-to-date.
2465 Merging cgroup/for-next (ef9fe98 cgroup_freezer: implement proper hierarchy support)
2466 $ git merge cgroup/for-next
2467 Merge made by the 'recursive' strategy.
2468  Documentation/cgroups/freezer-subsystem.txt |   63 ++--
2469  block/blk-cgroup.c                          |    3 +-
2470  include/linux/cgroup.h                      |  138 +++++---
2471  include/linux/freezer.h                     |   57 ++-
2472  kernel/cgroup.c                             |  429 ++++++++++-------------
2473  kernel/cgroup_freezer.c                     |  506 ++++++++++++++++-----------
2474  kernel/fork.c                               |    9 +-
2475  kernel/freezer.c                            |   11 +-
2476  kernel/power/process.c                      |   13 +-
2477  kernel/signal.c                             |   20 +-
2478  mm/hugetlb_cgroup.c                         |   11 +-
2479  mm/memcontrol.c                             |  181 +++++-----
2480  security/device_cgroup.c                    |   30 +-
2481  13 files changed, 811 insertions(+), 660 deletions(-)
2482 Merging block/for-next (95678ef Merge branch 'for-3.8/core' into for-next)
2483 $ git merge block/for-next
2484 Removing include/linux/drbd_tag_magic.h
2485 Removing include/linux/drbd_nl.h
2486 Merge made by the 'recursive' strategy.
2487  block/blk-core.c                   |    4 +-
2488  block/cfq-iosched.c                |    3 +-
2489  block/elevator.c                   |   16 +-
2490  block/genhd.c                      |   10 +-
2491  block/partitions/efi.c             |    7 +-
2492  block/partitions/msdos.c           |   21 +-
2493  drivers/block/aoe/aoecmd.c         |    2 +-
2494  drivers/block/cciss.c              |   21 +-
2495  drivers/block/drbd/Makefile        |    2 +
2496  drivers/block/drbd/drbd_actlog.c   |  702 +++----
2497  drivers/block/drbd/drbd_bitmap.c   |  249 +--
2498  drivers/block/drbd/drbd_int.h      | 1392 ++++++-------
2499  drivers/block/drbd/drbd_interval.c |  207 ++
2500  drivers/block/drbd/drbd_interval.h |   40 +
2501  drivers/block/drbd/drbd_main.c     | 3861 ++++++++++++++---------------------
2502  drivers/block/drbd/drbd_nl.c       | 3334 +++++++++++++++++-------------
2503  drivers/block/drbd/drbd_nla.c      |   55 +
2504  drivers/block/drbd/drbd_nla.h      |    8 +
2505  drivers/block/drbd/drbd_proc.c     |   41 +-
2506  drivers/block/drbd/drbd_receiver.c | 3894 +++++++++++++++++++++---------------
2507  drivers/block/drbd/drbd_req.c      | 1574 +++++++--------
2508  drivers/block/drbd/drbd_req.h      |  187 +-
2509  drivers/block/drbd/drbd_state.c    | 1857 +++++++++++++++++
2510  drivers/block/drbd/drbd_state.h    |  161 ++
2511  drivers/block/drbd/drbd_strings.c  |    1 +
2512  drivers/block/drbd/drbd_worker.c   | 1237 +++++++-----
2513  drivers/block/drbd/drbd_wrappers.h |   11 +-
2514  drivers/block/floppy.c             |    5 +-
2515  drivers/block/mtip32xx/mtip32xx.c  |   18 +-
2516  drivers/block/mtip32xx/mtip32xx.h  |    2 +-
2517  drivers/md/dm.c                    |    8 +-
2518  include/linux/drbd.h               |   81 +-
2519  include/linux/drbd_genl.h          |  378 ++++
2520  include/linux/drbd_genl_api.h      |   55 +
2521  include/linux/drbd_limits.h        |   90 +-
2522  include/linux/drbd_nl.h            |  163 --
2523  include/linux/drbd_tag_magic.h     |   84 -
2524  include/linux/genhd.h              |    8 +-
2525  include/linux/genl_magic_func.h    |  422 ++++
2526  include/linux/genl_magic_struct.h  |  277 +++
2527  include/linux/idr.h                |   11 +
2528  include/linux/lru_cache.h          |   67 +-
2529  init/do_mounts.c                   |   61 +-
2530  lib/lru_cache.c                    |  359 ++--
2531  44 files changed, 12363 insertions(+), 8623 deletions(-)
2532  create mode 100644 drivers/block/drbd/drbd_interval.c
2533  create mode 100644 drivers/block/drbd/drbd_interval.h
2534  create mode 100644 drivers/block/drbd/drbd_nla.c
2535  create mode 100644 drivers/block/drbd/drbd_nla.h
2536  create mode 100644 drivers/block/drbd/drbd_state.c
2537  create mode 100644 drivers/block/drbd/drbd_state.h
2538  create mode 100644 include/linux/drbd_genl.h
2539  create mode 100644 include/linux/drbd_genl_api.h
2540  delete mode 100644 include/linux/drbd_nl.h
2541  delete mode 100644 include/linux/drbd_tag_magic.h
2542  create mode 100644 include/linux/genl_magic_func.h
2543  create mode 100644 include/linux/genl_magic_struct.h
2544 Merging device-mapper/master (cee3685 track_chunk is always called with interrupts enabled. Consequently, we do not need to save and restore interrupt state in "flags" variable. This patch changes spin_lock_irqsave to spin_lock_irq and spin_unlock_irqrestore to spin_unlock_irq.)
2545 $ git merge device-mapper/master
2546 Merge made by the 'recursive' strategy.
2547  drivers/md/dm-raid1.c                          |   10 ++---
2548  drivers/md/dm-snap.c                           |    5 +--
2549  drivers/md/persistent-data/dm-btree-internal.h |   16 ++++----
2550  drivers/md/persistent-data/dm-btree-remove.c   |   50 ++++++++++++------------
2551  drivers/md/persistent-data/dm-btree-spine.c    |    6 +--
2552  drivers/md/persistent-data/dm-btree.c          |   22 +++++------
2553  6 files changed, 53 insertions(+), 56 deletions(-)
2554 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
2555 $ git merge embedded/master
2556 Already up-to-date.
2557 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
2558 $ git merge firmware/master
2559 Already up-to-date.
2560 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
2561 $ git merge pcmcia/master
2562 Already up-to-date.
2563 Merging mmc/mmc-next (ca41633 mmc: dw_mmc: fix more const pointer warnings)
2564 $ git merge mmc/mmc-next
2565 Removing drivers/mmc/host/at91_mci.h
2566 Removing drivers/mmc/host/at91_mci.c
2567 Auto-merging MAINTAINERS
2568 Merge made by the 'recursive' strategy.
2569  MAINTAINERS                             |    8 -
2570  arch/arm/mach-at91/include/mach/board.h |   10 -
2571  drivers/mmc/card/queue.c                |   17 +-
2572  drivers/mmc/core/debugfs.c              |   16 +
2573  drivers/mmc/host/Kconfig                |   22 +-
2574  drivers/mmc/host/Makefile               |    1 -
2575  drivers/mmc/host/at91_mci.c             | 1219 -------------------------------
2576  drivers/mmc/host/at91_mci.h             |  115 ---
2577  drivers/mmc/host/dw_mmc-pci.c           |    2 +-
2578  drivers/mmc/host/dw_mmc-pltfm.c         |   16 +-
2579  drivers/mmc/host/dw_mmc.c               |   10 +-
2580  drivers/mmc/host/mxcmmc.c               |    2 +-
2581  drivers/mmc/host/omap_hsmmc.c           |   13 +-
2582  13 files changed, 48 insertions(+), 1403 deletions(-)
2583  delete mode 100644 drivers/mmc/host/at91_mci.c
2584  delete mode 100644 drivers/mmc/host/at91_mci.h
2585 Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
2586 $ git merge kgdb/kgdb-next
2587 Merge made by the 'recursive' strategy.
2588 Merging slab/for-next (31841eb Merge branch 'slab/next' into for-next)
2589 $ git merge slab/for-next
2590 Resolved 'mm/slob.c' using previous resolution.
2591 Auto-merging mm/slob.c
2592 CONFLICT (content): Merge conflict in mm/slob.c
2593 Automatic merge failed; fix conflicts and then commit the result.
2594 $ git commit -v -a
2595 [master 045215c] Merge remote-tracking branch 'slab/for-next'
2596 $ git diff -M --stat --summary HEAD^..
2597  include/linux/mm_types.h |    7 +--
2598  include/linux/slab.h     |    9 ++-
2599  mm/slab.c                |  146 ++++++++-------------------------------------
2600  mm/slab.h                |   45 ++++++++++++++
2601  mm/slab_common.c         |  116 ++++++++++++++++++++++++++++++++++++
2602  mm/slob.c                |   36 ++++--------
2603  mm/slub.c                |  147 ++++++++++++----------------------------------
2604  7 files changed, 247 insertions(+), 259 deletions(-)
2605 Merging uclinux/for-next (ddffeb8 Linux 3.7-rc1)
2606 $ git merge uclinux/for-next
2607 Already up-to-date.
2608 Merging md/for-next (79acf8a md:Avoid write invalid address if read_seqretry returned true.)
2609 $ git merge md/for-next
2610 Auto-merging block/blk-core.c
2611 Merge made by the 'recursive' strategy.
2612  block/blk-core.c   |    1 +
2613  drivers/md/md.c    |   27 +++-
2614  drivers/md/md.h    |    8 +
2615  drivers/md/raid5.c |  446 +++++++++++++++++++++++++++++++++++++++++++++++++---
2616  drivers/md/raid5.h |   19 +++
2617  5 files changed, 469 insertions(+), 32 deletions(-)
2618 Merging mfd/for-next (90a38d9 mfd: Remove Unicode Byte Order Marks from da9055)
2619 $ git merge mfd/for-next
2620 Removing include/linux/input/ti_tscadc.h
2621 Auto-merging drivers/mmc/host/Makefile
2622 Auto-merging drivers/mmc/host/Kconfig
2623 Removing drivers/input/touchscreen/ti_tscadc.c
2624 Merge made by the 'recursive' strategy.
2625  Documentation/devicetree/bindings/mfd/stmpe.txt |   25 +
2626  drivers/iio/adc/Kconfig                         |    7 +
2627  drivers/iio/adc/Makefile                        |    1 +
2628  drivers/iio/adc/ti_am335x_adc.c                 |  260 +++++
2629  drivers/input/touchscreen/Kconfig               |    6 +-
2630  drivers/input/touchscreen/Makefile              |    2 +-
2631  drivers/input/touchscreen/ti_am335x_tsc.c       |  398 +++++++
2632  drivers/input/touchscreen/ti_tscadc.c           |  486 --------
2633  drivers/memstick/host/Kconfig                   |   10 +
2634  drivers/memstick/host/Makefile                  |    1 +
2635  drivers/memstick/host/rtsx_pci_ms.c             |  641 +++++++++++
2636  drivers/mfd/Kconfig                             |   21 +
2637  drivers/mfd/Makefile                            |    4 +
2638  drivers/mfd/ab8500-core.c                       |   98 +-
2639  drivers/mfd/db8500-prcmu.c                      |    8 +-
2640  drivers/mfd/mc13xxx-core.c                      |   94 +-
2641  drivers/mfd/mc13xxx-i2c.c                       |   22 +-
2642  drivers/mfd/mc13xxx-spi.c                       |   29 +-
2643  drivers/mfd/mc13xxx.h                           |   18 +-
2644  drivers/mfd/rtl8411.c                           |  251 +++++
2645  drivers/mfd/rts5209.c                           |  223 ++++
2646  drivers/mfd/rts5229.c                           |  205 ++++
2647  drivers/mfd/rtsx_pcr.c                          | 1252 +++++++++++++++++++++
2648  drivers/mfd/rtsx_pcr.h                          |   32 +
2649  drivers/mfd/stmpe.c                             |  151 ++-
2650  drivers/mfd/ti_am335x_tscadc.c                  |  277 +++++
2651  drivers/mmc/host/Kconfig                        |    7 +
2652  drivers/mmc/host/Makefile                       |    2 +
2653  drivers/mmc/host/rtsx_pci_sdmmc.c               | 1348 +++++++++++++++++++++++
2654  include/linux/input/ti_am335x_tsc.h             |   23 +
2655  include/linux/input/ti_tscadc.h                 |   17 -
2656  include/linux/mfd/da9055/core.h                 |    2 +-
2657  include/linux/mfd/da9055/pdata.h                |    2 +-
2658  include/linux/mfd/da9055/reg.h                  |    2 +-
2659  include/linux/mfd/rtsx_common.h                 |   48 +
2660  include/linux/mfd/rtsx_pci.h                    |  794 +++++++++++++
2661  include/linux/mfd/stmpe.h                       |    2 +
2662  include/linux/mfd/ti_am335x_tscadc.h            |  152 +++
2663  include/linux/platform_data/ti_am335x_adc.h     |   14 +
2664  39 files changed, 6228 insertions(+), 707 deletions(-)
2665  create mode 100644 Documentation/devicetree/bindings/mfd/stmpe.txt
2666  create mode 100644 drivers/iio/adc/ti_am335x_adc.c
2667  create mode 100644 drivers/input/touchscreen/ti_am335x_tsc.c
2668  delete mode 100644 drivers/input/touchscreen/ti_tscadc.c
2669  create mode 100644 drivers/memstick/host/rtsx_pci_ms.c
2670  create mode 100644 drivers/mfd/rtl8411.c
2671  create mode 100644 drivers/mfd/rts5209.c
2672  create mode 100644 drivers/mfd/rts5229.c
2673  create mode 100644 drivers/mfd/rtsx_pcr.c
2674  create mode 100644 drivers/mfd/rtsx_pcr.h
2675  create mode 100644 drivers/mfd/ti_am335x_tscadc.c
2676  create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
2677  create mode 100644 include/linux/input/ti_am335x_tsc.h
2678  delete mode 100644 include/linux/input/ti_tscadc.h
2679  create mode 100644 include/linux/mfd/rtsx_common.h
2680  create mode 100644 include/linux/mfd/rtsx_pci.h
2681  create mode 100644 include/linux/mfd/ti_am335x_tscadc.h
2682  create mode 100644 include/linux/platform_data/ti_am335x_adc.h
2683 Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
2684 $ git merge battery/master
2685 Already up-to-date.
2686 Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
2687 $ git merge fbdev/fbdev-next
2688 Already up-to-date.
2689 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
2690 $ git merge viafb/viafb-next
2691 Already up-to-date.
2692 Merging omap_dss2/for-next (13b1ba7 OMAPDSS: add missing include for string.h)
2693 $ git merge omap_dss2/for-next
2694 Already up-to-date.
2695 Merging regulator/for-next (a9829f2 Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/topic/gpio', 'regulator/topic/lp8788', 'regulator/topic/max77686', 'regulator/topic/max8925', 'regulator/topic/tps51632', 'regulator/topic/tps65910' and 'regulator/topic/vexpress' into regulator-next)
2696 $ git merge regulator/for-next
2697 Removing include/linux/regulator/tps65090-regulator.h
2698 Merge made by the 'recursive' strategy.
2699  .../bindings/regulator/gpio-regulator.txt          |   36 +++
2700  .../bindings/regulator/max8925-regulator.txt       |   40 +++
2701  .../devicetree/bindings/regulator/vexpress.txt     |   32 ++
2702  drivers/regulator/Kconfig                          |   18 ++
2703  drivers/regulator/Makefile                         |    2 +
2704  drivers/regulator/core.c                           |    8 +-
2705  drivers/regulator/gpio-regulator.c                 |   94 ++++++
2706  drivers/regulator/lp8788-ldo.c                     |    2 +-
2707  drivers/regulator/max77686.c                       |  164 +++++++++-
2708  drivers/regulator/max8925-regulator.c              |   72 ++++-
2709  drivers/regulator/tps51632-regulator.c             |  332 ++++++++++++++++++++
2710  drivers/regulator/tps65090-regulator.c             |  247 +++++++++++----
2711  drivers/regulator/vexpress.c                       |  147 +++++++++
2712  include/linux/mfd/tps65090.h                       |   35 +++
2713  include/linux/regulator/driver.h                   |    3 +
2714  include/linux/regulator/tps51632-regulator.h       |   47 +++
2715  include/linux/regulator/tps65090-regulator.h       |   50 ---
2716  17 files changed, 1202 insertions(+), 127 deletions(-)
2717  create mode 100644 Documentation/devicetree/bindings/regulator/gpio-regulator.txt
2718  create mode 100644 Documentation/devicetree/bindings/regulator/max8925-regulator.txt
2719  create mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt
2720  create mode 100644 drivers/regulator/tps51632-regulator.c
2721  create mode 100644 drivers/regulator/vexpress.c
2722  create mode 100644 include/linux/regulator/tps51632-regulator.h
2723  delete mode 100644 include/linux/regulator/tps65090-regulator.h
2724 Merging security/next (b566650 drivers/char/tpm: remove tasklet and cleanup)
2725 $ git merge security/next
2726 Resolved 'fs/cifs/cifsacl.c' using previous resolution.
2727 Resolved 'net/dns_resolver/dns_key.c' using previous resolution.
2728 Resolved 'security/keys/keyctl.c' using previous resolution.
2729 Resolved 'security/keys/keyring.c' using previous resolution.
2730 Resolved 'security/keys/process_keys.c' using previous resolution.
2731 Auto-merging security/keys/request_key.c
2732 Auto-merging security/keys/process_keys.c
2733 CONFLICT (content): Merge conflict in security/keys/process_keys.c
2734 Auto-merging security/keys/keyring.c
2735 CONFLICT (content): Merge conflict in security/keys/keyring.c
2736 Auto-merging security/keys/keyctl.c
2737 CONFLICT (content): Merge conflict in security/keys/keyctl.c
2738 Auto-merging security/keys/key.c
2739 Auto-merging net/dns_resolver/dns_key.c
2740 CONFLICT (content): Merge conflict in net/dns_resolver/dns_key.c
2741 Auto-merging kernel/cred.c
2742 Auto-merging include/linux/key.h
2743 Auto-merging fs/nfs/idmap.c
2744 Auto-merging fs/cifs/cifsacl.c
2745 CONFLICT (content): Merge conflict in fs/cifs/cifsacl.c
2746 Auto-merging arch/x86/kernel/vsyscall_64.c
2747 Auto-merging Documentation/security/keys.txt
2748 Automatic merge failed; fix conflicts and then commit the result.
2749 $ git commit -v -a
2750 [master 2b0c349] Merge remote-tracking branch 'security/next'
2751 $ git diff -M --stat --summary HEAD^..
2752  Documentation/prctl/seccomp_filter.txt |   74 +++++++++++++++++--
2753  Documentation/security/keys.txt        |   17 +++++
2754  arch/x86/kernel/vsyscall_64.c          |  110 ++++++++++++++-------------
2755  drivers/char/tpm/tpm_ibmvtpm.c         |   81 +++++++-------------
2756  drivers/char/tpm/tpm_ibmvtpm.h         |    5 +-
2757  fs/nfs/idmap.c                         |   12 +--
2758  include/linux/cred.h                   |   17 +----
2759  include/linux/key.h                    |    1 +
2760  kernel/cred.c                          |  127 ++++----------------------------
2761  kernel/seccomp.c                       |   13 +++-
2762  net/dns_resolver/dns_key.c             |    9 +--
2763  security/keys/key.c                    |    6 +-
2764  security/keys/keyctl.c                 |   15 ++--
2765  security/keys/keyring.c                |   10 +--
2766  security/keys/process_keys.c           |   94 ++++++++++-------------
2767  security/keys/request_key.c            |   21 ++++--
2768  16 files changed, 278 insertions(+), 334 deletions(-)
2769 Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
2770 $ git merge selinux/master
2771 Already up-to-date!
2772 Merge made by the 'recursive' strategy.
2773 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
2774 $ git merge lblnet/master
2775 Already up-to-date.
2776 Merging watchdog/master (58ddfed Merge branch 'master' of ../linux-watchdog)
2777 $ git merge watchdog/master
2778 Merge made by the 'recursive' strategy.
2779  drivers/watchdog/davinci_wdt.c |    4 ++--
2780  1 file changed, 2 insertions(+), 2 deletions(-)
2781 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
2782 $ git merge dwmw2-iommu/master
2783 Already up-to-date.
2784 Merging iommu/next (f74b527 Merge branches 'iommu/fixes', 'dma-debug' and 'x86/amd' into next)
2785 $ git merge iommu/next
2786 Merge made by the 'recursive' strategy.
2787  Documentation/DMA-API-HOWTO.txt    |  126 ++++++++++++++++++++++++
2788  Documentation/DMA-API.txt          |   12 +++
2789  arch/x86/include/asm/dma-mapping.h |    1 +
2790  drivers/iommu/amd_iommu.c          |  184 +++++++++++++++++++++++++++---------
2791  drivers/iommu/amd_iommu_types.h    |    1 +
2792  include/linux/dma-debug.h          |    7 ++
2793  lib/dma-debug.c                    |   71 +++++++++++++-
2794  7 files changed, 355 insertions(+), 47 deletions(-)
2795 Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
2796 $ git merge vfio/next
2797 Already up-to-date.
2798 Merging osd/linux-next (b6755ff osduld: Add osdname & systemid sysfs at scsi_osd class)
2799 $ git merge osd/linux-next
2800 Merge made by the 'recursive' strategy.
2801  drivers/scsi/osd/osd_uld.c |   28 ++++++++++++++++++++++++++++
2802  1 file changed, 28 insertions(+)
2803 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
2804 $ git merge jc_docs/docs-next
2805 Already up-to-date.
2806 Merging trivial/for-next (8166ea0 alpha: use BUG_ON where possible)
2807 $ git merge trivial/for-next
2808 Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
2809 Auto-merging drivers/scsi/qla2xxx/qla_target.c
2810 Auto-merging drivers/md/raid5.c
2811 Auto-merging drivers/md/md.c
2812 Merge made by the 'recursive' strategy.
2813  README                                         |    4 ++++
2814  arch/alpha/kernel/pci_iommu.c                  |   12 ++++--------
2815  drivers/base/firmware_class.c                  |    2 +-
2816  drivers/char/ppdev.c                           |    6 +-----
2817  drivers/isdn/hisax/amd7930_fn.c                |    2 +-
2818  drivers/isdn/hisax/isar.c                      |    2 +-
2819  drivers/md/md.c                                |    2 +-
2820  drivers/md/persistent-data/dm-block-manager.c  |    4 ++--
2821  drivers/md/persistent-data/dm-btree.h          |    2 +-
2822  drivers/md/raid5.c                             |    2 +-
2823  drivers/net/wimax/i2400m/debugfs.c             |    1 +
2824  drivers/scsi/qla2xxx/qla_isr.c                 |    4 ++--
2825  drivers/scsi/qla2xxx/qla_nx.c                  |    4 ++--
2826  drivers/scsi/qla2xxx/qla_target.c              |   12 ++++++------
2827  drivers/scsi/qla2xxx/tcm_qla2xxx.c             |    2 +-
2828  drivers/target/iscsi/iscsi_target_parameters.c |    1 +
2829  drivers/tty/hvc/hvc_opal.c                     |    2 +-
2830  drivers/tty/hvc/hvc_vio.c                      |    2 +-
2831  drivers/tty/serial/8250/Kconfig                |    2 +-
2832  drivers/tty/serial/bfin_uart.c                 |    2 +-
2833  drivers/tty/serial/icom.c                      |    2 +-
2834  fs/btrfs/ctree.h                               |    2 +-
2835  fs/btrfs/extent_map.c                          |    3 +--
2836  fs/btrfs/volumes.c                             |    2 +-
2837  mm/util.c                                      |    2 +-
2838  net/rfkill/core.c                              |    4 ++--
2839  26 files changed, 41 insertions(+), 44 deletions(-)
2840 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
2841 $ git merge audit/for-next
2842 Already up-to-date.
2843 Merging pm/linux-next (ea9c8e2 Merge branch 'acpi-enumeration-next' into linux-next)
2844 $ git merge pm/linux-next
2845 Resolved 'arch/x86/pci/acpi.c' using previous resolution.
2846 Auto-merging drivers/mtd/nand/sh_flctl.c
2847 Auto-merging drivers/base/platform.c
2848 Auto-merging drivers/acpi/pci_irq.c
2849 Auto-merging arch/x86/pci/acpi.c
2850 CONFLICT (content): Merge conflict in arch/x86/pci/acpi.c
2851 Automatic merge failed; fix conflicts and then commit the result.
2852 $ git commit -v -a
2853 [master e4e8a52] Merge remote-tracking branch 'pm/linux-next'
2854 $ git diff -M --stat --summary HEAD^..
2855  Documentation/ABI/testing/sysfs-class-devfreq |   15 +-
2856  Documentation/ABI/testing/sysfs-devices-power |   31 +
2857  Documentation/power/pm_qos_interface.txt      |    2 +-
2858  arch/ia64/include/asm/device.h                |    3 -
2859  arch/ia64/kernel/acpi.c                       |    2 +
2860  arch/x86/include/asm/device.h                 |    3 -
2861  arch/x86/kernel/acpi/boot.c                   |    6 +
2862  arch/x86/kernel/acpi/sleep.c                  |    2 +
2863  arch/x86/pci/acpi.c                           |   11 +
2864  drivers/acpi/Makefile                         |    4 +-
2865  drivers/acpi/acpi_memhotplug.c                |   51 +-
2866  drivers/acpi/acpi_pad.c                       |    8 +-
2867  drivers/acpi/acpi_platform.c                  |  267 +++++++++
2868  drivers/acpi/acpica/Makefile                  |    3 +
2869  drivers/acpi/acpica/acdebug.h                 |   94 ++--
2870  drivers/acpi/acpica/acdispat.h                |   11 +-
2871  drivers/acpi/acpica/acevents.h                |    6 +-
2872  drivers/acpi/acpica/acglobal.h                |   73 +--
2873  drivers/acpi/acpica/aclocal.h                 |   16 +-
2874  drivers/acpi/acpica/acmacros.h                |  163 ++----
2875  drivers/acpi/acpica/acobject.h                |    7 +-
2876  drivers/acpi/acpica/acopcode.h                |    6 +-
2877  drivers/acpi/acpica/acparser.h                |    3 +-
2878  drivers/acpi/acpica/acpredef.h                |   11 +-
2879  drivers/acpi/acpica/acstruct.h                |    2 +-
2880  drivers/acpi/acpica/acutils.h                 |   58 +-
2881  drivers/acpi/acpica/amlresrc.h                |    1 -
2882  drivers/acpi/acpica/dscontrol.c               |    2 +-
2883  drivers/acpi/acpica/dsfield.c                 |    2 +-
2884  drivers/acpi/acpica/dsmethod.c                |    6 +-
2885  drivers/acpi/acpica/dsmthdat.c                |   14 +-
2886  drivers/acpi/acpica/dsobject.c                |    6 +-
2887  drivers/acpi/acpica/dsopcode.c                |    3 +-
2888  drivers/acpi/acpica/dsutils.c                 |   33 +-
2889  drivers/acpi/acpica/dswexec.c                 |   10 +-
2890  drivers/acpi/acpica/dswload2.c                |    4 +-
2891  drivers/acpi/acpica/dswstate.c                |   26 +-
2892  drivers/acpi/acpica/evgpe.c                   |   20 +-
2893  drivers/acpi/acpica/evgpeblk.c                |    3 +-
2894  drivers/acpi/acpica/evgpeutil.c               |    3 +-
2895  drivers/acpi/acpica/evrgnini.c                |    7 +-
2896  drivers/acpi/acpica/evxface.c                 |    2 +-
2897  drivers/acpi/acpica/evxfgpe.c                 |   13 +-
2898  drivers/acpi/acpica/exconvrt.c                |    4 +-
2899  drivers/acpi/acpica/excreate.c                |    9 +-
2900  drivers/acpi/acpica/exdebug.c                 |   10 +-
2901  drivers/acpi/acpica/exdump.c                  |   20 +-
2902  drivers/acpi/acpica/exfield.c                 |    4 +-
2903  drivers/acpi/acpica/exfldio.c                 |   15 +-
2904  drivers/acpi/acpica/exmisc.c                  |    5 +-
2905  drivers/acpi/acpica/exmutex.c                 |    9 +-
2906  drivers/acpi/acpica/exnames.c                 |    9 +-
2907  drivers/acpi/acpica/exoparg1.c                |   11 +-
2908  drivers/acpi/acpica/exoparg2.c                |    2 +-
2909  drivers/acpi/acpica/exoparg3.c                |    3 +-
2910  drivers/acpi/acpica/exoparg6.c                |    5 +-
2911  drivers/acpi/acpica/exprep.c                  |   13 +-
2912  drivers/acpi/acpica/exregion.c                |    3 +-
2913  drivers/acpi/acpica/exresnte.c                |    9 +-
2914  drivers/acpi/acpica/exresolv.c                |    3 +-
2915  drivers/acpi/acpica/exresop.c                 |    8 +-
2916  drivers/acpi/acpica/exstore.c                 |    4 +-
2917  drivers/acpi/acpica/exstoren.c                |   11 +-
2918  drivers/acpi/acpica/exstorob.c                |    5 +-
2919  drivers/acpi/acpica/exsystem.c                |    9 +-
2920  drivers/acpi/acpica/exutils.c                 |    5 +-
2921  drivers/acpi/acpica/hwacpi.c                  |    3 +-
2922  drivers/acpi/acpica/hwgpe.c                   |    4 +-
2923  drivers/acpi/acpica/hwpci.c                   |    4 +-
2924  drivers/acpi/acpica/hwregs.c                  |    1 -
2925  drivers/acpi/acpica/hwtimer.c                 |    6 +-
2926  drivers/acpi/acpica/hwvalid.c                 |    1 -
2927  drivers/acpi/acpica/hwxface.c                 |    1 -
2928  drivers/acpi/acpica/hwxfsleep.c               |   12 +-
2929  drivers/acpi/acpica/nsaccess.c                |    7 +-
2930  drivers/acpi/acpica/nsalloc.c                 |    4 +-
2931  drivers/acpi/acpica/nsdump.c                  |   10 +-
2932  drivers/acpi/acpica/nsinit.c                  |    4 +-
2933  drivers/acpi/acpica/nsload.c                  |   10 +-
2934  drivers/acpi/acpica/nsnames.c                 |    2 +-
2935  drivers/acpi/acpica/nsobject.c                |    8 +-
2936  drivers/acpi/acpica/nsparse.c                 |    8 +-
2937  drivers/acpi/acpica/nssearch.c                |   17 +-
2938  drivers/acpi/acpica/nsutils.c                 |   18 +-
2939  drivers/acpi/acpica/nswalk.c                  |   10 +-
2940  drivers/acpi/acpica/nsxfeval.c                |   20 +-
2941  drivers/acpi/acpica/nsxfname.c                |   66 ++-
2942  drivers/acpi/acpica/nsxfobj.c                 |    4 +-
2943  drivers/acpi/acpica/psargs.c                  |    8 +-
2944  drivers/acpi/acpica/psloop.c                  |   61 +-
2945  drivers/acpi/acpica/psopcode.c                |   29 +-
2946  drivers/acpi/acpica/psparse.c                 |   13 +-
2947  drivers/acpi/acpica/psutils.c                 |    4 +-
2948  drivers/acpi/acpica/rscalc.c                  |   14 +-
2949  drivers/acpi/acpica/rslist.c                  |    4 +-
2950  drivers/acpi/acpica/tbfind.c                  |    2 +-
2951  drivers/acpi/acpica/tbinstal.c                |    2 +
2952  drivers/acpi/acpica/tbutils.c                 |    2 +-
2953  drivers/acpi/acpica/tbxface.c                 |    4 +-
2954  drivers/acpi/acpica/tbxfload.c                |    2 +-
2955  drivers/acpi/acpica/tbxfroot.c                |    3 +-
2956  drivers/acpi/acpica/utcache.c                 |  323 +++++++++++
2957  drivers/acpi/acpica/utclib.c                  |  749 +++++++++++++++++++++++++
2958  drivers/acpi/acpica/utdebug.c                 |   37 +-
2959  drivers/acpi/acpica/utids.c                   |  104 +++-
2960  drivers/acpi/acpica/utmath.c                  |    2 +-
2961  drivers/acpi/acpica/utmisc.c                  |  150 ++++-
2962  drivers/acpi/acpica/utmutex.c                 |   14 +-
2963  drivers/acpi/acpica/utobject.c                |    8 +-
2964  drivers/acpi/acpica/utstate.c                 |    2 +-
2965  drivers/acpi/acpica/uttrack.c                 |  692 +++++++++++++++++++++++
2966  drivers/acpi/acpica/utxface.c                 |    5 +-
2967  drivers/acpi/acpica/utxferror.c               |    2 +-
2968  drivers/acpi/bus.c                            |   15 +-
2969  drivers/acpi/container.c                      |   17 +-
2970  drivers/acpi/device_pm.c                      |  648 +++++++++++++++++++++
2971  drivers/acpi/dock.c                           |   26 +-
2972  drivers/acpi/ec.c                             |   97 ++--
2973  drivers/acpi/glue.c                           |   14 +-
2974  drivers/acpi/internal.h                       |   11 +-
2975  drivers/acpi/osl.c                            |   22 +-
2976  drivers/acpi/pci_irq.c                        |    5 -
2977  drivers/acpi/power.c                          |    2 +-
2978  drivers/acpi/processor_driver.c               |   41 +-
2979  drivers/acpi/scan.c                           |  102 +++-
2980  drivers/acpi/sleep.c                          |  195 +------
2981  drivers/acpi/sysfs.c                          |    4 +-
2982  drivers/base/core.c                           |    2 +-
2983  drivers/base/platform.c                       |    5 +
2984  drivers/base/power/clock_ops.c                |    6 +-
2985  drivers/base/power/domain.c                   |   11 +-
2986  drivers/base/power/opp.c                      |   44 +-
2987  drivers/base/power/power.h                    |    6 +-
2988  drivers/base/power/qos.c                      |  308 ++++++++--
2989  drivers/base/power/sysfs.c                    |   94 +++-
2990  drivers/cpufreq/Makefile                      |    4 +-
2991  drivers/cpufreq/cpufreq.c                     |   37 +-
2992  drivers/cpufreq/cpufreq_conservative.c        |  558 +++++-------------
2993  drivers/cpufreq/cpufreq_governor.c            |  318 +++++++++++
2994  drivers/cpufreq/cpufreq_governor.h            |  176 ++++++
2995  drivers/cpufreq/cpufreq_ondemand.c            |  728 ++++++++----------------
2996  drivers/cpufreq/cpufreq_performance.c         |    2 +
2997  drivers/cpufreq/cpufreq_powersave.c           |    2 +
2998  drivers/cpufreq/cpufreq_stats.c               |    4 +-
2999  drivers/cpufreq/cpufreq_userspace.c           |    2 +
3000  drivers/cpufreq/freq_table.c                  |    2 +
3001  drivers/cpuidle/Kconfig                       |    9 +
3002  drivers/cpuidle/cpuidle.c                     |   52 +-
3003  drivers/cpuidle/cpuidle.h                     |   13 +-
3004  drivers/cpuidle/driver.c                      |  209 ++++++-
3005  drivers/cpuidle/governors/menu.c              |  166 +++++-
3006  drivers/cpuidle/sysfs.c                       |  201 ++++++-
3007  drivers/devfreq/devfreq.c                     |  517 ++++++++---------
3008  drivers/devfreq/governor.h                    |   13 +
3009  drivers/devfreq/governor_performance.c        |   16 +-
3010  drivers/devfreq/governor_powersave.c          |   16 +-
3011  drivers/devfreq/governor_simpleondemand.c     |   33 ++
3012  drivers/devfreq/governor_userspace.c          |   23 +-
3013  drivers/mtd/nand/sh_flctl.c                   |    4 +-
3014  drivers/pci/pci-acpi.c                        |   79 +--
3015  include/acpi/acconfig.h                       |    1 +
3016  include/acpi/acexcep.h                        |    2 +-
3017  include/acpi/acnames.h                        |    1 +
3018  include/acpi/acpi_bus.h                       |   71 ++-
3019  include/acpi/acpiosxf.h                       |    3 +-
3020  include/acpi/acpixf.h                         |   18 +-
3021  include/acpi/actbl3.h                         |   22 +-
3022  include/acpi/actypes.h                        |   42 +-
3023  include/linux/acpi.h                          |   68 ++-
3024  include/linux/cpufreq.h                       |    5 +-
3025  include/linux/cpuidle.h                       |   15 +-
3026  include/linux/devfreq.h                       |   49 +-
3027  include/linux/device.h                        |    4 +
3028  include/linux/pm.h                            |    3 +-
3029  include/linux/pm_qos.h                        |   77 ++-
3030  include/linux/tick.h                          |    6 +
3031  kernel/cpu.c                                  |    8 +-
3032  kernel/power/main.c                           |    2 +-
3033  kernel/power/qos.c                            |   65 ++-
3034  kernel/power/swap.c                           |    2 +-
3035  kernel/time/tick-sched.c                      |    4 +
3036  181 files changed, 6465 insertions(+), 2507 deletions(-)
3037  create mode 100644 drivers/acpi/acpi_platform.c
3038  create mode 100644 drivers/acpi/acpica/utcache.c
3039  create mode 100644 drivers/acpi/acpica/utclib.c
3040  create mode 100644 drivers/acpi/acpica/uttrack.c
3041  create mode 100644 drivers/acpi/device_pm.c
3042  create mode 100644 drivers/cpufreq/cpufreq_governor.c
3043  create mode 100644 drivers/cpufreq/cpufreq_governor.h
3044 Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
3045 $ git merge apm/for-next
3046 Already up-to-date.
3047 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
3048 $ git merge fsnotify/for-next
3049 Resolved 'kernel/audit_tree.c' using previous resolution.
3050 Auto-merging kernel/audit_watch.c
3051 Auto-merging kernel/audit_tree.c
3052 CONFLICT (content): Merge conflict in kernel/audit_tree.c
3053 Auto-merging include/linux/fsnotify_backend.h
3054 Auto-merging fs/notify/notification.c
3055 Auto-merging fs/notify/inotify/inotify_user.c
3056 Auto-merging fs/notify/fanotify/fanotify_user.c
3057 Auto-merging fs/notify/fanotify/fanotify.c
3058 Automatic merge failed; fix conflicts and then commit the result.
3059 $ git commit -v -a
3060 [master 58dfd27] Merge remote-tracking branch 'fsnotify/for-next'
3061 $ git diff -M --stat --summary HEAD^..
3062  fs/notify/dnotify/dnotify.c          |    4 +-
3063  fs/notify/fanotify/fanotify.c        |    6 +++
3064  fs/notify/fanotify/fanotify_user.c   |   37 +++++++++-----
3065  fs/notify/group.c                    |   47 ++++++++++--------
3066  fs/notify/inode_mark.c               |   14 ++++--
3067  fs/notify/inotify/inotify_fsnotify.c |    4 +-
3068  fs/notify/inotify/inotify_user.c     |   34 ++++++-------
3069  fs/notify/mark.c                     |   91 +++++++++++++++++++---------------
3070  fs/notify/notification.c             |    1 +
3071  fs/notify/vfsmount_mark.c            |   14 ++++--
3072  include/linux/fsnotify_backend.h     |   31 ++++++++----
3073  kernel/audit_tree.c                  |   10 ++--
3074  kernel/audit_watch.c                 |    4 +-
3075  13 files changed, 178 insertions(+), 119 deletions(-)
3076 Merging edac/linux_next (5e75cbb Merge branch 'devel' into next)
3077 $ git merge edac/linux_next
3078 Auto-merging drivers/edac/edac_mc.c
3079 Merge made by the 'recursive' strategy.
3080  drivers/edac/edac_mc.c      |   21 +-
3081  drivers/edac/i7300_edac.c   |    8 +-
3082  drivers/edac/i82975x_edac.c |  457 +++++++++++++++++++++++++------------------
3083  drivers/edac/sb_edac.c      |    2 +-
3084  include/linux/edac.h        |    1 -
3085  5 files changed, 288 insertions(+), 201 deletions(-)
3086 Merging edac-amd/for-next (a8373ec EDAC: Handle error path in edac_mc_sysfs_init() properly)
3087 $ git merge edac-amd/for-next
3088 Auto-merging include/linux/edac.h
3089 Auto-merging drivers/edac/edac_mc.c
3090 Auto-merging drivers/edac/Kconfig
3091 Merge made by the 'recursive' strategy.
3092  drivers/edac/Kconfig            |    8 +-
3093  drivers/edac/amd64_edac.c       |  297 +++++++++++++++------------------------
3094  drivers/edac/amd64_edac.h       |   59 ++++++--
3095  drivers/edac/amd64_edac_inj.c   |  128 +++++++++--------
3096  drivers/edac/edac_mc.c          |   57 ++++----
3097  drivers/edac/edac_mc_sysfs.c    |   39 +++--
3098  drivers/edac/edac_module.c      |   27 +++-
3099  drivers/edac/edac_pci.c         |    3 +-
3100  drivers/edac/highbank_mc_edac.c |    8 +-
3101  drivers/edac/mce_amd.c          |  254 +++++++++++++++++----------------
3102  drivers/edac/mce_amd.h          |   11 +-
3103  include/linux/edac.h            |    3 +
3104  12 files changed, 456 insertions(+), 438 deletions(-)
3105 Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
3106 $ git merge devicetree/devicetree/next
3107 Already up-to-date.
3108 Merging dt-rh/for-next (55020c8 of: Add vendor prefix for ON Semiconductor Corp.)
3109 $ git merge dt-rh/for-next
3110 Merge made by the 'recursive' strategy.
3111  Documentation/devicetree/bindings/arm/l2cc.txt        |    2 +-
3112  Documentation/devicetree/bindings/vendor-prefixes.txt |    1 +
3113  drivers/of/fdt.c                                      |    1 +
3114  3 files changed, 3 insertions(+), 1 deletion(-)
3115 Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
3116 $ git merge spi/spi/next
3117 Already up-to-date.
3118 Merging spi-mb/spi-next (19f15f0 Merge branches 'spi-core' and 'spi-tegra' into spi-next)
3119 $ git merge spi-mb/spi-next
3120 Auto-merging drivers/spi/spi.c
3121 Auto-merging drivers/spi/spi-s3c64xx.c
3122 Merge made by the 'recursive' strategy.
3123  .../bindings/spi/nvidia,tegra20-slink.txt          |   26 +
3124  Documentation/devicetree/bindings/spi/omap-spi.txt |    4 +-
3125  drivers/spi/Kconfig                                |    6 +
3126  drivers/spi/Makefile                               |    2 +-
3127  drivers/spi/spi-omap2-mcspi.c                      |   64 +-
3128  drivers/spi/spi-pl022.c                            |   52 +-
3129  drivers/spi/spi-s3c64xx.c                          |   34 +-
3130  drivers/spi/spi-tegra20-slink.c                    | 1358 ++++++++++++++++++++
3131  drivers/spi/spi.c                                  |   16 +-
3132  drivers/spi/spidev.c                               |   10 +
3133  include/linux/platform_data/spi-omap2-mcspi.h      |    4 +
3134  include/linux/spi/spi-tegra.h                      |   40 +
3135  12 files changed, 1551 insertions(+), 65 deletions(-)
3136  create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
3137  create mode 100644 drivers/spi/spi-tegra20-slink.c
3138  create mode 100644 include/linux/spi/spi-tegra.h
3139 Merging tip/auto-latest (8a1d31c Merge branch 'x86/urgent')
3140 $ git merge tip/auto-latest
3141 Auto-merging kernel/time/tick-sched.c
3142 Auto-merging include/linux/mm_types.h
3143 Auto-merging include/linux/kvm_host.h
3144 Auto-merging include/linux/device.h
3145 Auto-merging include/linux/acpi.h
3146 Auto-merging drivers/edac/amd64_edac.h
3147 Auto-merging drivers/base/core.c
3148 Auto-merging drivers/acpi/osl.c
3149 Auto-merging arch/x86/kernel/acpi/boot.c
3150 Auto-merging arch/s390/include/asm/pgtable.h
3151 Auto-merging arch/mips/include/asm/pgtable.h
3152 Auto-merging MAINTAINERS
3153 Merge made by the 'recursive' strategy.
3154  CREDITS                                            |    1 +
3155  Documentation/acpi/initrd_table_override.txt       |   94 ++
3156  Documentation/scheduler/numa-problem.txt           |  230 +++
3157  Documentation/x86/boot.txt                         |    4 +-
3158  MAINTAINERS                                        |   22 +-
3159  arch/ia64/kernel/time.c                            |    8 +-
3160  arch/mips/include/asm/pgtable.h                    |    2 +
3161  arch/powerpc/kernel/time.c                         |    4 +-
3162  arch/s390/include/asm/pgtable.h                    |   13 +
3163  arch/s390/kernel/vtime.c                           |    4 +
3164  arch/s390/kvm/kvm-s390.c                           |    4 -
3165  arch/sh/mm/Kconfig                                 |    1 +
3166  arch/x86/Kconfig                                   |   33 +-
3167  arch/x86/include/asm/mce.h                         |   21 +-
3168  arch/x86/include/asm/pgtable.h                     |    7 +
3169  arch/x86/kernel/Makefile                           |    1 -
3170  arch/x86/kernel/acpi/boot.c                        |    6 +
3171  arch/x86/kernel/cpu/mcheck/mce-internal.h          |    2 -
3172  arch/x86/kernel/cpu/mcheck/mce-severity.c          |    4 +-
3173  arch/x86/kernel/cpu/mcheck/mce.c                   |  209 +--
3174  arch/x86/kernel/cpu/mcheck/mce_amd.c               |    2 +-
3175  arch/x86/kernel/cpu/mcheck/mce_intel.c             |    8 +-
3176  arch/x86/kernel/cpu/perf_event.c                   |  121 ++
3177  arch/x86/kernel/cpu/perf_event.h                   |    5 +
3178  arch/x86/kernel/cpu/perf_event_amd.c               |    9 +
3179  arch/x86/kernel/cpu/perf_event_intel.c             |    9 +
3180  arch/x86/kernel/cpu/perf_event_p6.c                |    2 +
3181  arch/x86/kernel/microcode_amd.c                    |    4 +-
3182  arch/x86/kernel/process.c                          |   39 +-
3183  arch/x86/kernel/rtc.c                              |    6 -
3184  arch/x86/kernel/setup.c                            |    4 +
3185  arch/x86/kernel/tsc.c                              |    6 +
3186  arch/x86/lguest/boot.c                             |    2 +-
3187  arch/x86/lib/copy_page_64.S                        |  120 +-
3188  arch/x86/mm/gup.c                                  |   23 +-
3189  arch/x86/mm/pgtable.c                              |    8 +-
3190  arch/x86/pci/ce4100.c                              |   13 +
3191  arch/x86/platform/ce4100/ce4100.c                  |   24 +
3192  drivers/acpi/Kconfig                               |    9 +
3193  drivers/acpi/osl.c                                 |  202 ++-
3194  drivers/base/core.c                                |   21 +
3195  drivers/edac/amd64_edac.h                          |    2 +-
3196  drivers/edac/edac_stub.c                           |    2 +-
3197  drivers/edac/mce_amd_inj.c                         |    4 +-
3198  include/asm-generic/pgtable.h                      |    4 +
3199  include/linux/acpi.h                               |   16 +
3200  include/linux/device.h                             |    7 +
3201  include/linux/earlycpio.h                          |   17 +
3202  include/linux/hardirq.h                            |   15 +-
3203  include/linux/huge_mm.h                            |   19 +
3204  include/linux/init_task.h                          |    8 +
3205  include/linux/kernel_stat.h                        |    9 +-
3206  include/linux/kvm_host.h                           |   12 +-
3207  include/linux/mempolicy.h                          |    8 +
3208  include/linux/migrate.h                            |    7 +
3209  include/linux/migrate_mode.h                       |    3 +
3210  include/linux/mm.h                                 |  122 +-
3211  include/linux/mm_types.h                           |   10 +
3212  include/linux/mmzone.h                             |   14 +-
3213  include/linux/page-flags-layout.h                  |   83 ++
3214  include/linux/sched.h                              |   66 +-
3215  include/linux/vtime.h                              |   47 +
3216  include/uapi/linux/mempolicy.h                     |   17 +-
3217  init/Kconfig                                       |   14 +
3218  kernel/events/hw_breakpoint.c                      |   12 +-
3219  kernel/lockdep_proc.c                              |    2 +-
3220  kernel/sched/core.c                                |   88 +-
3221  kernel/sched/cputime.c                             |   20 +-
3222  kernel/sched/debug.c                               |   39 +-
3223  kernel/sched/fair.c                                | 1483 ++++++++++++++++---
3224  kernel/sched/features.h                            |   19 +
3225  kernel/sched/sched.h                               |   96 +-
3226  kernel/softirq.c                                   |    6 +-
3227  kernel/sysctl.c                                    |   45 +-
3228  kernel/time/tick-sched.c                           |  113 +-
3229  lib/Makefile                                       |    2 +-
3230  lib/earlycpio.c                                    |  145 ++
3231  mm/huge_memory.c                                   |  254 +++-
3232  mm/memory.c                                        |  132 +-
3233  mm/mempolicy.c                                     |  204 ++-
3234  mm/migrate.c                                       |   87 +-
3235  mm/mprotect.c                                      |   31 +-
3236  mm/pgtable-generic.c                               |    9 +-
3237  scripts/kconfig/Makefile                           |    7 +-
3238  tools/kvm/.gitignore                               |   12 +
3239  tools/kvm/CREDITS-Git                              |   30 +
3240  tools/kvm/Documentation/kernel-debugging.txt       |   15 +
3241  tools/kvm/Documentation/kvm-balloon.txt            |   24 +
3242  tools/kvm/Documentation/kvm-debug.txt              |   16 +
3243  tools/kvm/Documentation/kvm-list.txt               |   16 +
3244  tools/kvm/Documentation/kvm-pause.txt              |   16 +
3245  tools/kvm/Documentation/kvm-resume.txt             |   16 +
3246  tools/kvm/Documentation/kvm-run.txt                |   62 +
3247  tools/kvm/Documentation/kvm-sandbox.txt            |   16 +
3248  tools/kvm/Documentation/kvm-setup.txt              |   15 +
3249  tools/kvm/Documentation/kvm-stat.txt               |   19 +
3250  tools/kvm/Documentation/kvm-stop.txt               |   16 +
3251  tools/kvm/Documentation/kvm-version.txt            |   21 +
3252  tools/kvm/Documentation/virtio-console.txt         |   41 +
3253  tools/kvm/Makefile                                 |  457 ++++++
3254  tools/kvm/README                                   |  112 ++
3255  tools/kvm/builtin-balloon.c                        |   80 +
3256  tools/kvm/builtin-debug.c                          |  110 ++
3257  tools/kvm/builtin-help.c                           |   63 +
3258  tools/kvm/builtin-list.c                           |  149 ++
3259  tools/kvm/builtin-pause.c                          |   88 ++
3260  tools/kvm/builtin-resume.c                         |   88 ++
3261  tools/kvm/builtin-run.c                            |  697 +++++++++
3262  tools/kvm/builtin-sandbox.c                        |    9 +
3263  tools/kvm/builtin-setup.c                          |  262 ++++
3264  tools/kvm/builtin-stat.c                           |  127 ++
3265  tools/kvm/builtin-stop.c                           |   70 +
3266  tools/kvm/builtin-version.c                        |   15 +
3267  tools/kvm/code16gcc.h                              |   15 +
3268  tools/kvm/command-list.txt                         |   15 +
3269  tools/kvm/config/feature-tests.mak                 |  177 +++
3270  tools/kvm/config/utilities.mak                     |  196 +++
3271  tools/kvm/disk/blk.c                               |   76 +
3272  tools/kvm/disk/core.c                              |  354 +++++
3273  tools/kvm/disk/qcow.c                              | 1529 ++++++++++++++++++++
3274  tools/kvm/disk/raw.c                               |  141 ++
3275  tools/kvm/framebuffer.c                            |   80 +
3276  tools/kvm/guest/init.c                             |   72 +
3277  tools/kvm/guest_compat.c                           |   99 ++
3278  tools/kvm/hw/i8042.c                               |  355 +++++
3279  tools/kvm/hw/pci-shmem.c                           |  405 ++++++
3280  tools/kvm/hw/rtc.c                                 |  149 ++
3281  tools/kvm/hw/serial.c                              |  452 ++++++
3282  tools/kvm/hw/vesa.c                                |   89 ++
3283  tools/kvm/include/asm/hweight.h                    |    8 +
3284  tools/kvm/include/bios/memcpy.h                    |    9 +
3285  tools/kvm/include/kvm/8250-serial.h                |   11 +
3286  tools/kvm/include/kvm/apic.h                       |   17 +
3287  tools/kvm/include/kvm/brlock.h                     |   41 +
3288  tools/kvm/include/kvm/builtin-balloon.h            |    9 +
3289  tools/kvm/include/kvm/builtin-debug.h              |   20 +
3290  tools/kvm/include/kvm/builtin-help.h               |    6 +
3291  tools/kvm/include/kvm/builtin-list.h               |   10 +
3292  tools/kvm/include/kvm/builtin-pause.h              |    9 +
3293  tools/kvm/include/kvm/builtin-resume.h             |    9 +
3294  tools/kvm/include/kvm/builtin-run.h                |   11 +
3295  tools/kvm/include/kvm/builtin-sandbox.h            |    6 +
3296  tools/kvm/include/kvm/builtin-setup.h              |   11 +
3297  tools/kvm/include/kvm/builtin-stat.h               |    9 +
3298  tools/kvm/include/kvm/builtin-stop.h               |    9 +
3299  tools/kvm/include/kvm/builtin-version.h            |    6 +
3300  tools/kvm/include/kvm/compiler.h                   |   10 +
3301  tools/kvm/include/kvm/disk-image.h                 |   96 ++
3302  tools/kvm/include/kvm/e820.h                       |   13 +
3303  tools/kvm/include/kvm/framebuffer.h                |   36 +
3304  tools/kvm/include/kvm/guest_compat.h               |    9 +
3305  tools/kvm/include/kvm/i8042.h                      |   12 +
3306  tools/kvm/include/kvm/ioeventfd.h                  |   28 +
3307  tools/kvm/include/kvm/ioport.h                     |   70 +
3308  tools/kvm/include/kvm/irq.h                        |   33 +
3309  tools/kvm/include/kvm/kvm-cmd.h                    |   17 +
3310  tools/kvm/include/kvm/kvm-config.h                 |   60 +
3311  tools/kvm/include/kvm/kvm-cpu.h                    |   26 +
3312  tools/kvm/include/kvm/kvm-ipc.h                    |   26 +
3313  tools/kvm/include/kvm/kvm.h                        |  121 ++
3314  tools/kvm/include/kvm/msi.h                        |   10 +
3315  tools/kvm/include/kvm/mutex.h                      |   33 +
3316  tools/kvm/include/kvm/parse-options.h              |  218 +++
3317  tools/kvm/include/kvm/pci-shmem.h                  |   32 +
3318  tools/kvm/include/kvm/pci.h                        |   95 ++
3319  tools/kvm/include/kvm/qcow.h                       |  133 ++
3320  tools/kvm/include/kvm/rbtree-interval.h            |   28 +
3321  tools/kvm/include/kvm/read-write.h                 |   43 +
3322  tools/kvm/include/kvm/rtc.h                        |    9 +
3323  tools/kvm/include/kvm/rwsem.h                      |   39 +
3324  tools/kvm/include/kvm/sdl.h                        |   28 +
3325  tools/kvm/include/kvm/segment.h                    |   21 +
3326  tools/kvm/include/kvm/strbuf.h                     |   20 +
3327  tools/kvm/include/kvm/symbol.h                     |   30 +
3328  tools/kvm/include/kvm/term.h                       |   24 +
3329  tools/kvm/include/kvm/threadpool.h                 |   38 +
3330  tools/kvm/include/kvm/types.h                      |    7 +
3331  tools/kvm/include/kvm/uip.h                        |  360 +++++
3332  tools/kvm/include/kvm/util-init.h                  |   51 +
3333  tools/kvm/include/kvm/util.h                       |   97 ++
3334  tools/kvm/include/kvm/vesa.h                       |   18 +
3335  tools/kvm/include/kvm/virtio-9p.h                  |   76 +
3336  tools/kvm/include/kvm/virtio-balloon.h             |    9 +
3337  tools/kvm/include/kvm/virtio-blk.h                 |   12 +
3338  tools/kvm/include/kvm/virtio-console.h             |   10 +
3339  tools/kvm/include/kvm/virtio-mmio.h                |   58 +
3340  tools/kvm/include/kvm/virtio-net.h                 |   30 +
3341  tools/kvm/include/kvm/virtio-pci-dev.h             |   38 +
3342  tools/kvm/include/kvm/virtio-pci.h                 |   49 +
3343  tools/kvm/include/kvm/virtio-rng.h                 |    9 +
3344  tools/kvm/include/kvm/virtio-scsi.h                |   26 +
3345  tools/kvm/include/kvm/virtio.h                     |  102 ++
3346  tools/kvm/include/kvm/vnc.h                        |   22 +
3347  tools/kvm/include/linux/bitops.h                   |   33 +
3348  tools/kvm/include/linux/byteorder.h                |    7 +
3349  tools/kvm/include/linux/compiler.h                 |   20 +
3350  tools/kvm/include/linux/kernel.h                   |   41 +
3351  tools/kvm/include/linux/module.h                   |    6 +
3352  tools/kvm/include/linux/prefetch.h                 |    6 +
3353  tools/kvm/include/linux/stddef.h                   |   16 +
3354  tools/kvm/include/linux/types.h                    |   51 +
3355  tools/kvm/ioeventfd.c                              |  216 +++
3356  tools/kvm/ioport.c                                 |  198 +++
3357  tools/kvm/kvm-cmd.c                                |   91 ++
3358  tools/kvm/kvm-cpu.c                                |  242 ++++
3359  tools/kvm/kvm-ipc.c                                |  498 +++++++
3360  tools/kvm/kvm.c                                    |  458 ++++++
3361  tools/kvm/main.c                                   |   19 +
3362  tools/kvm/mmio.c                                   |  139 ++
3363  tools/kvm/net/uip/arp.c                            |   30 +
3364  tools/kvm/net/uip/buf.c                            |  114 ++
3365  tools/kvm/net/uip/core.c                           |  190 +++
3366  tools/kvm/net/uip/csum.c                           |   92 ++
3367  tools/kvm/net/uip/dhcp.c                           |  202 +++
3368  tools/kvm/net/uip/icmp.c                           |   29 +
3369  tools/kvm/net/uip/ipv4.c                           |   29 +
3370  tools/kvm/net/uip/tcp.c                            |  345 +++++
3371  tools/kvm/net/uip/udp.c                            |  236 +++
3372  tools/kvm/pci.c                                    |  215 +++
3373  tools/kvm/powerpc/boot.c                           |    8 +
3374  tools/kvm/powerpc/cpu_info.c                       |  195 +++
3375  tools/kvm/powerpc/cpu_info.h                       |   42 +
3376  tools/kvm/powerpc/include/kvm/barrier.h            |    6 +
3377  tools/kvm/powerpc/include/kvm/kvm-arch.h           |   68 +
3378  tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h       |   76 +
3379  tools/kvm/powerpc/ioport.c                         |   18 +
3380  tools/kvm/powerpc/irq.c                            |   56 +
3381  tools/kvm/powerpc/kvm-cpu.c                        |  290 ++++
3382  tools/kvm/powerpc/kvm.c                            |  529 +++++++
3383  tools/kvm/powerpc/spapr.h                          |   93 ++
3384  tools/kvm/powerpc/spapr_hcall.c                    |  134 ++
3385  tools/kvm/powerpc/spapr_hvcons.c                   |  108 ++
3386  tools/kvm/powerpc/spapr_hvcons.h                   |   19 +
3387  tools/kvm/powerpc/spapr_pci.c                      |  423 ++++++
3388  tools/kvm/powerpc/spapr_pci.h                      |   57 +
3389  tools/kvm/powerpc/spapr_rtas.c                     |  233 +++
3390  tools/kvm/powerpc/xics.c                           |  522 +++++++
3391  tools/kvm/powerpc/xics.h                           |   18 +
3392  tools/kvm/symbol.c                                 |  133 ++
3393  tools/kvm/term.c                                   |  171 +++
3394  tools/kvm/tests/Makefile                           |   19 +
3395  tools/kvm/tests/boot/Makefile                      |   13 +
3396  tools/kvm/tests/boot/init.c                        |   11 +
3397  tools/kvm/tests/kernel/.gitignore                  |    2 +
3398  tools/kvm/tests/kernel/Makefile                    |   20 +
3399  tools/kvm/tests/kernel/README                      |   16 +
3400  tools/kvm/tests/kernel/kernel.S                    |    8 +
3401  tools/kvm/tests/pit/.gitignore                     |    2 +
3402  tools/kvm/tests/pit/Makefile                       |   20 +
3403  tools/kvm/tests/pit/README                         |   16 +
3404  tools/kvm/tests/pit/tick.S                         |  101 ++
3405  tools/kvm/ui/sdl.c                                 |  321 ++++
3406  tools/kvm/ui/vnc.c                                 |  248 ++++
3407  tools/kvm/util/KVMTOOLS-VERSION-GEN                |   40 +
3408  tools/kvm/util/generate-cmdlist.sh                 |   23 +
3409  tools/kvm/util/init.c                              |   69 +
3410  tools/kvm/util/kvm-ifup-vbr0                       |    6 +
3411  tools/kvm/util/parse-options.c                     |  577 ++++++++
3412  tools/kvm/util/rbtree-interval.c                   |  118 ++
3413  tools/kvm/util/read-write.c                        |  354 +++++
3414  tools/kvm/util/set_private_br.sh                   |   51 +
3415  tools/kvm/util/strbuf.c                            |   62 +
3416  tools/kvm/util/threadpool.c                        |  173 +++
3417  tools/kvm/util/util.c                              |  133 ++
3418  tools/kvm/virtio/9p-pdu.c                          |  287 ++++
3419  tools/kvm/virtio/9p.c                              | 1432 ++++++++++++++++++
3420  tools/kvm/virtio/balloon.c                         |  270 ++++
3421  tools/kvm/virtio/blk.c                             |  315 ++++
3422  tools/kvm/virtio/console.c                         |  203 +++
3423  tools/kvm/virtio/core.c                            |  233 +++
3424  tools/kvm/virtio/mmio.c                            |  264 ++++
3425  tools/kvm/virtio/net.c                             |  670 +++++++++
3426  tools/kvm/virtio/pci.c                             |  398 +++++
3427  tools/kvm/virtio/rng.c                             |  193 +++
3428  tools/kvm/virtio/scsi.c                            |  309 ++++
3429  tools/kvm/x86/bios.c                               |  174 +++
3430  tools/kvm/x86/bios/.gitignore                      |    3 +
3431  tools/kvm/x86/bios/bios-rom.S                      |   12 +
3432  tools/kvm/x86/bios/e820.c                          |   72 +
3433  tools/kvm/x86/bios/entry.S                         |   92 ++
3434  tools/kvm/x86/bios/gen-offsets.sh                  |   14 +
3435  tools/kvm/x86/bios/int10.c                         |  110 ++
3436  tools/kvm/x86/bios/int15.c                         |   18 +
3437  tools/kvm/x86/bios/local.S                         |    7 +
3438  tools/kvm/x86/bios/macro.S                         |   25 +
3439  tools/kvm/x86/bios/memcpy.c                        |   23 +
3440  tools/kvm/x86/bios/rom.ld.S                        |   16 +
3441  tools/kvm/x86/boot.c                               |   41 +
3442  tools/kvm/x86/cpuid.c                              |   60 +
3443  tools/kvm/x86/include/kvm/assembly.h               |   24 +
3444  tools/kvm/x86/include/kvm/barrier.h                |   20 +
3445  tools/kvm/x86/include/kvm/bios-export.h            |   13 +
3446  tools/kvm/x86/include/kvm/bios.h                   |   93 ++
3447  tools/kvm/x86/include/kvm/boot-protocol.h          |   16 +
3448  tools/kvm/x86/include/kvm/cpufeature.h             |   41 +
3449  tools/kvm/x86/include/kvm/interrupt.h              |   26 +
3450  tools/kvm/x86/include/kvm/kvm-arch.h               |   43 +
3451  tools/kvm/x86/include/kvm/kvm-cpu-arch.h           |   49 +
3452  tools/kvm/x86/include/kvm/mptable.h                |    9 +
3453  tools/kvm/x86/interrupt.c                          |   28 +
3454  tools/kvm/x86/ioport.c                             |   77 +
3455  tools/kvm/x86/irq.c                                |  224 +++
3456  tools/kvm/x86/kvm-cpu.c                            |  425 ++++++
3457  tools/kvm/x86/kvm.c                                |  362 +++++
3458  tools/kvm/x86/mptable.c                            |  289 ++++
3459  tools/lib/traceevent/Makefile                      |    2 +-
3460  tools/perf/Documentation/Makefile                  |   31 +-
3461  tools/perf/Documentation/android.txt               |   75 +
3462  tools/perf/Documentation/perf-diff.txt             |   60 +
3463  tools/perf/Documentation/perf-inject.txt           |   11 +
3464  tools/perf/Documentation/perf-stat.txt             |    5 +
3465  tools/perf/Documentation/perf-trace.txt            |    6 +
3466  tools/perf/Makefile                                |  123 +-
3467  tools/perf/arch/common.c                           |  178 +++
3468  tools/perf/arch/common.h                           |   10 +
3469  tools/perf/builtin-annotate.c                      |   15 +-
3470  tools/perf/builtin-buildid-cache.c                 |    1 +
3471  tools/perf/builtin-buildid-list.c                  |    6 +-
3472  tools/perf/builtin-diff.c                          |  405 +++++-
3473  tools/perf/builtin-evlist.c                        |    5 +-
3474  tools/perf/builtin-inject.c                        |  195 ++-
3475  tools/perf/builtin-kmem.c                          |    5 +-
3476  tools/perf/builtin-kvm.c                           |   35 +-
3477  tools/perf/builtin-lock.c                          |    2 -
3478  tools/perf/builtin-record.c                        |   40 +-
3479  tools/perf/builtin-report.c                        |   24 +-
3480  tools/perf/builtin-sched.c                         |    8 +-
3481  tools/perf/builtin-script.c                        |   87 +-
3482  tools/perf/builtin-stat.c                          |   42 +-
3483  tools/perf/builtin-test.c                          |   20 +-
3484  tools/perf/builtin-timechart.c                     |    5 +-
3485  tools/perf/builtin-top.c                           |    7 +-
3486  tools/perf/builtin-trace.c                         |  403 +++++-
3487  tools/perf/config/feature-tests.mak                |   25 +-
3488  tools/perf/config/utilities.mak                    |   10 +-
3489  tools/perf/perf.c                                  |    3 +
3490  tools/perf/perf.h                                  |    1 +
3491  tools/perf/ui/browsers/annotate.c                  |    6 +
3492  tools/perf/ui/browsers/hists.c                     |   38 +
3493  tools/perf/ui/browsers/scripts.c                   |  189 +++
3494  tools/perf/ui/hist.c                               |  134 +-
3495  tools/perf/ui/stdio/hist.c                         |    2 +-
3496  tools/perf/util/annotate.c                         |    1 +
3497  tools/perf/util/annotate.h                         |    1 -
3498  tools/perf/util/build-id.c                         |   27 +-
3499  tools/perf/util/build-id.h                         |   11 +-
3500  tools/perf/util/dso.c                              |  594 ++++++++
3501  tools/perf/util/dso.h                              |  148 ++
3502  tools/perf/util/event.c                            |  228 +--
3503  tools/perf/util/event.h                            |    9 +-
3504  tools/perf/util/evlist.c                           |    3 -
3505  tools/perf/util/header.c                           |   11 +
3506  tools/perf/util/header.h                           |    1 +
3507  tools/perf/util/hist.h                             |   15 +
3508  tools/perf/util/machine.c                          |  277 ++++
3509  tools/perf/util/machine.h                          |   19 +
3510  tools/perf/util/map.c                              |    1 +
3511  tools/perf/util/parse-events-test.c                |   68 +
3512  tools/perf/util/parse-events.c                     |   30 +-
3513  tools/perf/util/parse-events.h                     |    2 +
3514  tools/perf/util/parse-events.y                     |   18 +
3515  tools/perf/util/pmu.c                              |    7 +-
3516  tools/perf/util/python.c                           |    2 +
3517  tools/perf/util/rblist.c                           |    4 +-
3518  .../util/scripting-engines/trace-event-python.c    |    1 -
3519  tools/perf/util/session.c                          |    4 +-
3520  tools/perf/util/sort.h                             |   18 +
3521  tools/perf/util/string.c                           |   18 +
3522  tools/perf/util/symbol.c                           |  657 +--------
3523  tools/perf/util/symbol.h                           |  141 +-
3524  tools/perf/util/thread.c                           |   41 +-
3525  tools/perf/util/thread.h                           |    2 +
3526  tools/perf/util/trace-event-read.c                 |    2 -
3527  tools/perf/util/util.c                             |   35 +
3528  tools/perf/util/util.h                             |    8 +
3529  375 files changed, 32716 insertions(+), 2013 deletions(-)
3530  create mode 100644 Documentation/acpi/initrd_table_override.txt
3531  create mode 100644 Documentation/scheduler/numa-problem.txt
3532  create mode 100644 include/linux/earlycpio.h
3533  create mode 100644 include/linux/page-flags-layout.h
3534  create mode 100644 include/linux/vtime.h
3535  create mode 100644 lib/earlycpio.c
3536  create mode 100644 tools/kvm/.gitignore
3537  create mode 100644 tools/kvm/CREDITS-Git
3538  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
3539  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
3540  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
3541  create mode 100644 tools/kvm/Documentation/kvm-list.txt
3542  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
3543  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
3544  create mode 100644 tools/kvm/Documentation/kvm-run.txt
3545  create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
3546  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
3547  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
3548  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
3549  create mode 100644 tools/kvm/Documentation/kvm-version.txt
3550  create mode 100644 tools/kvm/Documentation/virtio-console.txt
3551  create mode 100644 tools/kvm/Makefile
3552  create mode 100644 tools/kvm/README
3553  create mode 100644 tools/kvm/builtin-balloon.c
3554  create mode 100644 tools/kvm/builtin-debug.c
3555  create mode 100644 tools/kvm/builtin-help.c
3556  create mode 100644 tools/kvm/builtin-list.c
3557  create mode 100644 tools/kvm/builtin-pause.c
3558  create mode 100644 tools/kvm/builtin-resume.c
3559  create mode 100644 tools/kvm/builtin-run.c
3560  create mode 100644 tools/kvm/builtin-sandbox.c
3561  create mode 100644 tools/kvm/builtin-setup.c
3562  create mode 100644 tools/kvm/builtin-stat.c
3563  create mode 100644 tools/kvm/builtin-stop.c
3564  create mode 100644 tools/kvm/builtin-version.c
3565  create mode 100644 tools/kvm/code16gcc.h
3566  create mode 100644 tools/kvm/command-list.txt
3567  create mode 100644 tools/kvm/config/feature-tests.mak
3568  create mode 100644 tools/kvm/config/utilities.mak
3569  create mode 100644 tools/kvm/disk/blk.c
3570  create mode 100644 tools/kvm/disk/core.c
3571  create mode 100644 tools/kvm/disk/qcow.c
3572  create mode 100644 tools/kvm/disk/raw.c
3573  create mode 100644 tools/kvm/framebuffer.c
3574  create mode 100644 tools/kvm/guest/init.c
3575  create mode 100644 tools/kvm/guest_compat.c
3576  create mode 100644 tools/kvm/hw/i8042.c
3577  create mode 100644 tools/kvm/hw/pci-shmem.c
3578  create mode 100644 tools/kvm/hw/rtc.c
3579  create mode 100644 tools/kvm/hw/serial.c
3580  create mode 100644 tools/kvm/hw/vesa.c
3581  create mode 100644 tools/kvm/include/asm/hweight.h
3582  create mode 100644 tools/kvm/include/bios/memcpy.h
3583  create mode 100644 tools/kvm/include/kvm/8250-serial.h
3584  create mode 100644 tools/kvm/include/kvm/apic.h
3585  create mode 100644 tools/kvm/include/kvm/brlock.h
3586  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
3587  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
3588  create mode 100644 tools/kvm/include/kvm/builtin-help.h
3589  create mode 100644 tools/kvm/include/kvm/builtin-list.h
3590  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
3591  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
3592  create mode 100644 tools/kvm/include/kvm/builtin-run.h
3593  create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
3594  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
3595  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
3596  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
3597  create mode 100644 tools/kvm/include/kvm/builtin-version.h
3598  create mode 100644 tools/kvm/include/kvm/compiler.h
3599  create mode 100644 tools/kvm/include/kvm/disk-image.h
3600  create mode 100644 tools/kvm/include/kvm/e820.h
3601  create mode 100644 tools/kvm/include/kvm/framebuffer.h
3602  create mode 100644 tools/kvm/include/kvm/guest_compat.h
3603  create mode 100644 tools/kvm/include/kvm/i8042.h
3604  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
3605  create mode 100644 tools/kvm/include/kvm/ioport.h
3606  create mode 100644 tools/kvm/include/kvm/irq.h
3607  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
3608  create mode 100644 tools/kvm/include/kvm/kvm-config.h
3609  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
3610  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
3611  create mode 100644 tools/kvm/include/kvm/kvm.h
3612  create mode 100644 tools/kvm/include/kvm/msi.h
3613  create mode 100644 tools/kvm/include/kvm/mutex.h
3614  create mode 100644 tools/kvm/include/kvm/parse-options.h
3615  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
3616  create mode 100644 tools/kvm/include/kvm/pci.h
3617  create mode 100644 tools/kvm/include/kvm/qcow.h
3618  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
3619  create mode 100644 tools/kvm/include/kvm/read-write.h
3620  create mode 100644 tools/kvm/include/kvm/rtc.h
3621  create mode 100644 tools/kvm/include/kvm/rwsem.h
3622  create mode 100644 tools/kvm/include/kvm/sdl.h
3623  create mode 100644 tools/kvm/include/kvm/segment.h
3624  create mode 100644 tools/kvm/include/kvm/strbuf.h
3625  create mode 100644 tools/kvm/include/kvm/symbol.h
3626  create mode 100644 tools/kvm/include/kvm/term.h
3627  create mode 100644 tools/kvm/include/kvm/threadpool.h
3628  create mode 100644 tools/kvm/include/kvm/types.h
3629  create mode 100644 tools/kvm/include/kvm/uip.h
3630  create mode 100644 tools/kvm/include/kvm/util-init.h
3631  create mode 100644 tools/kvm/include/kvm/util.h
3632  create mode 100644 tools/kvm/include/kvm/vesa.h
3633  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
3634  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
3635  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
3636  create mode 100644 tools/kvm/include/kvm/virtio-console.h
3637  create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
3638  create mode 100644 tools/kvm/include/kvm/virtio-net.h
3639  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
3640  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
3641  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
3642  create mode 100644 tools/kvm/include/kvm/virtio-scsi.h
3643  create mode 100644 tools/kvm/include/kvm/virtio.h
3644  create mode 100644 tools/kvm/include/kvm/vnc.h
3645  create mode 100644 tools/kvm/include/linux/bitops.h
3646  create mode 100644 tools/kvm/include/linux/byteorder.h
3647  create mode 100644 tools/kvm/include/linux/compiler.h
3648  create mode 100644 tools/kvm/include/linux/kernel.h
3649  create mode 100644 tools/kvm/include/linux/module.h
3650  create mode 100644 tools/kvm/include/linux/prefetch.h
3651  create mode 100644 tools/kvm/include/linux/stddef.h
3652  create mode 100644 tools/kvm/include/linux/types.h
3653  create mode 100644 tools/kvm/ioeventfd.c
3654  create mode 100644 tools/kvm/ioport.c
3655  create mode 100644 tools/kvm/kvm-cmd.c
3656  create mode 100644 tools/kvm/kvm-cpu.c
3657  create mode 100644 tools/kvm/kvm-ipc.c
3658  create mode 100644 tools/kvm/kvm.c
3659  create mode 100644 tools/kvm/main.c
3660  create mode 100644 tools/kvm/mmio.c
3661  create mode 100644 tools/kvm/net/uip/arp.c
3662  create mode 100644 tools/kvm/net/uip/buf.c
3663  create mode 100644 tools/kvm/net/uip/core.c
3664  create mode 100644 tools/kvm/net/uip/csum.c
3665  create mode 100644 tools/kvm/net/uip/dhcp.c
3666  create mode 100644 tools/kvm/net/uip/icmp.c
3667  create mode 100644 tools/kvm/net/uip/ipv4.c
3668  create mode 100644 tools/kvm/net/uip/tcp.c
3669  create mode 100644 tools/kvm/net/uip/udp.c
3670  create mode 100644 tools/kvm/pci.c
3671  create mode 100644 tools/kvm/powerpc/boot.c
3672  create mode 100644 tools/kvm/powerpc/cpu_info.c
3673  create mode 100644 tools/kvm/powerpc/cpu_info.h
3674  create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
3675  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
3676  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
3677  create mode 100644 tools/kvm/powerpc/ioport.c
3678  create mode 100644 tools/kvm/powerpc/irq.c
3679  create mode 100644 tools/kvm/powerpc/kvm-cpu.c
3680  create mode 100644 tools/kvm/powerpc/kvm.c
3681  create mode 100644 tools/kvm/powerpc/spapr.h
3682  create mode 100644 tools/kvm/powerpc/spapr_hcall.c
3683  create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
3684  create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
3685  create mode 100644 tools/kvm/powerpc/spapr_pci.c
3686  create mode 100644 tools/kvm/powerpc/spapr_pci.h
3687  create mode 100644 tools/kvm/powerpc/spapr_rtas.c
3688  create mode 100644 tools/kvm/powerpc/xics.c
3689  create mode 100644 tools/kvm/powerpc/xics.h
3690  create mode 100644 tools/kvm/symbol.c
3691  create mode 100644 tools/kvm/term.c
3692  create mode 100644 tools/kvm/tests/Makefile
3693  create mode 100644 tools/kvm/tests/boot/Makefile
3694  create mode 100644 tools/kvm/tests/boot/init.c
3695  create mode 100644 tools/kvm/tests/kernel/.gitignore
3696  create mode 100644 tools/kvm/tests/kernel/Makefile
3697  create mode 100644 tools/kvm/tests/kernel/README
3698  create mode 100644 tools/kvm/tests/kernel/kernel.S
3699  create mode 100644 tools/kvm/tests/pit/.gitignore
3700  create mode 100644 tools/kvm/tests/pit/Makefile
3701  create mode 100644 tools/kvm/tests/pit/README
3702  create mode 100644 tools/kvm/tests/pit/tick.S
3703  create mode 100644 tools/kvm/ui/sdl.c
3704  create mode 100644 tools/kvm/ui/vnc.c
3705  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
3706  create mode 100755 tools/kvm/util/generate-cmdlist.sh
3707  create mode 100644 tools/kvm/util/init.c
3708  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
3709  create mode 100644 tools/kvm/util/parse-options.c
3710  create mode 100644 tools/kvm/util/rbtree-interval.c
3711  create mode 100644 tools/kvm/util/read-write.c
3712  create mode 100755 tools/kvm/util/set_private_br.sh
3713  create mode 100644 tools/kvm/util/strbuf.c
3714  create mode 100644 tools/kvm/util/threadpool.c
3715  create mode 100644 tools/kvm/util/util.c
3716  create mode 100644 tools/kvm/virtio/9p-pdu.c
3717  create mode 100644 tools/kvm/virtio/9p.c
3718  create mode 100644 tools/kvm/virtio/balloon.c
3719  create mode 100644 tools/kvm/virtio/blk.c
3720  create mode 100644 tools/kvm/virtio/console.c
3721  create mode 100644 tools/kvm/virtio/core.c
3722  create mode 100644 tools/kvm/virtio/mmio.c
3723  create mode 100644 tools/kvm/virtio/net.c
3724  create mode 100644 tools/kvm/virtio/pci.c
3725  create mode 100644 tools/kvm/virtio/rng.c
3726  create mode 100644 tools/kvm/virtio/scsi.c
3727  create mode 100644 tools/kvm/x86/bios.c
3728  create mode 100644 tools/kvm/x86/bios/.gitignore
3729  create mode 100644 tools/kvm/x86/bios/bios-rom.S
3730  create mode 100644 tools/kvm/x86/bios/e820.c
3731  create mode 100644 tools/kvm/x86/bios/entry.S
3732  create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
3733  create mode 100644 tools/kvm/x86/bios/int10.c
3734  create mode 100644 tools/kvm/x86/bios/int15.c
3735  create mode 100644 tools/kvm/x86/bios/local.S
3736  create mode 100644 tools/kvm/x86/bios/macro.S
3737  create mode 100644 tools/kvm/x86/bios/memcpy.c
3738  create mode 100644 tools/kvm/x86/bios/rom.ld.S
3739  create mode 100644 tools/kvm/x86/boot.c
3740  create mode 100644 tools/kvm/x86/cpuid.c
3741  create mode 100644 tools/kvm/x86/include/kvm/assembly.h
3742  create mode 100644 tools/kvm/x86/include/kvm/barrier.h
3743  create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
3744  create mode 100644 tools/kvm/x86/include/kvm/bios.h
3745  create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
3746  create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
3747  create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
3748  create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
3749  create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
3750  create mode 100644 tools/kvm/x86/include/kvm/mptable.h
3751  create mode 100644 tools/kvm/x86/interrupt.c
3752  create mode 100644 tools/kvm/x86/ioport.c
3753  create mode 100644 tools/kvm/x86/irq.c
3754  create mode 100644 tools/kvm/x86/kvm-cpu.c
3755  create mode 100644 tools/kvm/x86/kvm.c
3756  create mode 100644 tools/kvm/x86/mptable.c
3757  create mode 100644 tools/perf/Documentation/android.txt
3758  create mode 100644 tools/perf/arch/common.c
3759  create mode 100644 tools/perf/arch/common.h
3760  create mode 100644 tools/perf/ui/browsers/scripts.c
3761  create mode 100644 tools/perf/util/dso.c
3762  create mode 100644 tools/perf/util/dso.h
3763  create mode 100644 tools/perf/util/machine.c
3764  create mode 100644 tools/perf/util/machine.h
3765 Merging ftrace/for-next (7bcfaf5 tracing: Add trace_options kernel command line parameter)
3766 $ git merge ftrace/for-next
3767 Merge made by the 'recursive' strategy.
3768  Documentation/kernel-parameters.txt  |   16 ++
3769  include/linux/ftrace_event.h         |   14 +-
3770  include/linux/kernel.h               |    7 +-
3771  include/linux/ring_buffer.h          |    3 +-
3772  include/trace/ftrace.h               |    3 +-
3773  include/trace/syscall.h              |   23 ---
3774  kernel/trace/Kconfig                 |    1 +
3775  kernel/trace/ftrace.c                |    6 +-
3776  kernel/trace/ring_buffer.c           |   51 ++++-
3777  kernel/trace/trace.c                 |  372 +++++++++++++++++-----------------
3778  kernel/trace/trace.h                 |   14 +-
3779  kernel/trace/trace_branch.c          |    4 +-
3780  kernel/trace/trace_events.c          |   51 +++--
3781  kernel/trace/trace_events_filter.c   |    4 +-
3782  kernel/trace/trace_functions.c       |    5 +-
3783  kernel/trace/trace_functions_graph.c |    6 +-
3784  kernel/trace/trace_irqsoff.c         |   14 +-
3785  kernel/trace/trace_kprobe.c          |   10 +-
3786  kernel/trace/trace_probe.c           |   14 +-
3787  kernel/trace/trace_sched_switch.c    |    4 +-
3788  kernel/trace/trace_sched_wakeup.c    |   10 +-
3789  kernel/trace/trace_selftest.c        |   13 +-
3790  kernel/trace/trace_syscalls.c        |   61 +++---
3791  kernel/trace/trace_uprobe.c          |    2 +-
3792  24 files changed, 365 insertions(+), 343 deletions(-)
3793 Merging rcu/rcu/next (870a511 rcu: Separate accounting of callbacks from callback-free CPUs)
3794 $ git merge rcu/rcu/next
3795 Auto-merging kernel/sched/core.c
3796 Auto-merging init/Kconfig
3797 Auto-merging include/linux/sched.h
3798 Auto-merging Documentation/kernel-parameters.txt
3799 Merge made by the 'recursive' strategy.
3800  Documentation/RCU/RTFP.txt          |    2 +-
3801  Documentation/RCU/checklist.txt     |   17 +-
3802  Documentation/RCU/listRCU.txt       |    2 +-
3803  Documentation/RCU/rcuref.txt        |   61 ++++-
3804  Documentation/RCU/trace.txt         |  396 ++++++++++++++++++---------------
3805  Documentation/RCU/whatisRCU.txt     |   17 +-
3806  Documentation/kernel-parameters.txt |   21 ++
3807  Documentation/memory-barriers.txt   |    9 +-
3808  arch/um/drivers/mconsole_kern.c     |    2 +-
3809  arch/x86/kernel/ptrace.c            |    7 +
3810  include/linux/rculist.h             |   17 --
3811  include/linux/rcupdate.h            |   27 +++
3812  include/linux/sched.h               |   10 +-
3813  include/linux/srcu.h                |   34 +++
3814  include/trace/events/rcu.h          |    1 +
3815  init/Kconfig                        |   41 +++-
3816  kernel/ksysfs.c                     |   18 ++
3817  kernel/rcu.h                        |    9 +
3818  kernel/rcupdate.c                   |   54 +++++
3819  kernel/rcutiny.c                    |    8 +-
3820  kernel/rcutiny_plugin.h             |   61 ++++-
3821  kernel/rcutorture.c                 |   54 ++---
3822  kernel/rcutree.c                    |  327 ++++++++++++++++++---------
3823  kernel/rcutree.h                    |   72 +++++-
3824  kernel/rcutree_plugin.h             |  415 ++++++++++++++++++++++++++++++++++-
3825  kernel/rcutree_trace.c              |  330 ++++++++++++++--------------
3826  kernel/sched/core.c                 |    8 +-
3827  kernel/srcu.c                       |   16 +-
3828  lib/Kconfig.debug                   |    4 +-
3829  29 files changed, 1468 insertions(+), 572 deletions(-)
3830 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
3831 $ git merge cputime/cputime
3832 Already up-to-date.
3833 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
3834 $ git merge uprobes/for-next
3835 Already up-to-date.
3836 Merging kvm/linux-next (f026399 Merge branch 'for-queue' of https://github.com/agraf/linux-2.6 into queue)
3837 $ git merge kvm/linux-next
3838 Auto-merging include/linux/kvm_host.h
3839 Auto-merging arch/x86/kvm/x86.c
3840 Auto-merging arch/s390/kvm/kvm-s390.c
3841 Auto-merging MAINTAINERS
3842 Merge made by the 'recursive' strategy.
3843  Documentation/virtual/kvm/api.txt            |   85 +++-
3844  MAINTAINERS                                  |    4 +-
3845  arch/ia64/kvm/kvm-ia64.c                     |    2 -
3846  arch/powerpc/include/asm/Kbuild              |    1 -
3847  arch/powerpc/include/asm/epapr_hcalls.h      |   83 +---
3848  arch/powerpc/include/asm/fsl_hcalls.h        |   36 +-
3849  arch/powerpc/include/asm/kvm_asm.h           |    1 +
3850  arch/powerpc/include/asm/kvm_book3s.h        |    2 +-
3851  arch/powerpc/include/asm/kvm_book3s_64.h     |    2 +-
3852  arch/powerpc/include/asm/kvm_booke_hv_asm.h  |    4 +-
3853  arch/powerpc/include/asm/kvm_host.h          |   55 ++-
3854  arch/powerpc/include/asm/kvm_para.h          |   15 +-
3855  arch/powerpc/include/asm/kvm_ppc.h           |   64 ++-
3856  arch/powerpc/include/asm/reg_booke.h         |    7 +
3857  arch/powerpc/include/asm/smp.h               |    8 +
3858  arch/powerpc/include/uapi/asm/Kbuild         |    1 +
3859  arch/powerpc/include/uapi/asm/epapr_hcalls.h |   98 ++++
3860  arch/powerpc/include/uapi/asm/kvm.h          |   59 +++
3861  arch/powerpc/include/uapi/asm/kvm_para.h     |    7 +-
3862  arch/powerpc/kernel/epapr_hcalls.S           |   28 ++
3863  arch/powerpc/kernel/epapr_paravirt.c         |   11 +-
3864  arch/powerpc/kernel/kvm.c                    |    2 +-
3865  arch/powerpc/kernel/ppc_ksyms.c              |    5 +
3866  arch/powerpc/kernel/smp.c                    |   46 ++
3867  arch/powerpc/kvm/44x.c                       |    1 +
3868  arch/powerpc/kvm/44x_emulate.c               |  112 +++--
3869  arch/powerpc/kvm/Kconfig                     |    3 +
3870  arch/powerpc/kvm/book3s.c                    |  125 +++++
3871  arch/powerpc/kvm/book3s_32_mmu_host.c        |    3 +-
3872  arch/powerpc/kvm/book3s_64_mmu_host.c        |    3 +-
3873  arch/powerpc/kvm/book3s_64_mmu_hv.c          |   67 ++-
3874  arch/powerpc/kvm/book3s_hv.c                 |  633 +++++++++++++++++++-------
3875  arch/powerpc/kvm/book3s_hv_builtin.c         |    4 +-
3876  arch/powerpc/kvm/book3s_hv_rm_mmu.c          |    6 +-
3877  arch/powerpc/kvm/book3s_hv_rmhandlers.S      |   11 +-
3878  arch/powerpc/kvm/book3s_mmu_hpte.c           |    5 -
3879  arch/powerpc/kvm/book3s_pr.c                 |  180 ++++++--
3880  arch/powerpc/kvm/book3s_rmhandlers.S         |   15 +-
3881  arch/powerpc/kvm/booke.c                     |  310 +++++++++++--
3882  arch/powerpc/kvm/booke_emulate.c             |   22 +-
3883  arch/powerpc/kvm/e500.h                      |    3 +-
3884  arch/powerpc/kvm/e500_tlb.c                  |   94 +++-
3885  arch/powerpc/kvm/emulate.c                   |  221 +++++----
3886  arch/powerpc/kvm/powerpc.c                   |  150 +++++-
3887  arch/powerpc/kvm/trace.h                     |  200 ++++++--
3888  arch/powerpc/platforms/Kconfig               |    1 +
3889  arch/powerpc/sysdev/fsl_msi.c                |    9 +-
3890  arch/powerpc/sysdev/fsl_soc.c                |    2 +
3891  arch/s390/kvm/interrupt.c                    |   19 +-
3892  arch/s390/kvm/kvm-s390.c                     |    2 +-
3893  arch/x86/kvm/mmu.c                           |   49 +-
3894  arch/x86/kvm/paging_tmpl.h                   |  115 ++---
3895  arch/x86/kvm/svm.c                           |    7 +-
3896  arch/x86/kvm/vmx.c                           |   45 +-
3897  arch/x86/kvm/x86.c                           |   16 +-
3898  drivers/tty/Kconfig                          |    1 +
3899  drivers/virt/Kconfig                         |    1 +
3900  include/linux/kvm_host.h                     |   36 +-
3901  include/uapi/linux/kvm.h                     |   18 +-
3902  virt/kvm/iommu.c                             |   10 +-
3903  virt/kvm/kvm_main.c                          |    6 +-
3904  61 files changed, 2347 insertions(+), 784 deletions(-)
3905  create mode 100644 arch/powerpc/include/uapi/asm/epapr_hcalls.h
3906 Merging kvm-ppc/kvm-ppc-next (f534a53 KVM: PPC: Book3S HV: Fix thinko in try_lock_hpte())
3907 $ git merge kvm-ppc/kvm-ppc-next
3908 Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
3909 Resolved 'arch/powerpc/include/uapi/asm/Kbuild' using previous resolution.
3910 Resolved 'arch/powerpc/include/uapi/asm/epapr_hcalls.h' using previous resolution.
3911 Auto-merging arch/powerpc/include/uapi/asm/epapr_hcalls.h
3912 CONFLICT (add/add): Merge conflict in arch/powerpc/include/uapi/asm/epapr_hcalls.h
3913 Auto-merging arch/powerpc/include/uapi/asm/Kbuild
3914 CONFLICT (content): Merge conflict in arch/powerpc/include/uapi/asm/Kbuild
3915 Auto-merging arch/powerpc/include/asm/Kbuild
3916 CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
3917 Automatic merge failed; fix conflicts and then commit the result.
3918 $ git commit -v -a
3919 [master 3393796] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
3920 $ git diff -M --stat --summary HEAD^..
3921 Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
3922 $ git merge oprofile/for-next
3923 Already up-to-date.
3924 Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
3925 $ git merge xen/upstream/xen
3926 Already up-to-date.
3927 Merging xen-two/linux-next (9e9b9e6 Merge branch 'stable/for-linus-3.7' into linux-next)
3928 $ git merge xen-two/linux-next
3929 Merge made by the 'recursive' strategy.
3930  arch/arm/include/asm/xen/interface.h |    1 +
3931  arch/arm/xen/enlighten.c             |  122 ++++++++++++++++++++----
3932  arch/x86/include/asm/xen/interface.h |   12 ++-
3933  arch/x86/include/asm/xen/page.h      |    3 +
3934  arch/x86/xen/Kconfig                 |   11 +++
3935  arch/x86/xen/enlighten.c             |   76 +++++++++++----
3936  arch/x86/xen/irq.c                   |    5 +-
3937  arch/x86/xen/mmu.c                   |  170 ++++++++++++++++++++++++++++++++--
3938  arch/x86/xen/mmu.h                   |    2 +
3939  arch/x86/xen/p2m.c                   |    2 +-
3940  arch/x86/xen/setup.c                 |   64 ++++++++++---
3941  arch/x86/xen/smp.c                   |   75 +++++++++------
3942  arch/x86/xen/xen-head.S              |   11 ++-
3943  drivers/net/xen-netback/netback.c    |   11 ++-
3944  drivers/xen/Kconfig                  |    3 +
3945  drivers/xen/Makefile                 |    4 +-
3946  drivers/xen/balloon.c                |   19 ++--
3947  drivers/xen/cpu_hotplug.c            |    4 +-
3948  drivers/xen/events.c                 |    9 +-
3949  drivers/xen/gntdev.c                 |    3 +-
3950  drivers/xen/grant-table.c            |   78 +++++-----------
3951  drivers/xen/privcmd.c                |   72 +++++++++++++-
3952  drivers/xen/xenbus/xenbus_client.c   |    9 +-
3953  include/xen/grant_table.h            |   12 ---
3954  include/xen/interface/memory.h       |   44 ++++++++-
3955  include/xen/interface/physdev.h      |   10 ++
3956  include/xen/xen-ops.h                |    8 +-
3957  27 files changed, 660 insertions(+), 180 deletions(-)
3958 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
3959 $ git merge xen-pvhvm/linux-next
3960 Already up-to-date.
3961 Merging percpu/for-next (b4916cb percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree())
3962 $ git merge percpu/for-next
3963 Merge made by the 'recursive' strategy.
3964  mm/percpu.c |    2 +-
3965  1 file changed, 1 insertion(+), 1 deletion(-)
3966 Merging workqueues/for-next (b401057 Merge branch 'for-3.8' into for-next)
3967 $ git merge workqueues/for-next
3968 Merge made by the 'recursive' strategy.
3969  kernel/workqueue.c |   12 +++++++++---
3970  1 file changed, 9 insertions(+), 3 deletions(-)
3971 Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
3972 $ git merge drivers-x86/linux-next
3973 Auto-merging drivers/platform/x86/asus-wmi.c
3974 Merge made by the 'recursive' strategy.
3975  drivers/platform/x86/asus-wmi.c |   76 +++++++++++++++++++++++++++++++++++++++
3976  1 file changed, 76 insertions(+)
3977 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
3978 $ git merge hwpoison/hwpoison
3979 Already up-to-date.
3980 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
3981 $ git merge sysctl/master
3982 Already up-to-date.
3983 Merging regmap/for-next (516edb8 Merge remote-tracking branches 'regmap/topic/core', 'regmap/topic/domain', 'regmap/topic/lock', 'regmap/topic/range' and 'regmap/topic/type' into regmap-next)
3984 $ git merge regmap/for-next
3985 Merge made by the 'recursive' strategy.
3986  drivers/base/regmap/internal.h   |    4 +--
3987  drivers/base/regmap/regmap-irq.c |   19 ++++++++++
3988  drivers/base/regmap/regmap.c     |   71 ++++++++++++++++++++++----------------
3989  include/linux/regmap.h           |   18 +++++++++-
3990  4 files changed, 78 insertions(+), 34 deletions(-)
3991 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
3992 $ git merge hsi/for-next
3993 Already up-to-date.
3994 Merging leds/for-next (b11339c leds: lm3642: Fix up world writable sysfs files)
3995 $ git merge leds/for-next
3996 Merge made by the 'recursive' strategy.
3997  drivers/leds/leds-88pm860x.c     |    9 ++-------
3998  drivers/leds/leds-bd2802.c       |    4 ++--
3999  drivers/leds/leds-cobalt-qube.c  |   11 ++++-------
4000  drivers/leds/leds-cobalt-raq.c   |   11 ++++-------
4001  drivers/leds/leds-fsg.c          |   15 +++++----------
4002  drivers/leds/leds-gpio.c         |   29 ++++++++++++++++-------------
4003  drivers/leds/leds-lm355x.c       |    4 ++--
4004  drivers/leds/leds-lm3642.c       |   12 ++++++------
4005  drivers/leds/leds-lp5523.c       |   20 +++++++++++++++++---
4006  drivers/leds/leds-lt3593.c       |    9 +++------
4007  drivers/leds/leds-netxbig.c      |    2 +-
4008  drivers/leds/leds-ns2.c          |   23 ++++++++---------------
4009  drivers/leds/leds-renesas-tpu.c  |   25 ++++++++++---------------
4010  drivers/leds/leds-ss4200.c       |    2 +-
4011  drivers/leds/ledtrig-backlight.c |    2 +-
4012  drivers/leds/ledtrig-gpio.c      |    2 +-
4013  16 files changed, 83 insertions(+), 97 deletions(-)
4014 Merging driver-core/driver-core-next (bb3215e Documentation: Fixes a term's translation in Documentation/zh_CN/arm64/memory.txt)
4015 $ git merge driver-core/driver-core-next
4016 Auto-merging drivers/base/platform.c
4017 Merge made by the 'recursive' strategy.
4018  Documentation/zh_CN/arm64/memory.txt |    2 +-
4019  drivers/base/Kconfig                 |    7 +++----
4020  drivers/base/attribute_container.c   |    2 +-
4021  drivers/base/devres.c                |    4 ++--
4022  drivers/base/platform.c              |    2 +-
4023  5 files changed, 8 insertions(+), 9 deletions(-)
4024 Merging tty/tty-next (76cc438 tty: of_serial: fix return value check in of_platform_serial_setup())
4025 $ git merge tty/tty-next
4026 Resolved 'drivers/tty/serial/omap-serial.c' using previous resolution.
4027 Auto-merging drivers/tty/serial/serial_core.c
4028 Auto-merging drivers/tty/serial/omap-serial.c
4029 CONFLICT (content): Merge conflict in drivers/tty/serial/omap-serial.c
4030 Auto-merging arch/x86/platform/ce4100/ce4100.c
4031 Automatic merge failed; fix conflicts and then commit the result.
4032 $ git commit -v -a
4033 [master 4df3176] Merge remote-tracking branch 'tty/tty-next'
4034 $ git diff -M --stat --summary HEAD^..
4035  Documentation/ABI/testing/sysfs-tty                |  112 +++
4036  .../devicetree/bindings/tty/serial/of-serial.txt   |    5 +-
4037  arch/alpha/include/asm/ioctls.h                    |    3 +
4038  arch/arm/plat-omap/include/plat/serial.h           |    9 -
4039  arch/mips/include/uapi/asm/ioctls.h                |    3 +
4040  arch/parisc/include/uapi/asm/ioctls.h              |    3 +
4041  arch/powerpc/include/uapi/asm/ioctls.h             |    3 +
4042  arch/sh/include/uapi/asm/ioctls.h                  |    3 +
4043  arch/sparc/include/uapi/asm/ioctls.h               |    3 +
4044  arch/um/drivers/chan_kern.c                        |   17 +-
4045  arch/x86/platform/ce4100/ce4100.c                  |    3 +
4046  arch/xtensa/include/uapi/asm/ioctls.h              |    3 +
4047  drivers/bluetooth/hci_ldisc.c                      |    7 +-
4048  drivers/staging/dgrp/dgrp_common.h                 |    1 -
4049  drivers/staging/dgrp/dgrp_driver.c                 |    4 -
4050  drivers/staging/dgrp/dgrp_net_ops.c                |   67 +-
4051  drivers/staging/dgrp/dgrp_specproc.c               |    2 -
4052  drivers/staging/dgrp/dgrp_sysfs.c                  |   18 -
4053  drivers/tty/hvc/hvcs.c                             |    4 +-
4054  drivers/tty/n_tty.c                                |  752 +++++++++++---------
4055  drivers/tty/pty.c                                  |   77 +-
4056  drivers/tty/serial/8250/8250.c                     |    9 +-
4057  drivers/tty/serial/8250/8250.h                     |   36 +
4058  drivers/tty/serial/8250/8250_dw.c                  |   25 +
4059  drivers/tty/serial/8250/8250_early.c               |    2 +-
4060  drivers/tty/serial/8250/8250_pci.c                 |   19 +-
4061  drivers/tty/serial/Kconfig                         |   23 +
4062  drivers/tty/serial/Makefile                        |    1 +
4063  drivers/tty/serial/amba-pl011.c                    |   25 +-
4064  drivers/tty/serial/arc_uart.c                      |  746 +++++++++++++++++++
4065  drivers/tty/serial/clps711x.c                      |  595 +++++++---------
4066  drivers/tty/serial/ifx6x60.c                       |   87 ++-
4067  drivers/tty/serial/ifx6x60.h                       |    2 +
4068  drivers/tty/serial/jsm/jsm.h                       |    8 +-
4069  drivers/tty/serial/jsm/jsm_driver.c                |    3 +-
4070  drivers/tty/serial/jsm/jsm_neo.c                   |  116 +--
4071  drivers/tty/serial/jsm/jsm_tty.c                   |  102 +--
4072  drivers/tty/serial/of_serial.c                     |   32 +-
4073  drivers/tty/serial/omap-serial.c                   |   14 +-
4074  drivers/tty/serial/pxa.c                           |   55 ++
4075  drivers/tty/serial/samsung.c                       |   16 +-
4076  drivers/tty/serial/serial_core.c                   |  176 ++++-
4077  drivers/tty/serial/vt8500_serial.c                 |    8 +-
4078  drivers/tty/tty_audit.c                            |   15 +-
4079  drivers/tty/tty_buffer.c                           |  228 +++---
4080  drivers/tty/tty_io.c                               |   20 +-
4081  drivers/tty/tty_ioctl.c                            |   21 -
4082  drivers/tty/tty_ldisc.c                            |   47 +-
4083  drivers/tty/tty_mutex.c                            |    4 +-
4084  drivers/tty/tty_port.c                             |    2 +
4085  drivers/tty/vt/selection.c                         |    9 +-
4086  fs/compat_ioctl.c                                  |    3 +
4087  fs/devpts/inode.c                                  |   61 +-
4088  include/linux/devpts_fs.h                          |   20 +-
4089  include/linux/tty.h                                |   44 +-
4090  include/linux/tty_flip.h                           |    2 +-
4091  include/uapi/asm-generic/ioctls.h                  |    3 +
4092  include/uapi/linux/serial_core.h                   |    2 +
4093  kernel/auditsc.c                                   |    2 +-
4094  kernel/printk.c                                    |   12 +-
4095  60 files changed, 2462 insertions(+), 1232 deletions(-)
4096  create mode 100644 drivers/tty/serial/arc_uart.c
4097 Merging usb/usb-next (2f02bc8 USB: report submission of active URBs)
4098 $ git merge usb/usb-next
4099 Recorded preimage for 'drivers/usb/musb/ux500.c'
4100 Resolved 'drivers/usb/early/ehci-dbgp.c' using previous resolution.
4101 Auto-merging drivers/usb/serial/usb_wwan.c
4102 Auto-merging drivers/usb/musb/ux500.c
4103 CONFLICT (content): Merge conflict in drivers/usb/musb/ux500.c
4104 Auto-merging drivers/usb/musb/musb_gadget.c
4105 Removing drivers/usb/host/ohci-xls.c
4106 Removing drivers/usb/host/ohci-sh.c
4107 Removing drivers/usb/host/ohci-ppc-soc.c
4108 Removing drivers/usb/host/ohci-pnx8550.c
4109 Removing drivers/usb/host/ohci-cns3xxx.c
4110 Removing drivers/usb/host/ohci-au1xxx.c
4111 Removing drivers/usb/host/ehci-xls.c
4112 Removing drivers/usb/host/ehci-ls1x.c
4113 Removing drivers/usb/host/ehci-lpm.c
4114 Removing drivers/usb/host/ehci-ixp4xx.c
4115 Removing drivers/usb/host/ehci-cns3xxx.c
4116 Removing drivers/usb/host/ehci-au1xxx.c
4117 Removing drivers/usb/gadget/file_storage.c
4118 Auto-merging drivers/usb/early/ehci-dbgp.c
4119 CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
4120 Automatic merge failed; fix conflicts and then commit the result.
4121 $ git commit -v -a
4122 Recorded resolution for 'drivers/usb/musb/ux500.c'.
4123 [master 32a5769] Merge remote-tracking branch 'usb/usb-next'
4124 $ git diff -M --stat --summary HEAD^..
4125  Documentation/DocBook/gadget.tmpl                  |    2 +-
4126  .../devicetree/bindings/usb/am33xx-usb.txt         |    8 +-
4127  Documentation/usb/error-codes.txt                  |    7 +-
4128  Documentation/usb/mass-storage.txt                 |   15 +-
4129  arch/arm/configs/afeb9260_defconfig                |    2 +-
4130  arch/arm/configs/at91sam9260_defconfig             |    2 +-
4131  arch/arm/configs/at91sam9261_defconfig             |    2 +-
4132  arch/arm/configs/at91sam9263_defconfig             |    2 +-
4133  arch/arm/configs/at91sam9g20_defconfig             |    2 +-
4134  arch/arm/configs/corgi_defconfig                   |    2 +-
4135  arch/arm/configs/davinci_all_defconfig             |    2 +-
4136  arch/arm/configs/h7202_defconfig                   |    3 +-
4137  arch/arm/configs/magician_defconfig                |    2 +-
4138  arch/arm/configs/mini2440_defconfig                |    2 +-
4139  arch/arm/configs/omap1_defconfig                   |    3 +-
4140  arch/arm/configs/prima2_defconfig                  |    1 -
4141  arch/arm/configs/spitz_defconfig                   |    2 +-
4142  arch/arm/configs/stamp9g20_defconfig               |    2 +-
4143  arch/arm/configs/viper_defconfig                   |    2 +-
4144  arch/arm/configs/zeus_defconfig                    |    2 +-
4145  arch/arm/mach-cns3xxx/cns3420vb.c                  |   53 +-
4146  arch/avr32/configs/atngw100_defconfig              |    2 +-
4147  arch/avr32/configs/atngw100_evklcd100_defconfig    |    2 +-
4148  arch/avr32/configs/atngw100_evklcd101_defconfig    |    2 +-
4149  arch/avr32/configs/atngw100_mrmt_defconfig         |    2 +-
4150  arch/avr32/configs/atngw100mkii_defconfig          |    2 +-
4151  .../avr32/configs/atngw100mkii_evklcd100_defconfig |    2 +-
4152  .../avr32/configs/atngw100mkii_evklcd101_defconfig |    2 +-
4153  arch/avr32/configs/atstk1002_defconfig             |    2 +-
4154  arch/avr32/configs/atstk1003_defconfig             |    2 +-
4155  arch/avr32/configs/atstk1004_defconfig             |    2 +-
4156  arch/avr32/configs/atstk1006_defconfig             |    2 +-
4157  arch/avr32/configs/favr-32_defconfig               |    2 +-
4158  arch/avr32/configs/hammerhead_defconfig            |    2 +-
4159  arch/blackfin/configs/CM-BF527_defconfig           |    2 +-
4160  arch/blackfin/configs/CM-BF548_defconfig           |    2 +-
4161  arch/blackfin/configs/CM-BF561_defconfig           |    2 +-
4162  arch/mips/alchemy/common/Makefile                  |    2 +-
4163  arch/mips/alchemy/common/platform.c                |   58 +-
4164  .../mips/alchemy/common/usb.c                      |    0
4165  arch/mips/ath79/dev-usb.c                          |    2 -
4166  arch/mips/configs/bcm47xx_defconfig                |    2 +-
4167  arch/mips/configs/db1000_defconfig                 |    1 +
4168  arch/mips/configs/db1235_defconfig                 |    2 +
4169  arch/mips/configs/gpr_defconfig                    |    1 +
4170  arch/mips/configs/ls1b_defconfig                   |    1 +
4171  arch/mips/configs/mtx1_defconfig                   |    3 +-
4172  arch/mips/loongson1/common/platform.c              |    7 +-
4173  arch/mips/netlogic/xlr/platform.c                  |   17 +-
4174  arch/mips/pnx8550/common/platform.c                |   31 +-
4175  arch/sh/configs/ecovec24_defconfig                 |    2 +-
4176  arch/sh/configs/se7724_defconfig                   |    2 +-
4177  arch/sh/kernel/cpu/sh3/setup-sh7720.c              |    6 +-
4178  arch/sh/kernel/cpu/sh4a/setup-sh7757.c             |    6 +-
4179  arch/sh/kernel/cpu/sh4a/setup-sh7763.c             |    6 +-
4180  arch/sh/kernel/cpu/sh4a/setup-sh7786.c             |    6 +-
4181  drivers/usb/chipidea/Kconfig                       |    1 +
4182  drivers/usb/chipidea/debug.c                       |    3 -
4183  drivers/usb/chipidea/host.c                        |   67 +-
4184  drivers/usb/core/devices.c                         |   18 +-
4185  drivers/usb/core/hcd.c                             |   19 +-
4186  drivers/usb/core/hub.c                             |   81 +-
4187  drivers/usb/core/message.c                         |   54 +-
4188  drivers/usb/core/urb.c                             |   29 +-
4189  drivers/usb/core/usb.c                             |    4 +-
4190  drivers/usb/dwc3/Makefile                          |   14 +-
4191  drivers/usb/dwc3/core.c                            |   77 +-
4192  drivers/usb/dwc3/core.h                            |    3 -
4193  drivers/usb/dwc3/dwc3-exynos.c                     |   49 +-
4194  drivers/usb/dwc3/dwc3-omap.c                       |   16 +-
4195  drivers/usb/dwc3/dwc3-pci.c                        |   16 +-
4196  drivers/usb/early/ehci-dbgp.c                      |    4 +-
4197  drivers/usb/gadget/Kconfig                         |   29 +-
4198  drivers/usb/gadget/Makefile                        |    2 -
4199  drivers/usb/gadget/composite.c                     |    8 +-
4200  drivers/usb/gadget/config.c                        |   39 +-
4201  drivers/usb/gadget/dummy_hcd.c                     |  170 +-
4202  drivers/usb/gadget/f_acm.c                         |   79 +-
4203  drivers/usb/gadget/f_ecm.c                         |  112 +-
4204  drivers/usb/gadget/f_eem.c                         |   51 +-
4205  drivers/usb/gadget/f_fs.c                          |    4 +-
4206  drivers/usb/gadget/f_hid.c                         |   30 +-
4207  drivers/usb/gadget/f_loopback.c                    |   28 +-
4208  drivers/usb/gadget/f_mass_storage.c                |   63 +-
4209  drivers/usb/gadget/f_midi.c                        |   14 +-
4210  drivers/usb/gadget/f_ncm.c                         |   94 +-
4211  drivers/usb/gadget/f_obex.c                        |   42 +-
4212  drivers/usb/gadget/f_phonet.c                      |   21 +-
4213  drivers/usb/gadget/f_rndis.c                       |   94 +-
4214  drivers/usb/gadget/f_serial.c                      |   38 +-
4215  drivers/usb/gadget/f_sourcesink.c                  |  104 +-
4216  drivers/usb/gadget/f_subset.c                      |   75 +-
4217  drivers/usb/gadget/f_uac1.c                        |   23 +-
4218  drivers/usb/gadget/f_uac2.c                        |  220 +-
4219  drivers/usb/gadget/f_uvc.c                         |  138 +-
4220  drivers/usb/gadget/file_storage.c                  | 3656 --------------------
4221  drivers/usb/gadget/fsl_udc_core.c                  |    2 +-
4222  drivers/usb/gadget/inode.c                         |    3 -
4223  drivers/usb/gadget/lpc32xx_udc.c                   |    2 +-
4224  drivers/usb/gadget/net2280.c                       |    2 +-
4225  drivers/usb/gadget/printer.c                       |   12 +-
4226  drivers/usb/gadget/pxa27x_udc.h                    |    2 +-
4227  drivers/usb/gadget/storage_common.c                |  165 +-
4228  drivers/usb/gadget/tcm_usb_gadget.c                |   13 +-
4229  drivers/usb/gadget/udc-core.c                      |   11 -
4230  drivers/usb/host/Kconfig                           |   35 +-
4231  drivers/usb/host/Makefile                          |    4 +-
4232  drivers/usb/host/ehci-atmel.c                      |    9 +-
4233  drivers/usb/host/ehci-au1xxx.c                     |  184 -
4234  drivers/usb/host/ehci-cns3xxx.c                    |  155 -
4235  drivers/usb/host/ehci-dbg.c                        |  112 -
4236  drivers/usb/host/ehci-fsl.c                        |    1 -
4237  drivers/usb/host/ehci-grlib.c                      |   18 +-
4238  drivers/usb/host/ehci-hcd.c                        |  204 +-
4239  drivers/usb/host/ehci-hub.c                        |   47 +-
4240  drivers/usb/host/ehci-ixp4xx.c                     |  139 -
4241  drivers/usb/host/ehci-lpm.c                        |   84 -
4242  drivers/usb/host/ehci-ls1x.c                       |  147 -
4243  drivers/usb/host/ehci-msm.c                        |    1 -
4244  drivers/usb/host/ehci-mxc.c                        |    8 +-
4245  drivers/usb/host/ehci-octeon.c                     |    3 -
4246  drivers/usb/host/ehci-omap.c                       |    3 -
4247  drivers/usb/host/ehci-orion.c                      |   16 +-
4248  drivers/usb/host/ehci-pci.c                        |  129 +-
4249  drivers/usb/host/ehci-platform.c                   |   96 +-
4250  drivers/usb/host/ehci-pmcmsp.c                     |    1 -
4251  drivers/usb/host/ehci-q.c                          |   12 +-
4252  drivers/usb/host/ehci-s5p.c                        |   10 +-
4253  drivers/usb/host/ehci-sched.c                      |  136 +-
4254  drivers/usb/host/ehci-sh.c                         |    9 +-
4255  drivers/usb/host/ehci-spear.c                      |    9 +-
4256  drivers/usb/host/ehci-tegra.c                      |   13 +-
4257  drivers/usb/host/ehci-vt8500.c                     |   21 -
4258  drivers/usb/host/ehci-w90x900.c                    |    2 +-
4259  drivers/usb/host/ehci-xls.c                        |  142 -
4260  drivers/usb/host/ehci.h                            |   45 +-
4261  drivers/usb/host/isp1760-if.c                      |    7 +-
4262  drivers/usb/host/ohci-at91.c                       |    2 +-
4263  drivers/usb/host/ohci-au1xxx.c                     |  234 --
4264  drivers/usb/host/ohci-cns3xxx.c                    |  166 -
4265  drivers/usb/host/ohci-ep93xx.c                     |    2 +-
4266  drivers/usb/host/ohci-exynos.c                     |   32 +-
4267  drivers/usb/host/ohci-hcd.c                        |  139 +-
4268  drivers/usb/host/ohci-hub.c                        |   42 -
4269  drivers/usb/host/ohci-omap.c                       |    2 +-
4270  drivers/usb/host/ohci-pci.c                        |   47 +-
4271  drivers/usb/host/ohci-platform.c                   |   28 +-
4272  drivers/usb/host/ohci-pnx8550.c                    |  243 --
4273  drivers/usb/host/ohci-ppc-soc.c                    |  216 --
4274  drivers/usb/host/ohci-pxa27x.c                     |    2 +-
4275  drivers/usb/host/ohci-q.c                          |    4 +-
4276  drivers/usb/host/ohci-s3c2410.c                    |   35 +-
4277  drivers/usb/host/ohci-sh.c                         |  141 -
4278  drivers/usb/host/ohci-sm501.c                      |    2 +-
4279  drivers/usb/host/ohci-spear.c                      |    2 +-
4280  drivers/usb/host/ohci-tmio.c                       |    2 +-
4281  drivers/usb/host/ohci-xls.c                        |  152 -
4282  drivers/usb/host/r8a66597-hcd.c                    |    6 +-
4283  drivers/usb/host/uhci-q.c                          |   73 +-
4284  drivers/usb/misc/ezusb.c                           |   38 +-
4285  drivers/usb/musb/am35x.c                           |   34 +-
4286  drivers/usb/musb/blackfin.c                        |   34 +-
4287  drivers/usb/musb/cppi_dma.c                        |    1 +
4288  drivers/usb/musb/da8xx.c                           |   34 +-
4289  drivers/usb/musb/davinci.c                         |   34 +-
4290  drivers/usb/musb/musb_core.c                       |   96 +-
4291  drivers/usb/musb/musb_core.h                       |    5 +-
4292  drivers/usb/musb/musb_dsps.c                       |  127 +-
4293  drivers/usb/musb/musb_gadget.c                     |   30 +-
4294  drivers/usb/musb/musb_gadget_ep0.c                 |    6 +-
4295  drivers/usb/musb/musb_host.c                       |    2 +-
4296  drivers/usb/musb/musbhsdma.h                       |    4 -
4297  drivers/usb/musb/omap2430.c                        |   46 +-
4298  drivers/usb/musb/tusb6010.c                        |   34 +-
4299  drivers/usb/musb/ux500.c                           |   56 +-
4300  drivers/usb/otg/mv_otg.c                           |   14 +-
4301  drivers/usb/phy/Kconfig                            |   12 +
4302  drivers/usb/phy/Makefile                           |    1 +
4303  drivers/usb/phy/rcar-phy.c                         |  220 ++
4304  drivers/usb/phy/tegra_usb_phy.c                    |    4 +-
4305  drivers/usb/renesas_usbhs/common.c                 |    5 +
4306  drivers/usb/renesas_usbhs/common.h                 |    1 +
4307  drivers/usb/renesas_usbhs/fifo.c                   |   14 +-
4308  drivers/usb/renesas_usbhs/mod.c                    |    3 +-
4309  drivers/usb/renesas_usbhs/mod_gadget.c             |   11 +
4310  drivers/usb/renesas_usbhs/mod_host.c               |   45 +-
4311  drivers/usb/renesas_usbhs/pipe.c                   |  101 +
4312  drivers/usb/renesas_usbhs/pipe.h                   |    1 +
4313  drivers/usb/serial/aircable.c                      |    5 -
4314  drivers/usb/serial/ark3116.c                       |    5 -
4315  drivers/usb/serial/belkin_sa.c                     |    5 -
4316  drivers/usb/serial/cp210x.c                        |   36 +-
4317  drivers/usb/serial/cyberjack.c                     |    5 -
4318  drivers/usb/serial/cypress_m8.c                    |    5 -
4319  drivers/usb/serial/digi_acceleport.c               |    4 -
4320  drivers/usb/serial/empeg.c                         |    4 -
4321  drivers/usb/serial/ftdi_sio.c                      |   79 +-
4322  drivers/usb/serial/generic.c                       |    1 +
4323  drivers/usb/serial/hp4x.c                          |    5 -
4324  drivers/usb/serial/io_edgeport.c                   |    4 -
4325  drivers/usb/serial/io_ti.c                         |    4 -
4326  drivers/usb/serial/ipaq.c                          |    5 -
4327  drivers/usb/serial/ipw.c                           |    4 -
4328  drivers/usb/serial/iuu_phoenix.c                   |    8 +-
4329  drivers/usb/serial/keyspan.c                       |    4 -
4330  drivers/usb/serial/keyspan_pda.c                   |    4 -
4331  drivers/usb/serial/kl5kusb105.c                    |    4 -
4332  drivers/usb/serial/kobil_sct.c                     |    2 -
4333  drivers/usb/serial/mct_u232.c                      |    4 -
4334  drivers/usb/serial/metro-usb.c                     |    2 -
4335  drivers/usb/serial/mos7720.c                       |    4 -
4336  drivers/usb/serial/mos7840.c                       |    4 -
4337  drivers/usb/serial/omninet.c                       |    4 -
4338  drivers/usb/serial/option.c                        |   88 +-
4339  drivers/usb/serial/oti6858.c                       |    2 -
4340  drivers/usb/serial/quatech2.c                      |    2 -
4341  drivers/usb/serial/siemens_mpi.c                   |    2 -
4342  drivers/usb/serial/sierra.c                        |    3 +-
4343  drivers/usb/serial/spcp8x5.c                       |    4 -
4344  drivers/usb/serial/ssu100.c                        |    2 -
4345  drivers/usb/serial/usb_wwan.c                      |    2 -
4346  drivers/usb/serial/vivopay-serial.c                |    3 -
4347  drivers/usb/storage/realtek_cr.c                   |    2 +-
4348  drivers/usb/usb-skeleton.c                         |   13 +-
4349  drivers/usb/wusbcore/devconnect.c                  |   13 -
4350  drivers/uwb/umc-bus.c                              |    2 +-
4351  include/linux/usb.h                                |   50 +-
4352  include/linux/usb/composite.h                      |    4 +-
4353  include/linux/usb/ehci_pdriver.h                   |    5 +-
4354  include/linux/usb/ezusb.h                          |    8 -
4355  include/linux/usb/gadget.h                         |    7 +
4356  include/linux/usb/ohci_pdriver.h                   |    2 +
4357  232 files changed, 2401 insertions(+), 8517 deletions(-)
4358  rename drivers/usb/host/alchemy-common.c => arch/mips/alchemy/common/usb.c (100%)
4359  delete mode 100644 drivers/usb/gadget/file_storage.c
4360  delete mode 100644 drivers/usb/host/ehci-au1xxx.c
4361  delete mode 100644 drivers/usb/host/ehci-cns3xxx.c
4362  delete mode 100644 drivers/usb/host/ehci-ixp4xx.c
4363  delete mode 100644 drivers/usb/host/ehci-lpm.c
4364  delete mode 100644 drivers/usb/host/ehci-ls1x.c
4365  delete mode 100644 drivers/usb/host/ehci-xls.c
4366  delete mode 100644 drivers/usb/host/ohci-au1xxx.c
4367  delete mode 100644 drivers/usb/host/ohci-cns3xxx.c
4368  delete mode 100644 drivers/usb/host/ohci-pnx8550.c
4369  delete mode 100644 drivers/usb/host/ohci-ppc-soc.c
4370  delete mode 100644 drivers/usb/host/ohci-sh.c
4371  delete mode 100644 drivers/usb/host/ohci-xls.c
4372  create mode 100644 drivers/usb/phy/rcar-phy.c
4373 Merging staging/staging-next (045020e Merge tag 'iio-for-3.8d' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next)
4374 $ git merge staging/staging-next
4375 Removing drivers/staging/telephony/phonedev.c
4376 Removing drivers/staging/telephony/ixj_pcmcia.c
4377 Removing drivers/staging/telephony/ixj.h
4378 Removing drivers/staging/telephony/ixj.c
4379 Removing drivers/staging/telephony/ixj-ver.h
4380 Removing drivers/staging/telephony/TODO
4381 Removing drivers/staging/telephony/Makefile
4382 Removing drivers/staging/telephony/Kconfig
4383 Removing drivers/staging/rts_pstor/xd.h
4384 Removing drivers/staging/rts_pstor/xd.c
4385 Removing drivers/staging/rts_pstor/trace.h
4386 Removing drivers/staging/rts_pstor/spi.h
4387 Removing drivers/staging/rts_pstor/spi.c
4388 Removing drivers/staging/rts_pstor/sd.h
4389 Removing drivers/staging/rts_pstor/sd.c
4390 Removing drivers/staging/rts_pstor/rtsx_transport.h
4391 Removing drivers/staging/rts_pstor/rtsx_transport.c
4392 Removing drivers/staging/rts_pstor/rtsx_sys.h
4393 Removing drivers/staging/rts_pstor/rtsx_scsi.h
4394 Removing drivers/staging/rts_pstor/rtsx_scsi.c
4395 Removing drivers/staging/rts_pstor/rtsx_chip.h
4396 Removing drivers/staging/rts_pstor/rtsx_chip.c
4397 Removing drivers/staging/rts_pstor/rtsx_card.h
4398 Removing drivers/staging/rts_pstor/rtsx_card.c
4399 Removing drivers/staging/rts_pstor/rtsx.h
4400 Removing drivers/staging/rts_pstor/rtsx.c
4401 Removing drivers/staging/rts_pstor/ms.h
4402 Removing drivers/staging/rts_pstor/ms.c
4403 Removing drivers/staging/rts_pstor/general.h
4404 Removing drivers/staging/rts_pstor/general.c
4405 Removing drivers/staging/rts_pstor/debug.h
4406 Removing drivers/staging/rts_pstor/TODO
4407 Removing drivers/staging/rts_pstor/Makefile
4408 Removing drivers/staging/rts_pstor/Kconfig
4409 Auto-merging drivers/staging/ipack/carriers/tpci200.h
4410 Auto-merging drivers/staging/ipack/carriers/tpci200.c
4411 Removing drivers/staging/ipack/bridges/Kconfig
4412 Removing drivers/staging/iio/adc/max1363_ring.c
4413 Removing drivers/staging/iio/adc/max1363.h
4414 Removing drivers/staging/iio/adc/adt7310.c
4415 Removing drivers/staging/iio/adc/ad7887_ring.c
4416 Removing drivers/staging/iio/adc/ad7887.h
4417 Auto-merging drivers/staging/dgrp/dgrp_sysfs.c
4418 Auto-merging drivers/staging/dgrp/dgrp_net_ops.c
4419 Removing drivers/staging/csr/csr_panic.h
4420 Removing drivers/staging/csr/csr_panic.c
4421 Removing drivers/staging/csr/csr_lib.h
4422 Removing drivers/staging/comedi/drivers/mpc8260cpm.c
4423 Removing drivers/staging/comedi/drivers/addi_apci_3001.c
4424 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
4425 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
4426 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
4427 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
4428 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
4429 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
4430 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
4431 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
4432 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
4433 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
4434 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
4435 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
4436 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
4437 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
4438 Removing drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
4439 Removing drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
4440 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
4441 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
4442 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
4443 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
4444 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
4445 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
4446 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
4447 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
4448 Removing drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
4449 Auto-merging drivers/iio/adc/max1363.c
4450 Auto-merging drivers/iio/adc/ad7887.c
4451 Auto-merging drivers/iio/adc/Makefile
4452 CONFLICT (content): Merge conflict in drivers/iio/adc/Makefile
4453 Auto-merging drivers/iio/adc/Kconfig
4454 CONFLICT (conteRecorded preimage for 'drivers/iio/adc/Kconfig'
4455 Recorded preimage for 'drivers/iio/adc/Makefile'
4456 nt): Merge conflict in drivers/iio/adc/Kconfig
4457 Removing Documentation/telephony/ixj.txt
4458 Removing Documentation/telephony/00-INDEX
4459 Automatic merge failed; fix conflicts and then commit the result.
4460 $ git commit -v -a
4461 Recorded resolution for 'drivers/iio/adc/Kconfig'.
4462 Recorded resolution for 'drivers/iio/adc/Makefile'.
4463 [master 7bbf6a4] Merge remote-tracking branch 'staging/staging-next'
4464 $ git diff -M --stat --summary HEAD^..
4465  Documentation/telephony/00-INDEX                   |    4 -
4466  Documentation/telephony/ixj.txt                    |  394 -
4467  arch/arm/mach-omap2/drm.c                          |    7 +
4468  drivers/iio/Kconfig                                |    6 +
4469  drivers/iio/Makefile                               |    1 +
4470  drivers/iio/accel/Kconfig                          |    2 +-
4471  drivers/iio/accel/hid-sensor-accel-3d.c            |   15 +-
4472  drivers/iio/adc/Kconfig                            |   31 +
4473  drivers/iio/adc/Makefile                           |    2 +
4474  drivers/iio/adc/ad7266.c                           |    3 +-
4475  drivers/iio/adc/ad7476.c                           |    2 +-
4476  .../iio/adc/ad7887_core.c => iio/adc/ad7887.c}     |  217 +-
4477  drivers/iio/adc/ad_sigma_delta.c                   |    2 +-
4478  drivers/iio/adc/at91_adc.c                         |    6 +-
4479  .../iio/adc/max1363_core.c => iio/adc/max1363.c}   |  330 +-
4480  drivers/iio/buffer_cb.c                            |  113 +
4481  drivers/iio/dac/Kconfig                            |   12 +-
4482  drivers/iio/dac/Makefile                           |    1 +
4483  drivers/iio/dac/ad5449.c                           |  376 +
4484  drivers/iio/dac/ad5686.c                           |    2 +-
4485  drivers/iio/gyro/hid-sensor-gyro-3d.c              |   15 +-
4486  drivers/iio/industrialio-buffer.c                  |  386 +-
4487  drivers/iio/industrialio-core.c                    |   12 +-
4488  drivers/iio/industrialio-event.c                   |    4 +-
4489  drivers/iio/inkern.c                               |    6 +-
4490  drivers/iio/light/adjd_s311.c                      |    3 +-
4491  drivers/iio/light/hid-sensor-als.c                 |   15 +-
4492  drivers/iio/magnetometer/hid-sensor-magn-3d.c      |   15 +-
4493  drivers/staging/Kconfig                            |    4 -
4494  drivers/staging/Makefile                           |    2 -
4495  drivers/staging/android/Makefile                   |    2 +
4496  drivers/staging/android/binder.c                   |  471 +-
4497  drivers/staging/android/binder_trace.h             |  327 +
4498  drivers/staging/bcm/Bcmchar.c                      |    6 +-
4499  drivers/staging/bcm/Bcmnet.c                       |    6 +-
4500  drivers/staging/bcm/CmHost.c                       |   88 +-
4501  drivers/staging/bcm/CmHost.h                       |  189 +-
4502  drivers/staging/bcm/InterfaceAdapter.h             |  142 +-
4503  drivers/staging/bcm/InterfaceDld.c                 |    4 +-
4504  drivers/staging/bcm/InterfaceIdleMode.c            |    2 +-
4505  drivers/staging/bcm/InterfaceIdleMode.h            |    5 +-
4506  drivers/staging/bcm/InterfaceInit.c                |   22 +-
4507  drivers/staging/bcm/InterfaceInit.h                |    2 +-
4508  drivers/staging/bcm/InterfaceIsr.c                 |    6 +-
4509  drivers/staging/bcm/InterfaceIsr.h                 |    4 +-
4510  drivers/staging/bcm/InterfaceMisc.c                |  124 +-
4511  drivers/staging/bcm/InterfaceMisc.h                |    6 +-
4512  drivers/staging/bcm/InterfaceRx.c                  |   16 +-
4513  drivers/staging/bcm/InterfaceRx.h                  |    2 +-
4514  drivers/staging/bcm/InterfaceTx.c                  |   14 +-
4515  drivers/staging/bcm/LeakyBucket.c                  |    6 +-
4516  drivers/staging/bcm/Misc.c                         |  234 +-
4517  drivers/staging/bcm/Prototypes.h                   |    8 +-
4518  drivers/staging/bcm/Transmit.c                     |    2 +-
4519  drivers/staging/bcm/cntrl_SignalingInterface.h     |  256 +-
4520  drivers/staging/ccg/ccg.c                          |    8 +-
4521  drivers/staging/ced1401/ced_ioc.c                  |   33 +-
4522  drivers/staging/ced1401/usb1401.c                  |   30 +-
4523  drivers/staging/comedi/Kconfig                     |   20 +-
4524  drivers/staging/comedi/comedi.h                    |   27 +-
4525  drivers/staging/comedi/comedidev.h                 |   40 +-
4526  drivers/staging/comedi/drivers.c                   |   67 +-
4527  drivers/staging/comedi/drivers/8255_pci.c          |   20 +-
4528  drivers/staging/comedi/drivers/Makefile            |    1 -
4529  .../comedi/drivers/addi-data/APCI1710_82x54.c      |  205 +-
4530  .../comedi/drivers/addi-data/APCI1710_82x54.h      |   73 -
4531  .../comedi/drivers/addi-data/APCI1710_Chrono.c     |  245 +-
4532  .../comedi/drivers/addi-data/APCI1710_Chrono.h     |   74 -
4533  .../comedi/drivers/addi-data/APCI1710_Dig_io.c     |   44 +-
4534  .../comedi/drivers/addi-data/APCI1710_Dig_io.h     |   46 -
4535  .../comedi/drivers/addi-data/APCI1710_INCCPT.c     |  886 +-
4536  .../comedi/drivers/addi-data/APCI1710_INCCPT.h     |  271 -
4537  .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c    |   39 +-
4538  .../comedi/drivers/addi-data/APCI1710_Inp_cpt.h    |   47 -
4539  .../comedi/drivers/addi-data/APCI1710_Pwm.c        |  278 +-
4540  .../comedi/drivers/addi-data/APCI1710_Pwm.h        |   76 -
4541  .../comedi/drivers/addi-data/APCI1710_Ssi.c        |   41 +-
4542  .../comedi/drivers/addi-data/APCI1710_Ssi.h        |   43 -
4543  .../comedi/drivers/addi-data/APCI1710_Tor.c        |   50 +-
4544  .../comedi/drivers/addi-data/APCI1710_Tor.h        |   57 -
4545  .../comedi/drivers/addi-data/APCI1710_Ttl.c        |   38 +-
4546  .../comedi/drivers/addi-data/APCI1710_Ttl.h        |   44 -
4547  .../comedi/drivers/addi-data/addi_amcc_s5933.h     |  469 -
4548  .../staging/comedi/drivers/addi-data/addi_common.c | 2033 +---
4549  .../staging/comedi/drivers/addi-data/addi_common.h |   32 -
4550  .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1367 +--
4551  .../comedi/drivers/addi-data/hwdrv_APCI1710.c      |   69 +-
4552  .../comedi/drivers/addi-data/hwdrv_APCI1710.h      |   71 -
4553  .../comedi/drivers/addi-data/hwdrv_apci035.c       |  116 +-
4554  .../comedi/drivers/addi-data/hwdrv_apci035.h       |  109 -
4555  .../comedi/drivers/addi-data/hwdrv_apci1032.c      |  287 -
4556  .../comedi/drivers/addi-data/hwdrv_apci1032.h      |   64 -
4557  .../comedi/drivers/addi-data/hwdrv_apci1500.c      |  119 +-
4558  .../comedi/drivers/addi-data/hwdrv_apci1500.h      |  165 -
4559  .../comedi/drivers/addi-data/hwdrv_apci1516.c      |   91 +-
4560  .../comedi/drivers/addi-data/hwdrv_apci1516.h      |   65 -
4561  .../comedi/drivers/addi-data/hwdrv_apci1564.c      |  142 +-
4562  .../comedi/drivers/addi-data/hwdrv_apci1564.h      |  121 -
4563  .../comedi/drivers/addi-data/hwdrv_apci16xx.c      |   57 +-
4564  .../comedi/drivers/addi-data/hwdrv_apci16xx.h      |   79 -
4565  .../comedi/drivers/addi-data/hwdrv_apci2016.c      |   72 +-
4566  .../comedi/drivers/addi-data/hwdrv_apci2016.h      |   72 -
4567  .../comedi/drivers/addi-data/hwdrv_apci2032.c      |   97 +-
4568  .../comedi/drivers/addi-data/hwdrv_apci2032.h      |   83 -
4569  .../comedi/drivers/addi-data/hwdrv_apci2200.c      |   91 +-
4570  .../comedi/drivers/addi-data/hwdrv_apci2200.h      |   61 -
4571  .../comedi/drivers/addi-data/hwdrv_apci3120.c      | 1641 ++-
4572  .../comedi/drivers/addi-data/hwdrv_apci3120.h      |  249 -
4573  .../comedi/drivers/addi-data/hwdrv_apci3200.c      | 3273 +++---
4574  .../comedi/drivers/addi-data/hwdrv_apci3200.h      |  191 -
4575  .../comedi/drivers/addi-data/hwdrv_apci3501.c      |  119 +-
4576  .../comedi/drivers/addi-data/hwdrv_apci3501.h      |   98 -
4577  .../comedi/drivers/addi-data/hwdrv_apci3xxx.c      |   48 +-
4578  .../comedi/drivers/addi-data/hwdrv_apci3xxx.h      |   48 -
4579  drivers/staging/comedi/drivers/addi_apci_035.c     |   72 +-
4580  drivers/staging/comedi/drivers/addi_apci_1032.c    |  356 +-
4581  drivers/staging/comedi/drivers/addi_apci_1500.c    |   72 +-
4582  drivers/staging/comedi/drivers/addi_apci_1516.c    |   68 +-
4583  drivers/staging/comedi/drivers/addi_apci_1564.c    |   71 +-
4584  drivers/staging/comedi/drivers/addi_apci_16xx.c    |   72 +-
4585  drivers/staging/comedi/drivers/addi_apci_1710.c    |  152 +-
4586  drivers/staging/comedi/drivers/addi_apci_2016.c    |   65 +-
4587  drivers/staging/comedi/drivers/addi_apci_2032.c    |   67 +-
4588  drivers/staging/comedi/drivers/addi_apci_2200.c    |   67 +-
4589  drivers/staging/comedi/drivers/addi_apci_3001.c    |    9 -
4590  drivers/staging/comedi/drivers/addi_apci_3120.c    |  277 +-
4591  drivers/staging/comedi/drivers/addi_apci_3200.c    |   91 +-
4592  drivers/staging/comedi/drivers/addi_apci_3300.c    |   90 +-
4593  drivers/staging/comedi/drivers/addi_apci_3501.c    |   72 +-
4594  drivers/staging/comedi/drivers/addi_apci_3xxx.c    |  836 +-
4595  drivers/staging/comedi/drivers/adl_pci6208.c       |   17 +-
4596  drivers/staging/comedi/drivers/adl_pci7x3x.c       |    9 +-
4597  drivers/staging/comedi/drivers/adl_pci8164.c       |   21 +-
4598  drivers/staging/comedi/drivers/adl_pci9111.c       |   16 +-
4599  drivers/staging/comedi/drivers/adl_pci9118.c       |  416 +-
4600  drivers/staging/comedi/drivers/adq12b.c            |   46 +-
4601  drivers/staging/comedi/drivers/adv_pci1710.c       |   19 +-
4602  drivers/staging/comedi/drivers/adv_pci1723.c       |   18 +-
4603  drivers/staging/comedi/drivers/adv_pci_dio.c       |   19 +-
4604  drivers/staging/comedi/drivers/aio_aio12_8.c       |    8 +-
4605  drivers/staging/comedi/drivers/aio_iiro_16.c       |   19 +-
4606  drivers/staging/comedi/drivers/amplc_dio200.c      | 1428 ++-
4607  drivers/staging/comedi/drivers/amplc_pc236.c       |   39 +-
4608  drivers/staging/comedi/drivers/amplc_pc263.c       |   17 +-
4609  drivers/staging/comedi/drivers/amplc_pci224.c      |   32 +-
4610  drivers/staging/comedi/drivers/amplc_pci230.c      |   31 +-
4611  drivers/staging/comedi/drivers/cb_das16_cs.c       |    5 +-
4612  drivers/staging/comedi/drivers/cb_pcidas.c         |   20 +-
4613  drivers/staging/comedi/drivers/cb_pcidas64.c       | 3011 +++---
4614  drivers/staging/comedi/drivers/cb_pcidda.c         |  675 +-
4615  drivers/staging/comedi/drivers/cb_pcimdas.c        |  115 +-
4616  drivers/staging/comedi/drivers/cb_pcimdda.c        |   19 +-
4617  drivers/staging/comedi/drivers/comedi_bond.c       |    8 +-
4618  drivers/staging/comedi/drivers/comedi_parport.c    |    8 +-
4619  drivers/staging/comedi/drivers/comedi_test.c       |    8 +-
4620  drivers/staging/comedi/drivers/contec_pci_dio.c    |    9 +-
4621  drivers/staging/comedi/drivers/daqboard2000.c      |   17 +-
4622  drivers/staging/comedi/drivers/das08.c             |   31 +-
4623  drivers/staging/comedi/drivers/das08_cs.c          |    9 +-
4624  drivers/staging/comedi/drivers/das16.c             |   23 +-
4625  drivers/staging/comedi/drivers/das16m1.c           |   49 +-
4626  drivers/staging/comedi/drivers/das1800.c           |   28 +-
4627  drivers/staging/comedi/drivers/das6402.c           |   16 +-
4628  drivers/staging/comedi/drivers/das800.c            |   35 +-
4629  drivers/staging/comedi/drivers/dmm32at.c           |   27 +-
4630  drivers/staging/comedi/drivers/dt2801.c            |   14 +-
4631  drivers/staging/comedi/drivers/dt2811.c            |   13 +-
4632  drivers/staging/comedi/drivers/dt2814.c            |   12 +-
4633  drivers/staging/comedi/drivers/dt2815.c            |    9 +-
4634  drivers/staging/comedi/drivers/dt282x.c            |   33 +-
4635  drivers/staging/comedi/drivers/dt3000.c            |  561 +-
4636  drivers/staging/comedi/drivers/dt9812.c            |   27 +-
4637  drivers/staging/comedi/drivers/dyna_pci10xx.c      |   21 +-
4638  drivers/staging/comedi/drivers/fl512.c             |   10 +-
4639  drivers/staging/comedi/drivers/gsc_hpdi.c          |  490 +-
4640  drivers/staging/comedi/drivers/icp_multi.c         |   16 +-
4641  drivers/staging/comedi/drivers/ii_pci20kc.c        |   51 +-
4642  drivers/staging/comedi/drivers/jr3_pci.c           |  641 +-
4643  drivers/staging/comedi/drivers/jr3_pci.h           |   12 +-
4644  drivers/staging/comedi/drivers/ke_counter.c        |   54 +-
4645  drivers/staging/comedi/drivers/me4000.c            |   19 +-
4646  drivers/staging/comedi/drivers/me_daq.c            |  633 +-
4647  drivers/staging/comedi/drivers/mpc624.c            |   10 +-
4648  drivers/staging/comedi/drivers/mpc8260cpm.c        |  164 -
4649  drivers/staging/comedi/drivers/multiq3.c           |   11 +-
4650  drivers/staging/comedi/drivers/ni_6527.c           |   30 +-
4651  drivers/staging/comedi/drivers/ni_65xx.c           |  129 +-
4652  drivers/staging/comedi/drivers/ni_660x.c           |  586 +-
4653  drivers/staging/comedi/drivers/ni_670x.c           |   16 +-
4654  drivers/staging/comedi/drivers/ni_at_a2150.c       |   20 +-
4655  drivers/staging/comedi/drivers/ni_at_ao.c          |   13 +-
4656  drivers/staging/comedi/drivers/ni_atmio.c          |   11 +-
4657  drivers/staging/comedi/drivers/ni_atmio16d.c       |   15 +-
4658  drivers/staging/comedi/drivers/ni_daq_dio24.c      |   14 +-
4659  drivers/staging/comedi/drivers/ni_labpc.c          |   54 +-
4660  drivers/staging/comedi/drivers/ni_labpc_cs.c       |    6 +-
4661  drivers/staging/comedi/drivers/ni_mio_common.c     |  150 +-
4662  drivers/staging/comedi/drivers/ni_mio_cs.c         |   29 +-
4663  drivers/staging/comedi/drivers/ni_pcidio.c         |   43 +-
4664  drivers/staging/comedi/drivers/ni_pcimio.c         |   56 +-
4665  drivers/staging/comedi/drivers/ni_tiocmd.c         |   20 +-
4666  drivers/staging/comedi/drivers/pcl711.c            |   15 +-
4667  drivers/staging/comedi/drivers/pcl726.c            |   10 +-
4668  drivers/staging/comedi/drivers/pcl812.c            |   27 +-
4669  drivers/staging/comedi/drivers/pcl816.c            |   21 +-
4670  drivers/staging/comedi/drivers/pcl818.c            |   32 +-
4671  drivers/staging/comedi/drivers/pcm3724.c           |   44 +-
4672  drivers/staging/comedi/drivers/pcmad.c             |   10 +-
4673  drivers/staging/comedi/drivers/pcmda12.c           |   34 +-
4674  drivers/staging/comedi/drivers/pcmmio.c            |  124 +-
4675  drivers/staging/comedi/drivers/pcmuio.c            |   25 +-
4676  drivers/staging/comedi/drivers/poc.c               |   15 +-
4677  drivers/staging/comedi/drivers/quatech_daqp_cs.c   |   49 +-
4678  drivers/staging/comedi/drivers/rtd520.c            |  872 +-
4679  drivers/staging/comedi/drivers/rtd520.h            |  267 +-
4680  drivers/staging/comedi/drivers/rti800.c            |   13 +-
4681  drivers/staging/comedi/drivers/rti802.c            |    9 +-
4682  drivers/staging/comedi/drivers/s526.c              |    8 +-
4683  drivers/staging/comedi/drivers/s626.c              |   45 +-
4684  drivers/staging/comedi/drivers/serial2002.c        |   44 +-
4685  drivers/staging/comedi/drivers/skel.c              |  551 +-
4686  drivers/staging/comedi/drivers/ssv_dnp.c           |   26 +-
4687  drivers/staging/comedi/drivers/unioxx5.c           |   44 +-
4688  drivers/staging/comedi/drivers/usbdux.c            |   17 +-
4689  drivers/staging/comedi/drivers/usbduxfast.c        |  171 +-
4690  drivers/staging/comedi/drivers/usbduxsigma.c       |   11 +-
4691  drivers/staging/comedi/drivers/vmk80xx.c           |   20 +-
4692  .../staging/comedi/kcomedilib/kcomedilib_main.c    |    5 +-
4693  drivers/staging/crystalhd/crystalhd_cmds.c         |    4 +-
4694  drivers/staging/csr/Makefile                       |    3 +-
4695  drivers/staging/csr/bh.c                           |   19 +-
4696  drivers/staging/csr/csr_framework_ext.c            |   97 -
4697  drivers/staging/csr/csr_framework_ext.h            |  213 -
4698  drivers/staging/csr/csr_framework_ext_types.h      |   41 +-
4699  drivers/staging/csr/csr_lib.h                      |  188 -
4700  drivers/staging/csr/csr_log.h                      |  172 +-
4701  drivers/staging/csr/csr_log_configure.h            |  105 +-
4702  drivers/staging/csr/csr_log_text.h                 |    8 -
4703  drivers/staging/csr/csr_macro.h                    |   75 -
4704  drivers/staging/csr/csr_msg_transport.h            |    8 -
4705  drivers/staging/csr/csr_msgconv.c                  |    1 -
4706  drivers/staging/csr/csr_msgconv.h                  |    9 -
4707  drivers/staging/csr/csr_panic.c                    |   20 -
4708  drivers/staging/csr/csr_panic.h                    |   53 -
4709  drivers/staging/csr/csr_prim_defs.h                |    7 -
4710  drivers/staging/csr/csr_result.h                   |    8 -
4711  drivers/staging/csr/csr_sched.h                    |  215 +-
4712  drivers/staging/csr/csr_sdio.h                     |    8 -
4713  .../staging/csr/csr_serialize_primitive_types.c    |    1 -
4714  drivers/staging/csr/csr_time.c                     |    9 +-
4715  drivers/staging/csr/csr_time.h                     |   82 +-
4716  drivers/staging/csr/csr_wifi_common.h              |    8 -
4717  drivers/staging/csr/csr_wifi_fsm.h                 |    8 -
4718  drivers/staging/csr/csr_wifi_fsm_event.h           |    8 -
4719  drivers/staging/csr/csr_wifi_fsm_types.h           |   10 -
4720  drivers/staging/csr/csr_wifi_hip_card.h            |    9 -
4721  drivers/staging/csr/csr_wifi_hip_card_sdio.c       |  162 -
4722  drivers/staging/csr/csr_wifi_hip_card_sdio.h       |    8 -
4723  drivers/staging/csr/csr_wifi_hip_chiphelper.h      |   64 -
4724  .../staging/csr/csr_wifi_hip_chiphelper_private.h  |    8 -
4725  drivers/staging/csr/csr_wifi_hip_conversions.h     |    8 -
4726  drivers/staging/csr/csr_wifi_hip_download.c        |   18 -
4727  drivers/staging/csr/csr_wifi_hip_dump.c            |   32 +-
4728  drivers/staging/csr/csr_wifi_hip_send.c            |    2 -
4729  drivers/staging/csr/csr_wifi_hip_signals.h         |   17 +-
4730  drivers/staging/csr/csr_wifi_hip_sigs.h            |    8 -
4731  drivers/staging/csr/csr_wifi_hip_ta_sampling.h     |    9 -
4732  drivers/staging/csr/csr_wifi_hip_unifi.h           |   10 +-
4733  .../staging/csr/csr_wifi_hip_unifi_signal_names.c  |   45 +-
4734  drivers/staging/csr/csr_wifi_hip_unifi_udi.h       |    9 -
4735  drivers/staging/csr/csr_wifi_hip_unifihw.h         |    8 -
4736  drivers/staging/csr/csr_wifi_hip_unifiversion.h    |    8 -
4737  drivers/staging/csr/csr_wifi_hip_xbv.c             |    2 +-
4738  drivers/staging/csr/csr_wifi_hip_xbv.h             |    8 -
4739  drivers/staging/csr/csr_wifi_hostio_prim.h         |    9 -
4740  drivers/staging/csr/csr_wifi_lib.h                 |    9 -
4741  drivers/staging/csr/csr_wifi_msgconv.h             |    9 -
4742  .../staging/csr/csr_wifi_nme_ap_converter_init.h   |    8 -
4743  drivers/staging/csr/csr_wifi_nme_ap_lib.h          |   28 -
4744  drivers/staging/csr/csr_wifi_nme_ap_prim.h         |    9 -
4745  drivers/staging/csr/csr_wifi_nme_ap_sef.h          |   10 -
4746  drivers/staging/csr/csr_wifi_nme_ap_serialize.h    |    9 -
4747  drivers/staging/csr/csr_wifi_nme_converter_init.h  |    8 -
4748  drivers/staging/csr/csr_wifi_nme_lib.h             |   63 -
4749  drivers/staging/csr/csr_wifi_nme_prim.h            |    9 -
4750  drivers/staging/csr/csr_wifi_nme_serialize.h       |    8 -
4751  drivers/staging/csr/csr_wifi_nme_task.h            |   11 -
4752  drivers/staging/csr/csr_wifi_private_common.h      |    8 -
4753  drivers/staging/csr/csr_wifi_result.h              |    8 -
4754  .../staging/csr/csr_wifi_router_converter_init.h   |    8 -
4755  .../csr/csr_wifi_router_ctrl_converter_init.h      |    8 -
4756  drivers/staging/csr/csr_wifi_router_ctrl_lib.h     |   10 -
4757  drivers/staging/csr/csr_wifi_router_ctrl_prim.h    |    9 -
4758  drivers/staging/csr/csr_wifi_router_ctrl_sef.c     |   67 +-
4759  drivers/staging/csr/csr_wifi_router_ctrl_sef.h     |    7 -
4760  .../staging/csr/csr_wifi_router_ctrl_serialize.h   |    8 -
4761  .../csr/csr_wifi_router_free_upstream_contents.c   |   46 +-
4762  drivers/staging/csr/csr_wifi_router_lib.h          |   10 -
4763  drivers/staging/csr/csr_wifi_router_prim.h         |    9 -
4764  drivers/staging/csr/csr_wifi_router_sef.h          |    8 -
4765  drivers/staging/csr/csr_wifi_router_serialize.h    |    8 -
4766  drivers/staging/csr/csr_wifi_router_task.h         |    8 -
4767  drivers/staging/csr/csr_wifi_sme_ap_lib.h          |    9 -
4768  drivers/staging/csr/csr_wifi_sme_ap_prim.h         |    8 -
4769  drivers/staging/csr/csr_wifi_sme_converter_init.h  |    8 -
4770  drivers/staging/csr/csr_wifi_sme_lib.h             |   10 -
4771  drivers/staging/csr/csr_wifi_sme_prim.h            |    9 -
4772  drivers/staging/csr/csr_wifi_sme_sef.h             |  213 +-
4773  drivers/staging/csr/csr_wifi_sme_serialize.h       |  336 +-
4774  drivers/staging/csr/csr_wifi_sme_task.h            |   16 +-
4775  drivers/staging/csr/csr_wifi_vif_utils.h           |   81 -
4776  drivers/staging/csr/data_tx.c                      |   45 +-
4777  drivers/staging/csr/drv.c                          |  101 +-
4778  drivers/staging/csr/firmware.c                     |    9 -
4779  drivers/staging/csr/inet.c                         |   10 +-
4780  drivers/staging/csr/io.c                           |  102 +-
4781  drivers/staging/csr/mlme.c                         |    3 -
4782  drivers/staging/csr/monitor.c                      |   10 -
4783  drivers/staging/csr/netdev.c                       |   90 +-
4784  drivers/staging/csr/os.c                           |   18 +-
4785  drivers/staging/csr/sdio_mmc.c                     |   28 -
4786  drivers/staging/csr/sme_blocking.c                 |  307 +-
4787  drivers/staging/csr/sme_native.c                   |   21 -
4788  drivers/staging/csr/sme_sys.c                      |   17 +-
4789  drivers/staging/csr/sme_userspace.h                |    2 +-
4790  drivers/staging/csr/sme_wext.c                     |   49 -
4791  drivers/staging/csr/ul_int.c                       |    1 -
4792  drivers/staging/csr/unifi_event.c                  |    8 -
4793  drivers/staging/csr/unifi_os.h                     |   23 -
4794  drivers/staging/csr/unifi_pdu_processing.c         |   39 +-
4795  drivers/staging/csr/unifi_priv.h                   |    7 +-
4796  drivers/staging/csr/unifi_sme.c                    |   15 -
4797  drivers/staging/csr/unifi_wext.h                   |    1 -
4798  drivers/staging/dgrp/dgrp_dpa_ops.c                |    2 +-
4799  drivers/staging/dgrp/dgrp_net_ops.c                |    5 +-
4800  drivers/staging/dgrp/dgrp_sysfs.c                  |    3 +-
4801  drivers/staging/et131x/README                      |    1 +
4802  drivers/staging/et131x/et131x.c                    |  950 +-
4803  drivers/staging/et131x/et131x.h                    |    4 -
4804  drivers/staging/gdm72xx/gdm_qos.c                  |   33 +-
4805  drivers/staging/gdm72xx/gdm_sdio.c                 |   29 +-
4806  drivers/staging/gdm72xx/gdm_usb.c                  |   10 +-
4807  drivers/staging/gdm72xx/gdm_wimax.c                |   65 +-
4808  drivers/staging/gdm72xx/netlink_k.c                |   23 +-
4809  drivers/staging/gdm72xx/sdio_boot.c                |  100 +-
4810  drivers/staging/gdm72xx/usb_boot.c                 |   49 +-
4811  drivers/staging/iio/accel/adis16201_core.c         |    4 +-
4812  drivers/staging/iio/accel/adis16201_ring.c         |    2 +-
4813  drivers/staging/iio/accel/adis16203_core.c         |    2 -
4814  drivers/staging/iio/accel/adis16203_ring.c         |    2 +-
4815  drivers/staging/iio/accel/adis16204_core.c         |    4 +-
4816  drivers/staging/iio/accel/adis16204_ring.c         |    2 +-
4817  drivers/staging/iio/accel/adis16209_core.c         |    6 +-
4818  drivers/staging/iio/accel/adis16209_ring.c         |    2 +-
4819  drivers/staging/iio/accel/adis16209_trigger.c      |   11 +-
4820  drivers/staging/iio/accel/adis16220_core.c         |    2 -
4821  drivers/staging/iio/accel/adis16240_core.c         |    2 -
4822  drivers/staging/iio/accel/adis16240_ring.c         |    2 +-
4823  drivers/staging/iio/accel/adis16240_trigger.c      |   11 +-
4824  drivers/staging/iio/accel/kxsd9.c                  |    2 +-
4825  drivers/staging/iio/accel/lis3l02dq.h              |    1 +
4826  drivers/staging/iio/accel/lis3l02dq_core.c         |   10 +-
4827  drivers/staging/iio/accel/lis3l02dq_ring.c         |    6 +-
4828  drivers/staging/iio/adc/Kconfig                    |   50 +-
4829  drivers/staging/iio/adc/Makefile                   |   10 -
4830  drivers/staging/iio/adc/ad7280a.c                  |    2 +-
4831  drivers/staging/iio/adc/ad7298_ring.c              |    2 +-
4832  drivers/staging/iio/adc/ad7606_ring.c              |    2 +-
4833  drivers/staging/iio/adc/ad7887.h                   |   99 -
4834  drivers/staging/iio/adc/ad7887_ring.c              |  122 -
4835  drivers/staging/iio/adc/ad799x_ring.c              |    2 +-
4836  drivers/staging/iio/adc/adt7310.c                  |  881 --
4837  drivers/staging/iio/adc/adt7410.c                  |  458 +-
4838  drivers/staging/iio/adc/lpc32xx_adc.c              |    2 +-
4839  drivers/staging/iio/adc/max1363.h                  |  177 -
4840  drivers/staging/iio/adc/max1363_ring.c             |  139 -
4841  drivers/staging/iio/adc/mxs-lradc.c                |    5 +-
4842  drivers/staging/iio/cdc/ad7150.c                   |   12 +-
4843  drivers/staging/iio/cdc/ad7152.c                   |    2 +-
4844  drivers/staging/iio/cdc/ad7746.c                   |    2 +-
4845  drivers/staging/iio/gyro/adis16260_core.c          |    6 +-
4846  drivers/staging/iio/gyro/adis16260_ring.c          |    2 +-
4847  drivers/staging/iio/iio_dummy_evgen.c              |    2 +-
4848  drivers/staging/iio/iio_simple_dummy_buffer.c      |    5 +-
4849  drivers/staging/iio/impedance-analyzer/ad5933.c    |    4 +-
4850  drivers/staging/iio/imu/adis16400.h                |   12 +-
4851  drivers/staging/iio/imu/adis16400_core.c           |  155 +-
4852  drivers/staging/iio/imu/adis16400_ring.c           |    5 +-
4853  drivers/staging/iio/light/isl29018.c               |   45 +
4854  drivers/staging/iio/magnetometer/hmc5843.c         |    2 +-
4855  drivers/staging/iio/meter/ade7753.h                |    2 -
4856  drivers/staging/iio/meter/ade7754.h                |    2 -
4857  drivers/staging/iio/meter/ade7758.h                |    3 -
4858  drivers/staging/iio/meter/ade7758_ring.c           |    2 +-
4859  drivers/staging/iio/meter/ade7759.h                |    2 -
4860  drivers/staging/iio/meter/ade7854.h                |    2 -
4861  drivers/staging/imx-drm/Kconfig                    |    2 +-
4862  drivers/staging/imx-drm/ipu-v3/ipu-common.c        |   28 +-
4863  drivers/staging/ipack/Kconfig                      |   15 +-
4864  drivers/staging/ipack/Makefile                     |    2 +-
4865  drivers/staging/ipack/bridges/Kconfig              |    8 -
4866  drivers/staging/ipack/carriers/Kconfig             |    7 +
4867  .../staging/ipack/{bridges => carriers}/Makefile   |    0
4868  .../staging/ipack/{bridges => carriers}/tpci200.c  |  309 +-
4869  .../staging/ipack/{bridges => carriers}/tpci200.h  |   23 +-
4870  drivers/staging/ipack/devices/Kconfig              |    1 -
4871  drivers/staging/ipack/devices/ipoctal.c            |  118 +-
4872  drivers/staging/ipack/ipack.c                      |   45 +-
4873  drivers/staging/ipack/ipack.h                      |   58 +-
4874  drivers/staging/line6/audio.c                      |    8 +-
4875  drivers/staging/line6/driver.c                     |   20 +-
4876  drivers/staging/line6/driver.h                     |    2 -
4877  drivers/staging/olpc_dcon/olpc_dcon.c              |   83 +-
4878  drivers/staging/olpc_dcon/olpc_dcon.h              |    2 +-
4879  drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c       |   30 -
4880  drivers/staging/omapdrm/Kconfig                    |    2 +-
4881  drivers/staging/omapdrm/omap_crtc.c                |    2 +-
4882  drivers/staging/omapdrm/omap_dmm_priv.h            |    9 +-
4883  drivers/staging/omapdrm/omap_dmm_tiler.c           |  106 +-
4884  drivers/staging/omapdrm/omap_dmm_tiler.h           |    8 +-
4885  drivers/staging/omapdrm/omap_drv.c                 |   37 +-
4886  drivers/staging/omapdrm/omap_drv.h                 |    2 +
4887  drivers/staging/omapdrm/omap_fb.c                  |   14 +-
4888  drivers/staging/omapdrm/omap_gem.c                 |    2 +-
4889  drivers/staging/omapdrm/omap_plane.c               |   34 +-
4890  drivers/staging/ozwpan/ozhcd.c                     |    4 +-
4891  drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    6 +-
4892  drivers/staging/rtl8192e/rtllib.h                  |    6 +-
4893  drivers/staging/rtl8192e/rtllib_tx.c               |    2 +-
4894  drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    5 +-
4895  drivers/staging/rtl8712/rtl871x_cmd.c              |    4 +-
4896  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    4 +-
4897  drivers/staging/rts5139/Makefile                   |   22 +-
4898  drivers/staging/rts5139/ms.c                       |   96 +-
4899  drivers/staging/rts5139/ms.h                       |   18 +-
4900  drivers/staging/rts5139/ms_mg.c                    |  104 +-
4901  drivers/staging/rts5139/ms_mg.h                    |   14 +-
4902  drivers/staging/rts5139/rts51x.c                   |   10 +-
4903  drivers/staging/rts5139/rts51x_card.c              |   80 +-
4904  drivers/staging/rts5139/rts51x_card.h              |   30 +-
4905  drivers/staging/rts5139/rts51x_chip.c              |   24 +-
4906  drivers/staging/rts5139/rts51x_chip.h              |   16 +-
4907  drivers/staging/rts5139/rts51x_fop.c               |    6 +-
4908  drivers/staging/rts5139/rts51x_scsi.c              |  238 +-
4909  drivers/staging/rts5139/rts51x_scsi.h              |    6 +-
4910  drivers/staging/rts5139/sd.c                       |   36 +-
4911  drivers/staging/rts5139/sd.h                       |   12 +-
4912  drivers/staging/rts5139/sd_cprm.c                  |  124 +-
4913  drivers/staging/rts5139/sd_cprm.h                  |   18 +-
4914  drivers/staging/rts5139/xd.c                       |   58 +-
4915  drivers/staging/rts5139/xd.h                       |   10 +-
4916  drivers/staging/rts_pstor/Kconfig                  |   16 -
4917  drivers/staging/rts_pstor/Makefile                 |   16 -
4918  drivers/staging/rts_pstor/TODO                     |    9 -
4919  drivers/staging/rts_pstor/debug.h                  |   43 -
4920  drivers/staging/rts_pstor/general.c                |   35 -
4921  drivers/staging/rts_pstor/general.h                |   31 -
4922  drivers/staging/rts_pstor/ms.c                     | 4051 --------
4923  drivers/staging/rts_pstor/ms.h                     |  225 -
4924  drivers/staging/rts_pstor/rtsx.c                   | 1105 --
4925  drivers/staging/rts_pstor/rtsx.h                   |  186 -
4926  drivers/staging/rts_pstor/rtsx_card.c              | 1233 ---
4927  drivers/staging/rts_pstor/rtsx_card.h              | 1093 --
4928  drivers/staging/rts_pstor/rtsx_chip.c              | 2264 -----
4929  drivers/staging/rts_pstor/rtsx_chip.h              |  989 --
4930  drivers/staging/rts_pstor/rtsx_scsi.c              | 3137 ------
4931  drivers/staging/rts_pstor/rtsx_scsi.h              |  142 -
4932  drivers/staging/rts_pstor/rtsx_sys.h               |   50 -
4933  drivers/staging/rts_pstor/rtsx_transport.c         |  769 --
4934  drivers/staging/rts_pstor/rtsx_transport.h         |   66 -
4935  drivers/staging/rts_pstor/sd.c                     | 4570 ---------
4936  drivers/staging/rts_pstor/sd.h                     |  300 -
4937  drivers/staging/rts_pstor/spi.c                    |  812 --
4938  drivers/staging/rts_pstor/spi.h                    |   65 -
4939  drivers/staging/rts_pstor/trace.h                  |   93 -
4940  drivers/staging/rts_pstor/xd.c                     | 2052 ----
4941  drivers/staging/rts_pstor/xd.h                     |  188 -
4942  drivers/staging/sbe-2t3e3/cpld.c                   |    2 +-
4943  drivers/staging/sbe-2t3e3/main.c                   |    7 +-
4944  drivers/staging/sbe-2t3e3/module.c                 |   11 +-
4945  drivers/staging/sbe-2t3e3/netdev.c                 |    5 +-
4946  drivers/staging/sep/sep_main.c                     |    4 +-
4947  drivers/staging/silicom/bp_mod.c                   |  219 +-
4948  drivers/staging/silicom/bp_proc.c                  |   85 +-
4949  drivers/staging/silicom/bypasslib/bplibk.h         |    9 -
4950  drivers/staging/silicom/bypasslib/bypass.c         |    1 -
4951  drivers/staging/slicoss/slicoss.c                  |  160 +-
4952  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |   24 +-
4953  drivers/staging/telephony/Kconfig                  |   47 -
4954  drivers/staging/telephony/Makefile                 |    7 -
4955  drivers/staging/telephony/TODO                     |   10 -
4956  drivers/staging/telephony/ixj-ver.h                |    4 -
4957  drivers/staging/telephony/ixj.c                    |10571 --------------------
4958  drivers/staging/telephony/ixj.h                    | 1322 ---
4959  drivers/staging/telephony/ixj_pcmcia.c             |  187 -
4960  drivers/staging/telephony/phonedev.c               |  166 -
4961  drivers/staging/usbip/stub_dev.c                   |   13 +-
4962  drivers/staging/usbip/stub_rx.c                    |    5 +-
4963  drivers/staging/usbip/stub_tx.c                    |    3 +-
4964  drivers/staging/usbip/usbip_common.c               |   40 +-
4965  drivers/staging/usbip/usbip_common.h               |    4 +-
4966  drivers/staging/usbip/vhci.h                       |    1 -
4967  drivers/staging/usbip/vhci_hcd.c                   |   49 +-
4968  drivers/staging/usbip/vhci_rx.c                    |    2 +-
4969  drivers/staging/usbip/vhci_sysfs.c                 |    6 +-
4970  drivers/staging/usbip/vhci_tx.c                    |    2 +-
4971  drivers/staging/vt6655/hostap.c                    |    6 +-
4972  drivers/staging/vt6655/rxtx.c                      |    2 +-
4973  drivers/staging/vt6655/wcmd.c                      |    1 +
4974  drivers/staging/vt6656/device.h                    |    1 -
4975  drivers/staging/vt6656/firmware.c                  |   22 +-
4976  drivers/staging/vt6656/hostap.c                    |    6 +-
4977  drivers/staging/vt6656/main_usb.c                  |    1 -
4978  drivers/staging/vt6656/rf.c                        |    3 +
4979  drivers/staging/vt6656/rxtx.c                      |    2 +-
4980  drivers/staging/vt6656/usbpipe.c                   |    1 +
4981  drivers/staging/winbond/mds.c                      |    2 +-
4982  drivers/staging/winbond/wbhal.h                    |    4 +-
4983  drivers/staging/wlags49_h2/man/wlags49.4           |    2 +-
4984  drivers/staging/wlan-ng/hfa384x_usb.c              |    6 +-
4985  drivers/staging/xgifb/TODO                         |    2 +-
4986  drivers/staging/xgifb/vb_setmode.c                 |    4 +-
4987  drivers/staging/zram/zram_drv.c                    |  113 +-
4988  drivers/staging/zram/zram_drv.h                    |    4 +-
4989  drivers/staging/zram/zram_sysfs.c                  |    8 +-
4990  drivers/vme/boards/vme_vmivme7805.c                |   15 +-
4991  drivers/vme/bridges/vme_ca91cx42.c                 |   15 +-
4992  drivers/vme/bridges/vme_tsi148.c                   |   15 +-
4993  include/linux/iio/buffer.h                         |   24 +-
4994  include/linux/iio/consumer.h                       |   48 +
4995  include/linux/iio/iio.h                            |    2 +
4996  include/linux/iio/machine.h                        |    2 +
4997  include/linux/iio/types.h                          |    1 +
4998  include/linux/platform_data/ad5449.h               |   40 +
4999  include/linux/platform_data/ad7887.h               |   26 +
5000  include/linux/platform_data/omap_drm.h             |    1 +
5001  536 files changed, 18672 insertions(+), 61070 deletions(-)
5002  delete mode 100644 Documentation/telephony/00-INDEX
5003  delete mode 100644 Documentation/telephony/ixj.txt
5004  rename drivers/{staging/iio/adc/ad7887_core.c => iio/adc/ad7887.c} (50%)
5005  rename drivers/{staging/iio/adc/max1363_core.c => iio/adc/max1363.c} (81%)
5006  create mode 100644 drivers/iio/buffer_cb.c
5007  create mode 100644 drivers/iio/dac/ad5449.c
5008  create mode 100644 drivers/staging/android/binder_trace.h
5009  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.h
5010  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.h
5011  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.h
5012  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
5013  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.h
5014  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Pwm.h
5015  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ssi.h
5016  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Tor.h
5017  delete mode 100644 drivers/staging/comedi/drivers/addi-data/APCI1710_Ttl.h
5018  delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
5019  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_APCI1710.h
5020  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h
5021  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.c
5022  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1032.h
5023  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
5024  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1516.h
5025  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.h
5026  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci16xx.h
5027  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2016.h
5028  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2032.h
5029  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci2200.h
5030  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.h
5031  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.h
5032  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h
5033  delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3xxx.h
5034  delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3001.c
5035  delete mode 100644 drivers/staging/comedi/drivers/mpc8260cpm.c
5036  delete mode 100644 drivers/staging/csr/csr_lib.h
5037  delete mode 100644 drivers/staging/csr/csr_panic.c
5038  delete mode 100644 drivers/staging/csr/csr_panic.h
5039  delete mode 100644 drivers/staging/iio/adc/ad7887.h
5040  delete mode 100644 drivers/staging/iio/adc/ad7887_ring.c
5041  delete mode 100644 drivers/staging/iio/adc/adt7310.c
5042  delete mode 100644 drivers/staging/iio/adc/max1363.h
5043  delete mode 100644 drivers/staging/iio/adc/max1363_ring.c
5044  delete mode 100644 drivers/staging/ipack/bridges/Kconfig
5045  create mode 100644 drivers/staging/ipack/carriers/Kconfig
5046  rename drivers/staging/ipack/{bridges => carriers}/Makefile (100%)
5047  rename drivers/staging/ipack/{bridges => carriers}/tpci200.c (68%)
5048  rename drivers/staging/ipack/{bridges => carriers}/tpci200.h (89%)
5049  delete mode 100644 drivers/staging/rts_pstor/Kconfig
5050  delete mode 100644 drivers/staging/rts_pstor/Makefile
5051  delete mode 100644 drivers/staging/rts_pstor/TODO
5052  delete mode 100644 drivers/staging/rts_pstor/debug.h
5053  delete mode 100644 drivers/staging/rts_pstor/general.c
5054  delete mode 100644 drivers/staging/rts_pstor/general.h
5055  delete mode 100644 drivers/staging/rts_pstor/ms.c
5056  delete mode 100644 drivers/staging/rts_pstor/ms.h
5057  delete mode 100644 drivers/staging/rts_pstor/rtsx.c
5058  delete mode 100644 drivers/staging/rts_pstor/rtsx.h
5059  delete mode 100644 drivers/staging/rts_pstor/rtsx_card.c
5060  delete mode 100644 drivers/staging/rts_pstor/rtsx_card.h
5061  delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.c
5062  delete mode 100644 drivers/staging/rts_pstor/rtsx_chip.h
5063  delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.c
5064  delete mode 100644 drivers/staging/rts_pstor/rtsx_scsi.h
5065  delete mode 100644 drivers/staging/rts_pstor/rtsx_sys.h
5066  delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.c
5067  delete mode 100644 drivers/staging/rts_pstor/rtsx_transport.h
5068  delete mode 100644 drivers/staging/rts_pstor/sd.c
5069  delete mode 100644 drivers/staging/rts_pstor/sd.h
5070  delete mode 100644 drivers/staging/rts_pstor/spi.c
5071  delete mode 100644 drivers/staging/rts_pstor/spi.h
5072  delete mode 100644 drivers/staging/rts_pstor/trace.h
5073  delete mode 100644 drivers/staging/rts_pstor/xd.c
5074  delete mode 100644 drivers/staging/rts_pstor/xd.h
5075  delete mode 100644 drivers/staging/telephony/Kconfig
5076  delete mode 100644 drivers/staging/telephony/Makefile
5077  delete mode 100644 drivers/staging/telephony/TODO
5078  delete mode 100644 drivers/staging/telephony/ixj-ver.h
5079  delete mode 100644 drivers/staging/telephony/ixj.c
5080  delete mode 100644 drivers/staging/telephony/ixj.h
5081  delete mode 100644 drivers/staging/telephony/ixj_pcmcia.c
5082  delete mode 100644 drivers/staging/telephony/phonedev.c
5083  create mode 100644 include/linux/platform_data/ad5449.h
5084  create mode 100644 include/linux/platform_data/ad7887.h
5085 Merging char-misc/char-misc-next (ab5c4a5 mei: move amthif specific code from mei_write to mei_amthif_write)
5086 $ git merge char-misc/char-misc-next
5087 Auto-merging arch/arm/include/asm/io.h
5088 Merge made by the 'recursive' strategy.
5089  Documentation/DocBook/uio-howto.tmpl          |   56 +++
5090  arch/arm/include/asm/io.h                     |    2 +-
5091  arch/arm/mm/mmap.c                            |    2 +-
5092  arch/ia64/include/asm/io.h                    |    2 +-
5093  arch/ia64/kernel/efi.c                        |    2 +-
5094  arch/sh/include/asm/io.h                      |    2 +-
5095  arch/sh/mm/mmap.c                             |    2 +-
5096  drivers/char/mem.c                            |   10 +-
5097  drivers/char/pc8736x_gpio.c                   |    3 +-
5098  drivers/hv/channel.c                          |    8 -
5099  drivers/hv/channel_mgmt.c                     |    8 -
5100  drivers/misc/mei/Makefile                     |    1 +
5101  drivers/misc/mei/amthif.c                     |  605 +++++++++++++++++++++++++
5102  drivers/misc/mei/hw.h                         |   14 +-
5103  drivers/misc/mei/init.c                       |  128 +-----
5104  drivers/misc/mei/interrupt.c                  |  389 ++++------------
5105  drivers/misc/mei/iorw.c                       |  435 +++++-------------
5106  drivers/misc/mei/main.c                       |  283 +++++-------
5107  drivers/misc/mei/mei_dev.h                    |   78 +++-
5108  drivers/misc/mei/wd.c                         |    7 +-
5109  drivers/misc/ti-st/st_core.c                  |    1 -
5110  drivers/uio/Kconfig                           |   16 +
5111  drivers/uio/Makefile                          |    1 +
5112  drivers/uio/uio_dmem_genirq.c                 |  354 +++++++++++++++
5113  drivers/w1/masters/Kconfig                    |    2 +-
5114  drivers/w1/masters/ds2482.c                   |   13 +-
5115  include/linux/platform_data/uio_dmem_genirq.h |   26 ++
5116  tools/hv/hv_kvp_daemon.c                      |   22 +-
5117  28 files changed, 1480 insertions(+), 992 deletions(-)
5118  create mode 100644 drivers/misc/mei/amthif.c
5119  create mode 100644 drivers/uio/uio_dmem_genirq.c
5120  create mode 100644 include/linux/platform_data/uio_dmem_genirq.h
5121 Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
5122 $ git merge tmem/linux-next
5123 Already up-to-date.
5124 Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
5125 $ git merge writeback/writeback-for-next
5126 Already up-to-date.
5127 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
5128 $ git merge arm-dt/devicetree/arm-next
5129 Already up-to-date.
5130 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
5131 $ git merge hwspinlock/linux-next
5132 Already up-to-date.
5133 Merging pinctrl/for-next (e38d457 pinctrl: pinmux: Release all taken pins in pinmux_enable_setting error paths)
5134 $ git merge pinctrl/for-next
5135 Resolved 'arch/arm/boot/dts/spear1340.dtsi' using previous resolution.
5136 Auto-merging include/linux/platform_data/pinctrl-nomadik.h
5137 Auto-merging drivers/pinctrl/mvebu/pinctrl-mvebu.c
5138 Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
5139 Auto-merging arch/arm/mach-u300/core.c
5140 Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
5141 Auto-merging arch/arm/mach-at91/at91sam9x5.c
5142 Auto-merging arch/arm/mach-at91/at91sam9rl.c
5143 Auto-merging arch/arm/mach-at91/at91sam9g45.c
5144 Auto-merging arch/arm/mach-at91/at91sam9263.c
5145 Auto-merging arch/arm/mach-at91/at91sam9261.c
5146 Auto-merging arch/arm/mach-at91/at91sam9260.c
5147 Auto-merging arch/arm/mach-at91/at91rm9200.c
5148 Auto-merging arch/arm/boot/dts/spear320.dtsi
5149 Auto-merging arch/arm/boot/dts/spear310.dtsi
5150 Auto-merging arch/arm/boot/dts/spear1340.dtsi
5151 CONFLICT (content): Merge conflict in arch/arm/boot/dts/spear1340.dtsi
5152 Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
5153 Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
5154 Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
5155 Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
5156 Auto-merging arch/arm/boot/dts/Makefile
5157 Auto-merging arch/arm/Kconfig
5158 Auto-merging MAINTAINERS
5159 Automatic merge failed; fix conflicts and then commit the result.
5160 $ git commit -v -a
5161 [master 4814fef] Merge remote-tracking branch 'pinctrl/for-next'
5162 $ git diff -M --stat --summary HEAD^..
5163  Documentation/devicetree/bindings/gpio/gpio.txt    |   36 +
5164  .../devicetree/bindings/gpio/gpio_atmel.txt        |    5 +
5165  .../bindings/pinctrl/atmel,at91-pinctrl.txt        |  136 ++
5166  Documentation/gpio.txt                             |   42 +
5167  Documentation/pinctrl.txt                          |    7 +-
5168  MAINTAINERS                                        |    6 +
5169  arch/arm/Kconfig                                   |    2 +
5170  arch/arm/boot/dts/Makefile                         |   44 +-
5171  arch/arm/boot/dts/at91sam9260.dtsi                 |  187 ++-
5172  arch/arm/boot/dts/at91sam9263.dtsi                 |  173 ++-
5173  arch/arm/boot/dts/at91sam9263ek.dts                |    1 +
5174  arch/arm/boot/dts/at91sam9g15.dtsi                 |   28 +
5175  arch/arm/boot/dts/at91sam9g15ek.dts                |   16 +
5176  arch/arm/boot/dts/at91sam9g20ek_common.dtsi        |    6 +
5177  arch/arm/boot/dts/at91sam9g25.dtsi                 |   28 +
5178  arch/arm/boot/dts/at91sam9g25ek.dts                |   49 +-
5179  arch/arm/boot/dts/at91sam9g35.dtsi                 |   28 +
5180  arch/arm/boot/dts/at91sam9g35ek.dts                |   16 +
5181  arch/arm/boot/dts/at91sam9g45.dtsi                 |  189 ++-
5182  arch/arm/boot/dts/at91sam9m10g45ek.dts             |    1 +
5183  arch/arm/boot/dts/at91sam9n12.dtsi                 |  180 ++-
5184  arch/arm/boot/dts/at91sam9x25.dtsi                 |   28 +
5185  arch/arm/boot/dts/at91sam9x25ek.dts                |   16 +
5186  arch/arm/boot/dts/at91sam9x35.dtsi                 |   28 +
5187  arch/arm/boot/dts/at91sam9x35ek.dts                |   16 +
5188  arch/arm/boot/dts/at91sam9x5.dtsi                  |  178 ++-
5189  arch/arm/boot/dts/at91sam9x5ek.dtsi                |   59 +
5190  arch/arm/boot/dts/spear1310-evb.dts                |    4 +
5191  arch/arm/boot/dts/spear1310.dtsi                   |   27 +
5192  arch/arm/boot/dts/spear1340-evb.dts                |    4 +
5193  arch/arm/boot/dts/spear1340.dtsi                   |   26 +
5194  arch/arm/boot/dts/spear310.dtsi                    |   22 +-
5195  arch/arm/boot/dts/spear320-evb.dts                 |    4 +
5196  arch/arm/boot/dts/spear320.dtsi                    |   23 +-
5197  arch/arm/configs/at91_dt_defconfig                 |    1 +
5198  arch/arm/mach-at91/at91rm9200.c                    |    4 +-
5199  arch/arm/mach-at91/at91sam9260.c                   |    7 +-
5200  arch/arm/mach-at91/at91sam9261.c                   |    4 +-
5201  arch/arm/mach-at91/at91sam9263.c                   |    9 +-
5202  arch/arm/mach-at91/at91sam9g45.c                   |   10 +-
5203  arch/arm/mach-at91/at91sam9n12.c                   |   15 +-
5204  arch/arm/mach-at91/at91sam9rl.c                    |    4 +-
5205  arch/arm/mach-at91/at91sam9x5.c                    |   19 +-
5206  arch/arm/mach-at91/board-dt.c                      |    2 -
5207  arch/arm/mach-at91/gpio.c                          |  190 +--
5208  arch/arm/mach-at91/setup.c                         |    6 +-
5209  arch/arm/mach-at91/soc.h                           |   12 +-
5210  arch/arm/mach-nomadik/board-nhk8815.c              |    3 +-
5211  arch/arm/mach-nomadik/cpu-8815.c                   |    2 +-
5212  arch/arm/mach-nomadik/i2c-8815nhk.c                |    3 +-
5213  arch/arm/mach-u300/core.c                          |    3 +-
5214  arch/arm/mach-u300/include/mach/irqs.h             |  126 +-
5215  arch/arm/mach-ux500/board-mop500-audio.c           |    3 +-
5216  arch/arm/mach-ux500/board-mop500-pins.c            |    3 +-
5217  arch/arm/mach-ux500/board-mop500.c                 |    2 +-
5218  arch/arm/mach-ux500/cpu-db8500.c                   |    6 +-
5219  arch/arm/mach-ux500/devices-common.c               |    3 +-
5220  arch/arm/mach-ux500/devices-common.h               |    8 +-
5221  arch/arm/plat-nomadik/include/plat/gpio-nomadik.h  |  102 --
5222  drivers/gpio/gpiolib-of.c                          |   40 +
5223  drivers/gpio/gpiolib.c                             |   46 +
5224  drivers/mtd/nand/atmel_nand.c                      |    9 +
5225  drivers/pinctrl/Kconfig                            |   35 +-
5226  drivers/pinctrl/Makefile                           |    7 +-
5227  drivers/pinctrl/core.c                             |   29 +
5228  drivers/pinctrl/core.h                             |    2 +
5229  drivers/pinctrl/devicetree.c                       |   11 +
5230  drivers/pinctrl/mvebu/Kconfig                      |   24 +
5231  drivers/pinctrl/mvebu/Makefile                     |    5 +
5232  drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c   |    0
5233  drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c    |    0
5234  drivers/pinctrl/{ => mvebu}/pinctrl-dove.c         |    0
5235  drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c     |    0
5236  drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c        |    1 -
5237  drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h        |    0
5238  drivers/pinctrl/pinctrl-at91.c                     | 1510 ++++++++++++++++++++
5239  drivers/pinctrl/pinctrl-bcm2835.c                  |    2 +-
5240  drivers/pinctrl/pinctrl-coh901.c                   |  122 +-
5241  drivers/pinctrl/pinctrl-exynos.c                   |    1 +
5242  drivers/pinctrl/pinctrl-falcon.c                   |    2 +-
5243  drivers/pinctrl/pinctrl-imx.c                      |    2 +-
5244  drivers/pinctrl/pinctrl-lantiq.c                   |   23 +-
5245  drivers/pinctrl/pinctrl-mxs.c                      |    2 +-
5246  drivers/pinctrl/pinctrl-nomadik-db8500.c           |  104 +-
5247  drivers/pinctrl/pinctrl-nomadik-db8540.c           |    1 +
5248  drivers/pinctrl/pinctrl-nomadik.c                  |  115 +-
5249  drivers/pinctrl/pinctrl-nomadik.h                  |    2 +-
5250  drivers/pinctrl/pinctrl-sirf.c                     |   52 +-
5251  drivers/pinctrl/pinctrl-tegra.c                    |    2 +-
5252  drivers/pinctrl/pinctrl-u300.c                     |   42 +-
5253  drivers/pinctrl/pinctrl-xway.c                     |    2 +-
5254  drivers/pinctrl/pinmux.c                           |   85 +-
5255  drivers/pinctrl/spear/Kconfig                      |   11 +
5256  drivers/pinctrl/spear/Makefile                     |    1 +
5257  drivers/pinctrl/spear/pinctrl-plgpio.c             |  746 ++++++++++
5258  drivers/pinctrl/spear/pinctrl-spear.c              |  119 +-
5259  drivers/pinctrl/spear/pinctrl-spear.h              |   60 +
5260  drivers/pinctrl/spear/pinctrl-spear1310.c          |  264 ++++
5261  drivers/pinctrl/spear/pinctrl-spear1340.c          |   27 +
5262  drivers/pinctrl/spear/pinctrl-spear300.c           |    2 +
5263  drivers/pinctrl/spear/pinctrl-spear310.c           |    2 +
5264  drivers/pinctrl/spear/pinctrl-spear320.c           |    2 +
5265  drivers/pinctrl/spear/pinctrl-spear3xx.c           |   37 +
5266  drivers/tty/serial/atmel_serial.c                  |    8 +
5267  include/asm-generic/gpio.h                         |   45 +
5268  include/linux/gpio.h                               |   20 +-
5269  include/linux/pinctrl/pinctrl.h                    |   16 +
5270  include/linux/platform_data/pinctrl-coh901.h       |    2 -
5271  .../linux/platform_data/pinctrl-nomadik.h          |  111 +-
5272  109 files changed, 4997 insertions(+), 916 deletions(-)
5273  create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
5274  create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
5275  create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
5276  create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
5277  create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
5278  create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
5279  create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
5280  create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
5281  create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
5282  create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
5283  create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
5284  delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
5285  create mode 100644 drivers/pinctrl/mvebu/Kconfig
5286  create mode 100644 drivers/pinctrl/mvebu/Makefile
5287  rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c (100%)
5288  rename drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c (100%)
5289  rename drivers/pinctrl/{ => mvebu}/pinctrl-dove.c (100%)
5290  rename drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c (100%)
5291  rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c (99%)
5292  rename drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h (100%)
5293  create mode 100644 drivers/pinctrl/pinctrl-at91.c
5294  create mode 100644 drivers/pinctrl/spear/pinctrl-plgpio.c
5295  rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (66%)
5296 Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
5297 $ git merge vhost/linux-next
5298 Resolved 'drivers/net/tun.c' using previous resolution.
5299 Auto-merging drivers/net/tun.c
5300 CONFLICT (content): Merge conflict in drivers/net/tun.c
5301 Automatic merge failed; fix conflicts and then commit the result.
5302 $ git commit -v -a
5303 [master dacba91] Merge remote-tracking branch 'vhost/linux-next'
5304 $ git diff -M --stat --summary HEAD^..
5305 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
5306 $ git merge memblock/memblock-kill-early_node_map
5307 Already up-to-date.
5308 Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
5309 $ git merge remoteproc/for-next
5310 Already up-to-date.
5311 Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
5312 $ git merge irqdomain/irqdomain/next
5313 Already up-to-date.
5314 Merging gpio/gpio/next (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
5315 $ git merge gpio/gpio/next
5316 Already up-to-date.
5317 Merging gpio-lw/for-next (4b0ce207 Merge branch 'devel' into for-next)
5318 $ git merge gpio-lw/for-next
5319 Auto-merging include/asm-generic/gpio.h
5320 Auto-merging drivers/gpio/gpiolib.c
5321 Auto-merging drivers/gpio/Kconfig
5322 Auto-merging arch/arm/Kconfig
5323 Merge made by the 'recursive' strategy.
5324  arch/arm/Kconfig             |    1 +
5325  drivers/gpio/Kconfig         |   17 +++-
5326  drivers/gpio/Makefile        |    2 +
5327  drivers/gpio/gpio-clps711x.c |  199 ++++++++++++++++++++++++++++++++++++++++
5328  drivers/gpio/gpio-da9055.c   |  204 ++++++++++++++++++++++++++++++++++++++++++
5329  drivers/gpio/gpio-em.c       |   48 ++--------
5330  drivers/gpio/gpio-mcp23s08.c |    6 +-
5331  drivers/gpio/gpio-mvebu.c    |   32 ++++++-
5332  drivers/gpio/gpio-omap.c     |    2 +-
5333  drivers/gpio/gpio-pch.c      |    1 +
5334  drivers/gpio/gpio-pl061.c    |   59 +++++-------
5335  drivers/gpio/gpio-tc3589x.c  |   20 ++---
5336  drivers/gpio/gpio-tegra.c    |   38 ++++----
5337  drivers/gpio/gpio-vt8500.c   |    2 +
5338  drivers/gpio/gpiolib.c       |  124 ++++++++++++++++---------
5339  include/asm-generic/gpio.h   |    5 +-
5340  16 files changed, 604 insertions(+), 156 deletions(-)
5341  create mode 100644 drivers/gpio/gpio-clps711x.c
5342  create mode 100644 drivers/gpio/gpio-da9055.c
5343 Merging arm-soc/for-next (a89eeef Merge branch 'next/multiplatform' into for-next)
5344 $ git merge arm-soc/for-next
5345 Auto-merging include/video/omapvrfb.h
5346 Auto-merging include/linux/platform_data/omap_ocp2scp.h
5347 Auto-merging include/linux/platform_data/mmc-omap.h
5348 Auto-merging include/linux/platform_data/leds-omap.h
5349 Auto-merging include/linux/platform_data/clocksource-nomadik-mtu.h
5350 Auto-merging include/linux/mfd/menelaus.h
5351 Auto-merging include/linux/dma/ipu-dma.h
5352 Auto-merging drivers/usb/musb/musb_dsps.c
5353 Auto-merging drivers/usb/musb/am35x.c
5354 Auto-merging drivers/usb/host/ohci-omap.c
5355 Auto-merging drivers/usb/host/ohci-at91.c
5356 Auto-merging drivers/usb/host/ehci-omap.c
5357 Auto-merging drivers/usb/host/ehci-mxc.c
5358 Auto-merging drivers/tty/serial/atmel_serial.c
5359 CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
5360 Auto-merging drivers/pinctrl/pinctrl-nomadik.c
5361 CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
5362 Auto-merging drivers/net/ethernet/cadence/at91_ether.c
5363 CONFLICT (content): Merge conflict in drivers/net/ethernet/cadence/at91_ether.c
5364 Auto-merging drivers/mtd/nand/Kconfig
5365 Auto-merging drivers/mmc/host/omap_hsmmc.c
5366 Auto-merging drivers/mmc/host/mxcmmc.c
5367 Auto-merging drivers/mfd/db8500-prcmu.c
5368 Auto-merging drivers/mfd/ab8500-core.c
5369 Auto-merging drivers/mfd/Makefile
5370 Auto-merging drivers/mfd/Kconfig
5371 Auto-merging drivers/irqchip/irq-versatile-fpga.c
5372 Auto-merging drivers/input/keyboard/Kconfig
5373 Auto-merging drivers/hwmon/Makefile
5374 Auto-merging drivers/hwmon/Kconfig
5375 Auto-merging drivers/clocksource/nomadik-mtu.c
5376 Removing arch/arm/plat-omap/sram.h
5377 Removing arch/arm/plat-omap/include/plat/usb.h
5378 Removing arch/arm/plat-omap/include/plat/uncompress.h
5379 Removing arch/arm/plat-omap/include/plat/sdrc.h
5380 Removing arch/arm/plat-omap/include/plat/omap-secure.h
5381 Removing arch/arm/plat-omap/include/plat/multi.h
5382 Removing arch/arm/plat-omap/include/plat/fpga.h
5383 Removing arch/arm/plat-omap/include/plat/dma-44xx.h
5384 Auto-merging arch/arm/plat-omap/include/plat/debug-devices.h
5385 Removing arch/arm/plat-omap/include/plat/common.h
5386 Removing arch/arm/plat-omap/include/plat/clock.h
5387 Removing arch/arm/plat-omap/include/plat/clkdev_omap.h
5388 Auto-merging arch/arm/plat-omap/include/plat-omap/dma-omap.h
5389 Removing arch/arm/plat-omap/common.c
5390 Removing arch/arm/plat-omap/clock.c
5391 Removing arch/arm/plat-nomadik/Makefile
5392 Removing arch/arm/plat-nomadik/Kconfig
5393 Removing arch/arm/plat-mxc/include/mach/uncompress.h
5394 Removing arch/arm/plat-mxc/include/mach/irqs.h
5395 Removing arch/arm/plat-mxc/Makefile
5396 Removing arch/arm/plat-mxc/Kconfig
5397 Removing arch/arm/mach-vt8500/include/mach/restart.h
5398 Removing arch/arm/mach-vt8500/include/mach/i8042.h
5399 Removing arch/arm/mach-vt8500/include/mach/hardware.h
5400 Removing arch/arm/mach-vt8500/include/mach/entry-macro.S
5401 Auto-merging arch/arm/mach-ux500/devices-common.c
5402 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
5403 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
5404 Auto-merging arch/arm/mach-ux500/board-mop500.c
5405 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
5406 Auto-merging arch/arm/mach-ux500/board-mop500-pins.c
5407 Auto-merging arch/arm/mach-ux500/board-mop500-audio.c
5408 CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500-audio.c
5409 Auto-merging arch/arm/mach-u300/core.c
5410 Auto-merging arch/arm/mach-socfpga/core.h
5411 Removing arch/arm/mach-shmobile/setup-sh7377.c
5412 Removing arch/arm/mach-shmobile/setup-sh7367.c
5413 Removing arch/arm/mach-shmobile/pfc-sh7377.c
5414 Removing arch/arm/mach-shmobile/pfc-sh7367.c
5415 Removing arch/arm/mach-shmobile/intc-sh7377.c
5416 Removing arch/arm/mach-shmobile/intc-sh7367.c
5417 Removing arch/arm/mach-shmobile/include/mach/sh7377.h
5418 Removing arch/arm/mach-shmobile/include/mach/sh7367.h
5419 Removing arch/arm/mach-shmobile/clock-sh7377.c
5420 Removing arch/arm/mach-shmobile/clock-sh7367.c
5421 Removing arch/arm/mach-shmobile/board-g4evm.c
5422 Removing arch/arm/mach-shmobile/board-g3evm.c
5423 Removing arch/arm/mach-omap2/powerdomain44xx.c
5424 Removing arch/arm/mach-omap2/powerdomain33xx.c
5425 Removing arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
5426 Auto-merging arch/arm/mach-omap2/pmu.c
5427 Auto-merging arch/arm/mach-omap2/omap_hwmod.h
5428 Auto-merging arch/arm/mach-omap2/omap_device.h
5429 Auto-merging arch/arm/mach-omap2/omap_device.c
5430 Auto-merging arch/arm/mach-omap2/omap-pm-noop.c
5431 Auto-merging arch/arm/mach-omap2/include/mach/serial.h
5432 Removing arch/arm/mach-omap2/include/mach/gpio.h
5433 Auto-merging arch/arm/mach-omap2/gpmc.h
5434 Auto-merging arch/arm/mach-omap2/drm.c
5435 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/drm.c
5436 Auto-merging arch/arm/mach-omap2/cm3xxx.c
5437 Removing arch/arm/mach-omap2/clockdomain44xx.c
5438 Removing arch/arm/mach-omap2/clockdomain33xx.c
5439 Removing arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
5440 Removing arch/arm/mach-omap1/include/mach/gpio.h
5441 Auto-merging arch/arm/mach-nomadik/board-nhk8815.c
5442 CONFLICT (content): Merge conflict in arch/arm/mach-nomadik/board-nhk8815.c
5443 Auto-merging arch/arm/mach-imx/ulpi.c
5444 Auto-merging arch/arm/mach-imx/tzic.c
5445 Auto-merging arch/arm/mach-imx/time.c
5446 Auto-merging arch/arm/mach-imx/system.c
5447 Auto-merging arch/arm/mach-imx/mach-imx6q.c
5448 Auto-merging arch/arm/mach-imx/irq-common.h
5449 Auto-merging arch/arm/mach-imx/iram_alloc.c
5450 Auto-merging arch/arm/mach-imx/iomux-v3.c
5451 Auto-merging arch/arm/mach-imx/iomux-v1.c
5452 Auto-merging arch/arm/mach-imx/iomux-mx51.h
5453 Auto-merging arch/arm/mach-imx/iomux-mx50.h
5454 Auto-merging arch/arm/mach-imx/iomux-mx35.h
5455 Auto-merging arch/arm/mach-imx/iomux-mx27.h
5456 Auto-merging arch/arm/mach-imx/iomux-mx25.h
5457 Auto-merging arch/arm/mach-imx/iomux-mx21.h
5458 Auto-merging arch/arm/mach-imx/iomux-mx1.h
5459 Removing arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
5460 Auto-merging arch/arm/mach-imx/hardware.h
5461 Auto-merging arch/arm/mach-imx/epit.c
5462 Auto-merging arch/arm/mach-imx/devices/platform-spi_imx.c
5463 Auto-merging arch/arm/mach-imx/devices/platform-sdhci-esdhc-imx.c
5464 Auto-merging arch/arm/mach-imx/devices/platform-pata_imx.c
5465 Auto-merging arch/arm/mach-imx/devices/platform-mxc_w1.c
5466 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rtc.c
5467 Auto-merging arch/arm/mach-imx/devices/platform-mxc_rnga.c
5468 Auto-merging arch/arm/mach-imx/devices/platform-mxc_pwm.c
5469 Auto-merging arch/arm/mach-imx/devices/platform-mxc_nand.c
5470 Auto-merging arch/arm/mach-imx/devices/platform-mxc-mmc.c
5471 Auto-merging arch/arm/mach-imx/devices/platform-mxc-ehci.c
5472 Auto-merging arch/arm/mach-imx/devices/platform-mx2-camera.c
5473 Auto-merging arch/arm/mach-imx/devices/platform-mx1-camera.c
5474 Auto-merging arch/arm/mach-imx/devices/platform-ipu-core.c
5475 Auto-merging arch/arm/mach-imx/devices/platform-imxdi_rtc.c
5476 Auto-merging arch/arm/mach-imx/devices/platform-imx_udc.c
5477 Auto-merging arch/arm/mach-imx/devices/platform-imx27-coda.c
5478 Auto-merging arch/arm/mach-imx/devices/platform-imx21-hcd.c
5479 Auto-merging arch/arm/mach-imx/devices/platform-imx2-wdt.c
5480 Auto-merging arch/arm/mach-imx/devices/platform-imx-uart.c
5481 Auto-merging arch/arm/mach-imx/devices/platform-imx-ssi.c
5482 Auto-merging arch/arm/mach-imx/devices/platform-imx-keypad.c
5483 Auto-merging arch/arm/mach-imx/devices/platform-imx-i2c.c
5484 Auto-merging arch/arm/mach-imx/devices/platform-imx-fb.c
5485 Auto-merging arch/arm/mach-imx/devices/platform-imx-dma.c
5486 Auto-merging arch/arm/mach-imx/devices/platform-gpio_keys.c
5487 Auto-merging arch/arm/mach-imx/devices/platform-gpio-mxc.c
5488 Auto-merging arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c
5489 Auto-merging arch/arm/mach-imx/devices/platform-flexcan.c
5490 Auto-merging arch/arm/mach-imx/devices/platform-fec.c
5491 Auto-merging arch/arm/mach-imx/devices/platform-ahci-imx.c
5492 Auto-merging arch/arm/mach-imx/devices/devices.c
5493 Auto-merging arch/arm/mach-imx/devices/devices-common.h
5494 Auto-merging arch/arm/mach-imx/devices/Makefile
5495 Auto-merging arch/arm/mach-imx/cpufreq.c
5496 Auto-merging arch/arm/mach-imx/cpu.c
5497 Auto-merging arch/arm/mach-imx/common.h
5498 Auto-merging arch/arm/mach-imx/avic.c
5499 Auto-merging arch/arm/mach-imx/3ds_debugboard.c
5500 Removing arch/arm/mach-highbank/lluart.c
5501 Auto-merging arch/arm/mach-clps711x/edb7211.c
5502 Removing arch/arm/mach-clps711x/edb7211-mm.c
5503 Auto-merging arch/arm/mach-at91/setup.c
5504 Removing arch/arm/mach-at91/include/mach/at91_pit.h
5505 Auto-merging arch/arm/mach-at91/board.h
5506 Auto-merging arch/arm/mach-at91/board-sam9g20ek.c
5507 Auto-merging arch/arm/mach-at91/board-dt.c
5508 Auto-merging arch/arm/mach-at91/board-csb337.c
5509 Auto-merging arch/arm/mach-at91/at91sam9x5.c
5510 Auto-merging arch/arm/mach-at91/at91sam9rl_Recorded preimage for 'arch/arm/mach-ux500/cpu-db8500.c'
5511 Recorded preimage for 'drivers/net/ethernet/cadence/at91_ether.c'
5512 Recorded preimage for 'drivers/tty/serial/atmel_serial.c'
5513 Resolved 'arch/arm/Kconfig' using previous resolution.
5514 Resolved 'arch/arm/mach-nomadik/board-nhk8815.c' using previous resolution.
5515 Resolved 'arch/arm/mach-omap2/drm.c' using previous resolution.
5516 Resolved 'arch/arm/mach-ux500/board-mop500-audio.c' using previous resolution.
5517 Resolved 'arch/arm/mach-ux500/board-mop500.c' using previous resolution.
5518 Resolved 'drivers/pinctrl/pinctrl-nomadik.c' using previous resolution.
5519 devices.c
5520 Auto-merging arch/arm/mach-at91/at91sam9rl.c
5521 Auto-merging arch/arm/mach-at91/at91sam9n12.c
5522 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
5523 Auto-merging arch/arm/mach-at91/at91sam9g45.c
5524 Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
5525 Auto-merging arch/arm/mach-at91/at91sam9263.c
5526 Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
5527 Auto-merging arch/arm/mach-at91/at91sam9261.c
5528 Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
5529 Auto-merging arch/arm/mach-at91/at91sam9260.c
5530 Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
5531 Auto-merging arch/arm/mach-at91/at91rm9200.c
5532 Auto-merging arch/arm/kernel/smp_twd.c
5533 Auto-merging arch/arm/include/debug/imx.S
5534 Removing arch/arm/configs/usb-a9260_defconfig
5535 CONFLICT (modify/delete): arch/arm/configs/stamp9g20_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/stamp9g20_defconfig left in tree.
5536 Removing arch/arm/configs/sam9_l9260_defconfig
5537 Removing arch/arm/configs/qil-a9260_defconfig
5538 Removing arch/arm/configs/g4evm_defconfig
5539 Removing arch/arm/configs/g3evm_defconfig
5540 Removing arch/arm/configs/fortunet_defconfig
5541 Removing arch/arm/configs/edb7211_defconfig
5542 Removing arch/arm/configs/cpu9g20_defconfig
5543 Removing arch/arm/configs/cpu9260_defconfig
5544 Removing arch/arm/configs/cam60_defconfig
5545 CONFLICT (modify/delete): arch/arm/configs/afeb9260_defconfig deleted in arm-soc/for-next and modified in HEAD. Version HEAD of arch/arm/configs/afeb9260_defconfig left in tree.
5546 Auto-merging arch/arm/boot/dts/sh7372-mackerel.dts
5547 Auto-merging arch/arm/boot/dts/imx6q.dtsi
5548 Auto-merging arch/arm/boot/dts/Makefile
5549 Removing arch/arm/boot/compressed/head-vt8500.S
5550 Auto-merging arch/arm/Kconfig.debug
5551 Auto-merging arch/arm/Kconfig
5552 CONFLICT (content): Merge conflict in arch/arm/Kconfig
5553 Auto-merging MAINTAINERS
5554 Automatic merge failed; fix conflicts and then commit the result.
5555 $ git rm -f arch/arm/configs/afeb9260_defconfig
5556 arch/arm/configs/afeb9260_defconfig: needs merge
5557 rm 'arch/arm/configs/afeb9260_defconfig'
5558 $ git rm -f arch/arm/configs/stamp9g20_defconfig
5559 arch/arm/configs/stamp9g20_defconfig: needs merge
5560 rm 'arch/arm/configs/stamp9g20_defconfig'
5561 $ git commit -v -a
5562 Recorded resolution for 'arch/arm/mach-ux500/cpu-db8500.c'.
5563 Recorded resolution for 'drivers/net/ethernet/cadence/at91_ether.c'.
5564 Recorded resolution for 'drivers/tty/serial/atmel_serial.c'.
5565 [master 4a9d25d] Merge remote-tracking branch 'arm-soc/for-next'
5566 $ git diff -M --stat --summary HEAD^..
5567  .../bindings/arm/altera/socfpga-reset.txt          |   11 +
5568  .../bindings/arm/altera/socfpga-system.txt         |   11 +
5569  Documentation/devicetree/bindings/arm/calxeda.txt  |   13 +-
5570  .../devicetree/bindings/arm/vexpress-sysreg.txt    |   50 +
5571  Documentation/devicetree/bindings/arm/vexpress.txt |   98 +-
5572  .../devicetree/bindings/hwmon/vexpress.txt         |   23 +
5573  .../devicetree/bindings/i2c/fsl-imx-i2c.txt        |    4 +-
5574  .../bindings/input/touchscreen/bu21013.txt         |   28 +
5575  Documentation/hwmon/vexpress                       |   34 +
5576  MAINTAINERS                                        |    1 -
5577  arch/arm/Kconfig                                   |   31 +-
5578  arch/arm/Kconfig.debug                             |    8 +
5579  arch/arm/Makefile                                  |    2 -
5580  arch/arm/arm-soc-for-next-contents.txt             |   77 +
5581  arch/arm/boot/compressed/Makefile                  |    4 -
5582  arch/arm/boot/compressed/head-vt8500.S             |   46 -
5583  arch/arm/boot/dts/Makefile                         |    6 +-
5584  arch/arm/boot/dts/ccu9540.dts                      |   72 +
5585  arch/arm/boot/dts/dbx5x0.dtsi                      |   57 +-
5586  arch/arm/boot/dts/ecx-2000.dts                     |  104 ++
5587  arch/arm/boot/dts/ecx-common.dtsi                  |  237 +++
5588  arch/arm/boot/dts/highbank.dts                     |  212 +--
5589  arch/arm/boot/dts/href.dtsi                        |  273 ++++
5590  arch/arm/boot/dts/hrefprev60.dts                   |   41 +
5591  arch/arm/boot/dts/hrefv60plus.dts                  |   83 +-
5592  arch/arm/boot/dts/imx27.dtsi                       |    4 +-
5593  arch/arm/boot/dts/imx51.dtsi                       |    4 +-
5594  arch/arm/boot/dts/imx53.dtsi                       |    6 +-
5595  arch/arm/boot/dts/imx6q.dtsi                       |    6 +-
5596  .../boot/dts/{sh7377.dtsi => sh7372-mackerel.dts}  |   13 +-
5597  arch/arm/boot/dts/snowball.dts                     |  140 +-
5598  arch/arm/boot/dts/socfpga.dtsi                     |   10 +
5599  arch/arm/boot/dts/stuib.dtsi                       |   78 +
5600  arch/arm/boot/dts/tegra30.dtsi                     |    4 +-
5601  arch/arm/boot/dts/vexpress-v2m-rs1.dtsi            |  146 +-
5602  arch/arm/boot/dts/vexpress-v2m.dtsi                |  146 +-
5603  arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts        |  121 +-
5604  arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts         |  186 ++-
5605  arch/arm/boot/dts/vexpress-v2p-ca5s.dts            |   84 +-
5606  arch/arm/boot/dts/vexpress-v2p-ca9.dts             |  136 +-
5607  arch/arm/configs/afeb9260_defconfig                |  106 --
5608  arch/arm/configs/ap4evb_defconfig                  |    1 -
5609  arch/arm/configs/armadillo800eva_defconfig         |    3 +-
5610  arch/arm/configs/cam60_defconfig                   |  173 --
5611  arch/arm/configs/clps711x_defconfig                |   78 +
5612  arch/arm/configs/cpu9260_defconfig                 |  116 --
5613  arch/arm/configs/cpu9g20_defconfig                 |  116 --
5614  arch/arm/configs/edb7211_defconfig                 |   27 -
5615  arch/arm/configs/fortunet_defconfig                |   28 -
5616  arch/arm/configs/g3evm_defconfig                   |   57 -
5617  arch/arm/configs/g4evm_defconfig                   |   57 -
5618  arch/arm/configs/imx_v4_v5_defconfig               |    4 +-
5619  arch/arm/configs/imx_v6_v7_defconfig               |    2 +
5620  arch/arm/configs/kota2_defconfig                   |    1 -
5621  arch/arm/configs/kzm9g_defconfig                   |    5 +-
5622  arch/arm/configs/mackerel_defconfig                |   19 +-
5623  arch/arm/configs/marzen_defconfig                  |   18 +-
5624  arch/arm/configs/qil-a9260_defconfig               |  114 --
5625  arch/arm/configs/sam9_l9260_defconfig              |  148 --
5626  arch/arm/configs/socfpga_defconfig                 |    5 +-
5627  arch/arm/configs/stamp9g20_defconfig               |  128 --
5628  arch/arm/configs/u8500_defconfig                   |    1 +
5629  arch/arm/configs/usb-a9260_defconfig               |  105 --
5630  arch/arm/include/asm/dma-mapping.h                 |    7 -
5631  arch/arm/include/asm/hardware/sp810.h              |    6 +-
5632  arch/arm/include/asm/mach/map.h                    |    7 +
5633  .../mach/debug-macro.S => include/debug/imx.S}     |   33 +-
5634  arch/arm/include/debug/vexpress.S                  |   11 +-
5635  arch/arm/kernel/debug.S                            |   14 +
5636  arch/arm/kernel/smp_twd.c                          |    6 +-
5637  arch/arm/mach-at91/{include/mach => }/at91_aic.h   |    0
5638  arch/arm/mach-at91/{include/mach => }/at91_rstc.h  |    0
5639  arch/arm/mach-at91/{include/mach => }/at91_shdwc.h |    0
5640  arch/arm/mach-at91/{include/mach => }/at91_tc.h    |    0
5641  arch/arm/mach-at91/at91rm9200.c                    |    2 +-
5642  arch/arm/mach-at91/at91rm9200_devices.c            |    2 +-
5643  arch/arm/mach-at91/at91sam9260.c                   |    4 +-
5644  arch/arm/mach-at91/at91sam9260_devices.c           |    2 +-
5645  arch/arm/mach-at91/at91sam9261.c                   |    4 +-
5646  arch/arm/mach-at91/at91sam9261_devices.c           |    2 +-
5647  arch/arm/mach-at91/at91sam9263.c                   |    4 +-
5648  arch/arm/mach-at91/at91sam9263_devices.c           |    2 +-
5649  arch/arm/mach-at91/at91sam926x_time.c              |   14 +-
5650  arch/arm/mach-at91/at91sam9_alt_reset.S            |    2 +-
5651  arch/arm/mach-at91/at91sam9g45.c                   |    3 +-
5652  arch/arm/mach-at91/at91sam9g45_devices.c           |    2 +-
5653  arch/arm/mach-at91/at91sam9g45_reset.S             |    3 +-
5654  arch/arm/mach-at91/at91sam9n12.c                   |    2 +-
5655  arch/arm/mach-at91/at91sam9rl.c                    |    4 +-
5656  arch/arm/mach-at91/at91sam9rl_devices.c            |    2 +-
5657  arch/arm/mach-at91/at91sam9x5.c                    |    2 +-
5658  arch/arm/mach-at91/at91x40.c                       |    3 +-
5659  arch/arm/mach-at91/at91x40_time.c                  |    3 +-
5660  arch/arm/mach-at91/board-1arm.c                    |    4 +-
5661  arch/arm/mach-at91/board-afeb-9260v1.c             |    5 +-
5662  arch/arm/mach-at91/board-cam60.c                   |    4 +-
5663  arch/arm/mach-at91/board-carmeva.c                 |    4 +-
5664  arch/arm/mach-at91/board-cpu9krea.c                |    4 +-
5665  arch/arm/mach-at91/board-cpuat91.c                 |    4 +-
5666  arch/arm/mach-at91/board-csb337.c                  |    4 +-
5667  arch/arm/mach-at91/board-csb637.c                  |    4 +-
5668  arch/arm/mach-at91/board-dt.c                      |    5 +-
5669  arch/arm/mach-at91/board-eb01.c                    |    5 +-
5670  arch/arm/mach-at91/board-eb9200.c                  |    5 +-
5671  arch/arm/mach-at91/board-ecbat91.c                 |    4 +-
5672  arch/arm/mach-at91/board-eco920.c                  |    4 +-
5673  arch/arm/mach-at91/board-flexibity.c               |    4 +-
5674  arch/arm/mach-at91/board-foxg20.c                  |    4 +-
5675  arch/arm/mach-at91/board-gsia18s.c                 |    8 +-
5676  arch/arm/mach-at91/board-kafa.c                    |    4 +-
5677  arch/arm/mach-at91/board-kb9202.c                  |    4 +-
5678  arch/arm/mach-at91/board-neocore926.c              |    4 +-
5679  arch/arm/mach-at91/board-pcontrol-g20.c            |    6 +-
5680  arch/arm/mach-at91/board-picotux200.c              |    4 +-
5681  arch/arm/mach-at91/board-qil-a9260.c               |    6 +-
5682  arch/arm/mach-at91/board-rm9200dk.c                |    4 +-
5683  arch/arm/mach-at91/board-rm9200ek.c                |    4 +-
5684  arch/arm/mach-at91/board-rsi-ews.c                 |    4 +-
5685  arch/arm/mach-at91/board-sam9-l9260.c              |    4 +-
5686  arch/arm/mach-at91/board-sam9260ek.c               |    6 +-
5687  arch/arm/mach-at91/board-sam9261ek.c               |    6 +-
5688  arch/arm/mach-at91/board-sam9263ek.c               |    6 +-
5689  arch/arm/mach-at91/board-sam9g20ek.c               |    4 +-
5690  arch/arm/mach-at91/board-sam9m10g45ek.c            |    6 +-
5691  arch/arm/mach-at91/board-sam9rlek.c                |    7 +-
5692  arch/arm/mach-at91/board-snapper9260.c             |    4 +-
5693  arch/arm/mach-at91/board-stamp9g20.c               |    4 +-
5694  arch/arm/mach-at91/board-usb-a926x.c               |    6 +-
5695  arch/arm/mach-at91/board-yl-9200.c                 |    4 +-
5696  arch/arm/mach-at91/{include/mach => }/board.h      |   55 -
5697  arch/arm/mach-at91/{include/mach => }/gsia18s.h    |    0
5698  arch/arm/mach-at91/include/mach/at91_pit.h         |   32 -
5699  arch/arm/mach-at91/irq.c                           |    2 +-
5700  arch/arm/mach-at91/leds.c                          |    2 +-
5701  arch/arm/mach-at91/pm.c                            |    6 +-
5702  arch/arm/mach-at91/setup.c                         |    2 +-
5703  arch/arm/mach-at91/{include/mach => }/stamp9g20.h  |    0
5704  arch/arm/mach-clps711x/Makefile                    |    2 +-
5705  arch/arm/mach-clps711x/autcpu12.c                  |   15 +-
5706  arch/arm/mach-clps711x/cdb89712.c                  |    4 +-
5707  arch/arm/mach-clps711x/common.c                    |  113 +-
5708  arch/arm/mach-clps711x/edb7211-mm.c                |   82 -
5709  .../mach-clps711x/{edb7211-arch.c => edb7211.c}    |   58 +-
5710  arch/arm/mach-clps711x/include/mach/autcpu12.h     |   14 +-
5711  arch/arm/mach-clps711x/include/mach/clps711x.h     |    3 +
5712  arch/arm/mach-clps711x/include/mach/hardware.h     |   56 +-
5713  arch/arm/mach-clps711x/include/mach/irqs.h         |    4 -
5714  arch/arm/mach-clps711x/include/mach/syspld.h       |    9 +-
5715  arch/arm/mach-clps711x/p720t.c                     |   18 +-
5716  arch/arm/mach-cns3xxx/Kconfig                      |    1 -
5717  arch/arm/mach-davinci/board-dm644x-evm.c           |    5 +-
5718  arch/arm/mach-davinci/board-dm646x-evm.c           |    2 +-
5719  arch/arm/mach-davinci/common.c                     |    2 -
5720  arch/arm/mach-davinci/devices-tnetv107x.c          |    2 +-
5721  arch/arm/mach-davinci/include/mach/serial.h        |    2 +-
5722  arch/arm/mach-davinci/include/mach/uncompress.h    |    6 +
5723  arch/arm/mach-davinci/usb.c                        |    6 -
5724  arch/arm/mach-highbank/Kconfig                     |    2 +-
5725  arch/arm/mach-highbank/Makefile                    |    1 -
5726  arch/arm/mach-highbank/core.h                      |   10 +-
5727  arch/arm/mach-highbank/highbank.c                  |   33 +-
5728  arch/arm/mach-highbank/hotplug.c                   |    6 +-
5729  arch/arm/mach-highbank/lluart.c                    |   34 -
5730  arch/arm/mach-highbank/platsmp.c                   |    7 +-
5731  arch/arm/mach-highbank/pm.c                        |    3 -
5732  arch/arm/mach-highbank/sysregs.h                   |   19 +
5733  arch/arm/mach-highbank/system.c                    |    5 +-
5734  arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c   |    2 +-
5735  .../include/mach => mach-imx}/3ds_debugboard.h     |    0
5736  arch/arm/mach-imx/Kconfig                          |   90 +-
5737  arch/arm/mach-imx/Makefile                         |   22 +
5738  arch/arm/{plat-mxc => mach-imx}/avic.c             |    5 +-
5739  .../include/mach => mach-imx}/board-mx31lilly.h    |    0
5740  .../include/mach => mach-imx}/board-mx31lite.h     |    0
5741  .../include/mach => mach-imx}/board-mx31moboard.h  |    0
5742  .../include/mach => mach-imx}/board-pcm038.h       |    0
5743  arch/arm/mach-imx/clk-imx1.c                       |   17 +-
5744  arch/arm/mach-imx/clk-imx21.c                      |   18 +-
5745  arch/arm/mach-imx/clk-imx25.c                      |   26 +-
5746  arch/arm/mach-imx/clk-imx27.c                      |   40 +-
5747  arch/arm/mach-imx/clk-imx31.c                      |   21 +-
5748  arch/arm/mach-imx/clk-imx35.c                      |   13 +-
5749  arch/arm/mach-imx/clk-imx51-imx53.c                |   15 +-
5750  arch/arm/mach-imx/clk-imx6q.c                      |    3 +-
5751  arch/arm/mach-imx/clk-pllv1.c                      |    4 +-
5752  .../{plat-mxc/include/mach => mach-imx}/common.h   |    1 +
5753  arch/arm/mach-imx/cpu-imx25.c                      |    5 +-
5754  arch/arm/mach-imx/cpu-imx27.c                      |    2 +-
5755  arch/arm/mach-imx/cpu-imx31.c                      |    7 +-
5756  arch/arm/mach-imx/cpu-imx35.c                      |    5 +-
5757  arch/arm/mach-imx/cpu-imx5.c                       |    3 +-
5758  arch/arm/{plat-mxc => mach-imx}/cpu.c              |    3 +-
5759  arch/arm/mach-imx/cpu_op-mx51.c                    |    3 +-
5760  arch/arm/{plat-mxc => mach-imx}/cpufreq.c          |    3 +-
5761  arch/arm/{plat-mxc => mach-imx}/cpuidle.c          |    0
5762  .../{plat-mxc/include/mach => mach-imx}/cpuidle.h  |    0
5763  arch/arm/mach-imx/devices-imx1.h                   |    3 +-
5764  arch/arm/mach-imx/devices-imx21.h                  |    3 +-
5765  arch/arm/mach-imx/devices-imx25.h                  |    3 +-
5766  arch/arm/mach-imx/devices-imx27.h                  |    3 +-
5767  arch/arm/mach-imx/devices-imx31.h                  |    3 +-
5768  arch/arm/mach-imx/devices-imx35.h                  |    3 +-
5769  arch/arm/mach-imx/devices-imx50.h                  |    3 +-
5770  arch/arm/mach-imx/devices-imx51.h                  |    3 +-
5771  arch/arm/{plat-mxc => mach-imx}/devices/Kconfig    |    0
5772  arch/arm/{plat-mxc => mach-imx}/devices/Makefile   |    2 +
5773  .../mach => mach-imx/devices}/devices-common.h     |    9 +-
5774  arch/arm/{plat-mxc => mach-imx/devices}/devices.c  |    4 +-
5775  .../devices/platform-ahci-imx.c                    |    5 +-
5776  .../{plat-mxc => mach-imx}/devices/platform-fec.c  |    5 +-
5777  .../devices/platform-flexcan.c                     |    4 +-
5778  .../devices/platform-fsl-usb2-udc.c                |    5 +-
5779  .../devices/platform-gpio-mxc.c                    |    2 +-
5780  .../devices/platform-gpio_keys.c                   |    5 +-
5781  .../devices/platform-imx-dma.c                     |   23 +-
5782  .../devices/platform-imx-fb.c                      |   16 +-
5783  .../devices/platform-imx-i2c.c                     |   32 +-
5784  .../devices/platform-imx-keypad.c                  |    4 +-
5785  .../devices/platform-imx-ssi.c                     |    4 +-
5786  .../devices/platform-imx-uart.c                    |    4 +-
5787  .../devices/platform-imx2-wdt.c                    |    5 +-
5788  .../devices/platform-imx21-hcd.c                   |    4 +-
5789  .../devices/platform-imx27-coda.c                  |    4 +-
5790  .../devices/platform-imx_udc.c                     |    4 +-
5791  .../devices/platform-imxdi_rtc.c                   |    5 +-
5792  .../devices/platform-ipu-core.c                    |    5 +-
5793  .../devices/platform-mx1-camera.c                  |    4 +-
5794  .../devices/platform-mx2-camera.c                  |   16 +-
5795  .../devices/platform-mxc-ehci.c                    |    5 +-
5796  .../devices/platform-mxc-mmc.c                     |   20 +-
5797  .../devices/platform-mxc_nand.c                    |   25 +-
5798  .../devices/platform-mxc_pwm.c                     |    4 +-
5799  .../devices/platform-mxc_rnga.c                    |    4 +-
5800  .../devices/platform-mxc_rtc.c                     |   13 +-
5801  .../devices/platform-mxc_w1.c                      |    4 +-
5802  .../devices/platform-pata_imx.c                    |    4 +-
5803  .../devices/platform-sdhci-esdhc-imx.c             |    5 +-
5804  .../devices/platform-spi_imx.c                     |    4 +-
5805  arch/arm/mach-imx/ehci-imx25.c                     |    4 +-
5806  arch/arm/mach-imx/ehci-imx27.c                     |    4 +-
5807  arch/arm/mach-imx/ehci-imx31.c                     |    4 +-
5808  arch/arm/mach-imx/ehci-imx35.c                     |    4 +-
5809  arch/arm/mach-imx/ehci-imx5.c                      |    4 +-
5810  arch/arm/{plat-mxc => mach-imx}/epit.c             |    6 +-
5811  .../include/mach => mach-imx}/eukrea-baseboards.h  |    0
5812  arch/arm/mach-imx/eukrea_mbimx27-baseboard.c       |    7 +-
5813  arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c     |    8 +-
5814  arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c     |    7 +-
5815  arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c     |    7 +-
5816  .../{plat-mxc/include/mach => mach-imx}/hardware.h |   26 +-
5817  arch/arm/mach-imx/hotplug.c                        |    3 +-
5818  arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h |    0
5819  arch/arm/mach-imx/imx27-dt.c                       |   11 +-
5820  arch/arm/mach-imx/imx31-dt.c                       |    5 +-
5821  arch/arm/mach-imx/imx51-dt.c                       |    9 +-
5822  arch/arm/mach-imx/include/mach/dma-mx1-mx2.h       |   10 -
5823  arch/arm/mach-imx/iomux-imx31.c                    |    5 +-
5824  .../include/mach => mach-imx}/iomux-mx1.h          |    2 +-
5825  .../include/mach => mach-imx}/iomux-mx21.h         |    4 +-
5826  .../include/mach => mach-imx}/iomux-mx25.h         |    2 +-
5827  .../include/mach => mach-imx}/iomux-mx27.h         |    4 +-
5828  .../include/mach => mach-imx}/iomux-mx2x.h         |    0
5829  .../include/mach => mach-imx}/iomux-mx3.h          |    0
5830  .../include/mach => mach-imx}/iomux-mx35.h         |    2 +-
5831  .../include/mach => mach-imx}/iomux-mx50.h         |    2 +-
5832  .../include/mach => mach-imx}/iomux-mx51.h         |    2 +-
5833  arch/arm/{plat-mxc => mach-imx}/iomux-v1.c         |    5 +-
5834  .../{plat-mxc/include/mach => mach-imx}/iomux-v1.h |    0
5835  arch/arm/{plat-mxc => mach-imx}/iomux-v3.c         |    5 +-
5836  .../{plat-mxc/include/mach => mach-imx}/iomux-v3.h |    0
5837  .../arm/{plat-mxc/include/mach => mach-imx}/iram.h |    0
5838  arch/arm/{plat-mxc => mach-imx}/iram_alloc.c       |    3 +-
5839  arch/arm/{plat-mxc => mach-imx}/irq-common.c       |    0
5840  arch/arm/{plat-mxc => mach-imx}/irq-common.h       |    3 +
5841  arch/arm/mach-imx/lluart.c                         |    3 +-
5842  arch/arm/mach-imx/mach-apf9328.c                   |    7 +-
5843  arch/arm/mach-imx/mach-armadillo5x0.c              |    9 +-
5844  arch/arm/mach-imx/mach-bug.c                       |    7 +-
5845  arch/arm/mach-imx/mach-cpuimx27.c                  |   11 +-
5846  arch/arm/mach-imx/mach-cpuimx35.c                  |    9 +-
5847  arch/arm/mach-imx/mach-cpuimx51sd.c                |    9 +-
5848  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |   10 +-
5849  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    6 +-
5850  arch/arm/mach-imx/mach-imx27ipcam.c                |    6 +-
5851  arch/arm/mach-imx/mach-imx27lite.c                 |    6 +-
5852  arch/arm/mach-imx/mach-imx53.c                     |   11 +-
5853  arch/arm/mach-imx/mach-imx6q.c                     |    6 +-
5854  arch/arm/mach-imx/mach-kzm_arm11_01.c              |    7 +-
5855  arch/arm/mach-imx/mach-mx1ads.c                    |    7 +-
5856  arch/arm/mach-imx/mach-mx21ads.c                   |    6 +-
5857  arch/arm/mach-imx/mach-mx25_3ds.c                  |    8 +-
5858  arch/arm/mach-imx/mach-mx27_3ds.c                  |   10 +-
5859  arch/arm/mach-imx/mach-mx27ads.c                   |    6 +-
5860  arch/arm/mach-imx/mach-mx31_3ds.c                  |   12 +-
5861  arch/arm/mach-imx/mach-mx31ads.c                   |    5 +-
5862  arch/arm/mach-imx/mach-mx31lilly.c                 |   11 +-
5863  arch/arm/mach-imx/mach-mx31lite.c                  |   11 +-
5864  arch/arm/mach-imx/mach-mx31moboard.c               |   14 +-
5865  arch/arm/mach-imx/mach-mx35_3ds.c                  |    8 +-
5866  arch/arm/mach-imx/mach-mx50_rdp.c                  |    7 +-
5867  arch/arm/mach-imx/mach-mx51_3ds.c                  |    9 +-
5868  arch/arm/mach-imx/mach-mx51_babbage.c              |    7 +-
5869  arch/arm/mach-imx/mach-mxt_td60.c                  |    6 +-
5870  arch/arm/mach-imx/mach-pca100.c                    |    8 +-
5871  arch/arm/mach-imx/mach-pcm037.c                    |    8 +-
5872  arch/arm/mach-imx/mach-pcm037_eet.c                |    5 +-
5873  arch/arm/mach-imx/mach-pcm038.c                    |   13 +-
5874  arch/arm/mach-imx/mach-pcm043.c                    |    9 +-
5875  arch/arm/mach-imx/mach-qong.c                      |    6 +-
5876  arch/arm/mach-imx/mach-scb9328.c                   |    7 +-
5877  arch/arm/mach-imx/mach-vpr200.c                    |    7 +-
5878  arch/arm/mach-imx/mm-imx1.c                        |    9 +-
5879  arch/arm/mach-imx/mm-imx21.c                       |   14 +-
5880  arch/arm/mach-imx/mm-imx25.c                       |   12 +-
5881  arch/arm/mach-imx/mm-imx27.c                       |   14 +-
5882  arch/arm/mach-imx/mm-imx3.c                        |   13 +-
5883  arch/arm/mach-imx/mm-imx5.c                        |   12 +-
5884  arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h |    0
5885  .../arm/{plat-mxc/include/mach => mach-imx}/mx21.h |    0
5886  .../arm/{plat-mxc/include/mach => mach-imx}/mx25.h |    0
5887  .../arm/{plat-mxc/include/mach => mach-imx}/mx27.h |    0
5888  .../arm/{plat-mxc/include/mach => mach-imx}/mx2x.h |    0
5889  .../arm/{plat-mxc/include/mach => mach-imx}/mx31.h |    0
5890  arch/arm/mach-imx/mx31lilly-db.c                   |    9 +-
5891  arch/arm/mach-imx/mx31lite-db.c                    |    9 +-
5892  arch/arm/mach-imx/mx31moboard-devboard.c           |    9 +-
5893  arch/arm/mach-imx/mx31moboard-marxbot.c            |    9 +-
5894  arch/arm/mach-imx/mx31moboard-smartbot.c           |   11 +-
5895  .../arm/{plat-mxc/include/mach => mach-imx}/mx35.h |    0
5896  .../arm/{plat-mxc/include/mach => mach-imx}/mx3x.h |    0
5897  .../arm/{plat-mxc/include/mach => mach-imx}/mx50.h |    0
5898  .../arm/{plat-mxc/include/mach => mach-imx}/mx51.h |    0
5899  .../arm/{plat-mxc/include/mach => mach-imx}/mx53.h |    0
5900  .../arm/{plat-mxc/include/mach => mach-imx}/mx6q.h |    0
5901  arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h |    0
5902  arch/arm/mach-imx/pcm970-baseboard.c               |    7 +-
5903  arch/arm/mach-imx/platsmp.c                        |    5 +-
5904  arch/arm/mach-imx/pm-imx27.c                       |    3 +-
5905  arch/arm/mach-imx/pm-imx3.c                        |    7 +-
5906  arch/arm/mach-imx/pm-imx5.c                        |    7 +-
5907  arch/arm/mach-imx/pm-imx6q.c                       |    5 +-
5908  arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c     |    0
5909  arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S          |    0
5910  arch/arm/{plat-mxc => mach-imx}/system.c           |    5 +-
5911  arch/arm/{plat-mxc => mach-imx}/time.c             |    5 +-
5912  arch/arm/{plat-mxc => mach-imx}/tzic.c             |    6 +-
5913  arch/arm/{plat-mxc => mach-imx}/ulpi.c             |    2 +-
5914  .../arm/{plat-mxc/include/mach => mach-imx}/ulpi.h |    0
5915  arch/arm/mach-integrator/include/mach/irqs.h       |  109 +-
5916  arch/arm/mach-integrator/integrator_ap.c           |    5 +-
5917  arch/arm/mach-integrator/integrator_cp.c           |    6 +-
5918  arch/arm/mach-lpc32xx/clock.c                      |    8 +
5919  arch/arm/mach-lpc32xx/include/mach/platform.h      |    1 +
5920  arch/arm/mach-lpc32xx/irq.c                        |   23 +-
5921  arch/arm/mach-nomadik/Kconfig                      |    2 +-
5922  arch/arm/mach-nomadik/board-nhk8815.c              |    7 +-
5923  arch/arm/mach-nomadik/include/mach/irqs.h          |    2 +-
5924  arch/arm/mach-omap1/Makefile                       |    3 +-
5925  arch/arm/mach-omap1/board-ams-delta.c              |    1 -
5926  arch/arm/mach-omap1/board-fsample.c                |    9 +-
5927  arch/arm/mach-omap1/board-generic.c                |    1 -
5928  arch/arm/mach-omap1/board-h2-mmc.c                 |    5 +-
5929  arch/arm/mach-omap1/board-h2.c                     |    6 +-
5930  arch/arm/mach-omap1/board-h3-mmc.c                 |    3 +-
5931  arch/arm/mach-omap1/board-h3.c                     |    5 +-
5932  arch/arm/mach-omap1/board-htcherald.c              |    3 +-
5933  arch/arm/mach-omap1/board-innovator.c              |   30 +-
5934  arch/arm/mach-omap1/board-nokia770.c               |    5 +-
5935  arch/arm/mach-omap1/board-osk.c                    |    3 +-
5936  arch/arm/mach-omap1/board-palmte.c                 |    6 +-
5937  arch/arm/mach-omap1/board-palmtt.c                 |    8 +-
5938  arch/arm/mach-omap1/board-palmz71.c                |    6 +-
5939  arch/arm/mach-omap1/board-perseus2.c               |    9 +-
5940  arch/arm/mach-omap1/board-sx1-mmc.c                |    3 +-
5941  arch/arm/mach-omap1/board-sx1.c                    |    6 +-
5942  arch/arm/mach-omap1/board-voiceblue.c              |    3 +-
5943  arch/arm/mach-omap1/clock.c                        |  507 +++++-
5944  arch/arm/mach-omap1/clock.h                        |  178 +-
5945  arch/arm/mach-omap1/clock_data.c                   |   16 +-
5946  arch/arm/mach-omap1/common.h                       |    7 +-
5947  arch/arm/mach-omap1/devices.c                      |   14 +-
5948  arch/arm/mach-omap1/dma.c                          |    9 +-
5949  arch/arm/mach-omap1/dma.h                          |   83 +
5950  arch/arm/mach-omap1/flash.c                        |    2 +-
5951  arch/arm/mach-omap1/fpga.c                         |    4 +-
5952  arch/arm/mach-omap1/fpga.h                         |   52 +
5953  arch/arm/mach-omap1/gpio15xx.c                     |    2 +
5954  arch/arm/mach-omap1/gpio16xx.c                     |    2 +
5955  arch/arm/mach-omap1/gpio7xx.c                      |    2 +
5956  arch/arm/mach-omap1/i2c.c                          |   64 +-
5957  arch/arm/mach-omap1/id.c                           |    2 +-
5958  arch/arm/mach-omap1/include/mach/debug-macro.S     |    2 +-
5959  arch/arm/mach-omap1/include/mach/entry-macro.S     |    2 -
5960  arch/arm/mach-omap1/include/mach/gpio.h            |    3 -
5961  arch/arm/mach-omap1/include/mach/hardware.h        |    9 +-
5962  arch/arm/mach-omap1/include/mach/memory.h          |    2 +-
5963  arch/arm/mach-omap1/include/mach/omap1510.h        |  113 ++
5964  arch/arm/mach-omap1/include/mach/serial.h          |   53 +
5965  arch/arm/mach-omap1/include/mach/soc.h             |  229 +++
5966  .../include/plat => mach-omap1/include/mach}/tc.h  |    0
5967  arch/arm/mach-omap1/include/mach/uncompress.h      |  121 +-
5968  arch/arm/mach-omap1/io.c                           |    5 +-
5969  arch/arm/mach-omap1/iomap.h                        |    3 -
5970  arch/arm/mach-omap1/irq.c                          |    2 +-
5971  arch/arm/mach-omap1/lcd_dma.c                      |    4 +-
5972  arch/arm/mach-omap1/mcbsp.c                        |    5 +-
5973  arch/arm/mach-omap1/mmc.h                          |   18 +
5974  arch/arm/mach-omap1/opp_data.c                     |    2 +-
5975  arch/arm/mach-omap1/pm.c                           |   10 +-
5976  arch/arm/mach-omap1/pm_bus.c                       |    3 +-
5977  arch/arm/mach-omap1/reset.c                        |   38 +
5978  arch/arm/mach-omap1/serial.c                       |    1 -
5979  arch/arm/mach-omap1/sleep.S                        |    2 +
5980  arch/arm/mach-omap1/soc.h                          |    4 +
5981  arch/arm/mach-omap1/sram-init.c                    |   76 +
5982  arch/arm/mach-omap1/sram.h                         |    7 +
5983  arch/arm/mach-omap1/timer32k.c                     |    1 +
5984  arch/arm/mach-omap1/usb.c                          |    6 +-
5985  arch/arm/mach-omap2/Makefile                       |  116 +-
5986  arch/arm/mach-omap2/am35xx-emac.c                  |    2 +-
5987  arch/arm/mach-omap2/board-2430sdp.c                |    4 +-
5988  arch/arm/mach-omap2/board-3430sdp.c                |    6 +-
5989  arch/arm/mach-omap2/board-3630sdp.c                |    3 +-
5990  arch/arm/mach-omap2/board-4430sdp.c                |    4 +-
5991  arch/arm/mach-omap2/board-am3517crane.c            |    1 -
5992  arch/arm/mach-omap2/board-am3517evm.c              |    2 +-
5993  arch/arm/mach-omap2/board-apollon.c                |    4 +-
5994  arch/arm/mach-omap2/board-cm-t35.c                 |   10 +-
5995  arch/arm/mach-omap2/board-cm-t3517.c               |    6 +-
5996  arch/arm/mach-omap2/board-devkit8000.c             |   11 +-
5997  arch/arm/mach-omap2/board-flash.c                  |   52 +-
5998  arch/arm/mach-omap2/board-flash.h                  |    8 +-
5999  arch/arm/mach-omap2/board-h4.c                     |    8 +-
6000  arch/arm/mach-omap2/board-igep0020.c               |    9 +-
6001  arch/arm/mach-omap2/board-ldp.c                    |    9 +-
6002  arch/arm/mach-omap2/board-n8x0.c                   |    5 +-
6003  arch/arm/mach-omap2/board-omap3beagle.c            |   16 +-
6004  arch/arm/mach-omap2/board-omap3evm.c               |   11 +-
6005  arch/arm/mach-omap2/board-omap3logic.c             |    7 +-
6006  arch/arm/mach-omap2/board-omap3pandora.c           |    4 +-
6007  arch/arm/mach-omap2/board-omap3stalker.c           |    3 +-
6008  arch/arm/mach-omap2/board-omap3touchbook.c         |   11 +-
6009  arch/arm/mach-omap2/board-omap4panda.c             |    6 +-
6010  arch/arm/mach-omap2/board-overo.c                  |   11 +-
6011  arch/arm/mach-omap2/board-rm680.c                  |    9 +-
6012  arch/arm/mach-omap2/board-rx51-peripherals.c       |    7 +-
6013  arch/arm/mach-omap2/board-rx51.c                   |    8 +-
6014  arch/arm/mach-omap2/board-ti8168evm.c              |    3 +-
6015  arch/arm/mach-omap2/board-zoom-debugboard.c        |    4 +-
6016  arch/arm/mach-omap2/board-zoom-display.c           |    3 +-
6017  arch/arm/mach-omap2/board-zoom-peripherals.c       |    3 +-
6018  arch/arm/mach-omap2/board-zoom.c                   |    8 +-
6019  .../arm/mach-omap2/{include/mach => }/board-zoom.h |    0
6020  arch/arm/mach-omap2/clkt2xxx_apll.c                |    3 +-
6021  arch/arm/mach-omap2/clkt2xxx_dpll.c                |    4 +-
6022  arch/arm/mach-omap2/clkt2xxx_dpllcore.c            |    6 +-
6023  arch/arm/mach-omap2/clkt2xxx_osc.c                 |    2 -
6024  arch/arm/mach-omap2/clkt2xxx_sys.c                 |    2 -
6025  arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c       |    6 +-
6026  arch/arm/mach-omap2/clkt34xx_dpll3m2.c             |    5 +-
6027  arch/arm/mach-omap2/clkt_clksel.c                  |    2 -
6028  arch/arm/mach-omap2/clkt_dpll.c                    |    2 -
6029  arch/arm/mach-omap2/clkt_iclk.c                    |    1 -
6030  arch/arm/mach-omap2/clock.c                        |  521 +++++-
6031  arch/arm/mach-omap2/clock.h                        |  317 +++-
6032  arch/arm/mach-omap2/clock2420_data.c               |    6 +-
6033  arch/arm/mach-omap2/clock2430.c                    |    4 +-
6034  arch/arm/mach-omap2/clock2430_data.c               |    6 +-
6035  arch/arm/mach-omap2/clock2xxx.c                    |    2 -
6036  arch/arm/mach-omap2/clock33xx_data.c               |    5 +-
6037  arch/arm/mach-omap2/clock34xx.c                    |    4 +-
6038  arch/arm/mach-omap2/clock3517.c                    |    4 +-
6039  arch/arm/mach-omap2/clock36xx.c                    |    2 -
6040  arch/arm/mach-omap2/clock3xxx.c                    |    2 -
6041  arch/arm/mach-omap2/clock3xxx_data.c               |    6 +-
6042  arch/arm/mach-omap2/clock44xx_data.c               |    4 -
6043  arch/arm/mach-omap2/clockdomain.c                  |    3 +-
6044  arch/arm/mach-omap2/clockdomain.h                  |    5 +-
6045  arch/arm/mach-omap2/clockdomain2xxx_3xxx.c         |  339 ----
6046  arch/arm/mach-omap2/clockdomain33xx.c              |   74 -
6047  arch/arm/mach-omap2/clockdomain44xx.c              |  151 --
6048  arch/arm/mach-omap2/clockdomains2420_data.c        |    1 +
6049  arch/arm/mach-omap2/clockdomains2430_data.c        |    1 +
6050  arch/arm/mach-omap2/clockdomains3xxx_data.c        |    1 +
6051  arch/arm/mach-omap2/clockdomains44xx_data.c        |    2 +-
6052  arch/arm/mach-omap2/cm.h                           |   12 +
6053  arch/arm/mach-omap2/cm2xxx.c                       |  255 +++
6054  arch/arm/mach-omap2/cm2xxx.h                       |   66 +
6055  arch/arm/mach-omap2/cm2xxx_3xxx.h                  |  119 +-
6056  arch/arm/mach-omap2/cm33xx.c                       |   58 +-
6057  arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c}    |  307 ++--
6058  arch/arm/mach-omap2/cm3xxx.h                       |   86 +
6059  arch/arm/mach-omap2/cm_common.c                    |   71 +
6060  arch/arm/mach-omap2/cminst44xx.c                   |  142 +-
6061  arch/arm/mach-omap2/common-board-devices.c         |   46 -
6062  arch/arm/mach-omap2/common-board-devices.h         |    1 -
6063  arch/arm/mach-omap2/common.c                       |   22 +-
6064  arch/arm/mach-omap2/common.h                       |   13 +-
6065  arch/arm/mach-omap2/control.c                      |    8 +-
6066  arch/arm/mach-omap2/devices.c                      |   87 +-
6067  arch/arm/mach-omap2/display.c                      |   45 +-
6068  arch/arm/mach-omap2/dma.c                          |   11 +-
6069  arch/arm/mach-omap2/dma.h                          |  131 ++
6070  arch/arm/mach-omap2/dpll3xxx.c                     |    2 -
6071  arch/arm/mach-omap2/dpll44xx.c                     |    2 -
6072  arch/arm/mach-omap2/drm.c                          |    4 +-
6073  arch/arm/mach-omap2/dsp.c                          |    2 +-
6074  arch/arm/mach-omap2/gpio.c                         |    6 +-
6075  arch/arm/mach-omap2/gpmc-nand.c                    |   85 +-
6076  arch/arm/mach-omap2/gpmc-nand.h                    |   27 +
6077  arch/arm/mach-omap2/gpmc-onenand.c                 |  214 +--
6078  arch/arm/mach-omap2/gpmc-onenand.h                 |   24 +
6079  arch/arm/mach-omap2/gpmc-smc91x.c                  |    2 +-
6080  arch/arm/mach-omap2/gpmc-smsc911x.c                |    2 +-
6081  arch/arm/mach-omap2/gpmc.c                         |  464 +-----
6082  .../{plat-omap/include/plat => mach-omap2}/gpmc.h  |   61 +-
6083  arch/arm/mach-omap2/hdq1w.c                        |    4 +-
6084  arch/arm/mach-omap2/hdq1w.h                        |    2 +-
6085  arch/arm/mach-omap2/hsmmc.c                        |    8 +-
6086  arch/arm/mach-omap2/hwspinlock.c                   |    4 +-
6087  arch/arm/mach-omap2/i2c.c                          |   69 +-
6088  arch/arm/mach-omap2/i2c.h                          |   42 +
6089  arch/arm/mach-omap2/include/mach/debug-macro.S     |    2 +-
6090  arch/arm/mach-omap2/include/mach/gpio.h            |    3 -
6091  .../plat => mach-omap2/include/mach}/serial.h      |   20 -
6092  arch/arm/mach-omap2/include/mach/uncompress.h      |  175 +-
6093  arch/arm/mach-omap2/io.c                           |   25 +-
6094  arch/arm/mach-omap2/mcbsp.c                        |    7 +-
6095  arch/arm/mach-omap2/mmc.h                          |   23 +
6096  arch/arm/mach-omap2/msdi.c                         |    7 +-
6097  arch/arm/mach-omap2/mux.c                          |    3 +-
6098  arch/arm/mach-omap2/omap-mpuss-lowpower.c          |    1 +
6099  arch/arm/{plat-omap => mach-omap2}/omap-pm-noop.c  |    5 +-
6100  .../include/plat => mach-omap2}/omap-pm.h          |    0
6101  arch/arm/mach-omap2/omap-secure.c                  |    1 -
6102  arch/arm/mach-omap2/omap-secure.h                  |    7 +
6103  arch/arm/mach-omap2/omap4-common.c                 |    8 +-
6104  arch/arm/{plat-omap => mach-omap2}/omap_device.c   |    5 +-
6105  .../include/plat => mach-omap2}/omap_device.h      |    2 +-
6106  arch/arm/mach-omap2/omap_hwmod.c                   |  118 +-
6107  .../include/plat => mach-omap2}/omap_hwmod.h       |    7 +-
6108  arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   13 +-
6109  arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   12 +-
6110  .../omap_hwmod_2xxx_3xxx_interconnect_data.c       |    3 +-
6111  .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    9 +-
6112  .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c |    4 +-
6113  arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c |    6 +-
6114  arch/arm/mach-omap2/omap_hwmod_33xx_data.c         |   10 +-
6115  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   14 +-
6116  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   47 +-
6117  arch/arm/mach-omap2/omap_hwmod_common_data.c       |    2 +-
6118  arch/arm/mach-omap2/omap_hwmod_common_data.h       |    2 +-
6119  arch/arm/mach-omap2/omap_opp_data.h                |    2 +-
6120  arch/arm/mach-omap2/omap_phy_internal.c            |    4 +-
6121  arch/arm/mach-omap2/omap_twl.c                     |    1 +
6122  arch/arm/mach-omap2/opp.c                          |    2 +-
6123  arch/arm/mach-omap2/opp3xxx_data.c                 |    1 +
6124  arch/arm/mach-omap2/pm-debug.c                     |    5 +-
6125  arch/arm/mach-omap2/pm.c                           |    5 +-
6126  arch/arm/mach-omap2/pm24xx.c                       |   13 +-
6127  arch/arm/mach-omap2/pm34xx.c                       |   14 +-
6128  arch/arm/mach-omap2/pm44xx.c                       |    1 +
6129  arch/arm/mach-omap2/pmu.c                          |    5 +-
6130  arch/arm/mach-omap2/powerdomain.h                  |    2 -
6131  arch/arm/mach-omap2/powerdomain2xxx_3xxx.c         |  242 ---
6132  arch/arm/mach-omap2/powerdomain33xx.c              |  229 ---
6133  arch/arm/mach-omap2/powerdomain44xx.c              |  285 ----
6134  arch/arm/mach-omap2/powerdomains2xxx_data.c        |    1 +
6135  arch/arm/mach-omap2/prcm.c                         |    1 +
6136  arch/arm/mach-omap2/prm-regbits-24xx.h             |    6 +-
6137  arch/arm/mach-omap2/prm-regbits-34xx.h             |   12 +-
6138  arch/arm/mach-omap2/prm.h                          |   53 +
6139  arch/arm/mach-omap2/prm2xxx.c                      |  126 ++
6140  arch/arm/mach-omap2/prm2xxx.h                      |  132 ++
6141  arch/arm/mach-omap2/prm2xxx_3xxx.c                 |  332 ++--
6142  arch/arm/mach-omap2/prm2xxx_3xxx.h                 |  277 +---
6143  arch/arm/mach-omap2/prm33xx.c                      |  204 ++-
6144  arch/arm/mach-omap2/prm3xxx.c                      |  403 +++++
6145  arch/arm/mach-omap2/prm3xxx.h                      |  160 ++
6146  arch/arm/mach-omap2/prm44xx.c                      |  355 +++-
6147  arch/arm/mach-omap2/prm44xx.h                      |    2 +
6148  arch/arm/mach-omap2/prm_common.c                   |  105 +-
6149  arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h |    2 +-
6150  arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h  |    2 +-
6151  arch/arm/mach-omap2/sdram-nokia.c                  |    4 +-
6152  arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h     |    2 +-
6153  .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h    |    2 +-
6154  arch/arm/mach-omap2/sdrc.c                         |   21 +-
6155  arch/arm/mach-omap2/sdrc.h                         |  146 +-
6156  arch/arm/mach-omap2/sdrc2xxx.c                     |    7 +-
6157  arch/arm/mach-omap2/serial.c                       |   13 +-
6158  arch/arm/mach-omap2/serial.h                       |    1 +
6159  arch/arm/mach-omap2/sleep34xx.S                    |    7 +-
6160  arch/arm/mach-omap2/soc.h                          |  468 +++++-
6161  arch/arm/mach-omap2/sr_device.c                    |    4 +-
6162  arch/arm/mach-omap2/sram.c                         |  305 ++++
6163  arch/arm/mach-omap2/sram.h                         |   83 +
6164  arch/arm/mach-omap2/sram242x.S                     |    4 +-
6165  arch/arm/mach-omap2/sram243x.S                     |    4 +-
6166  arch/arm/mach-omap2/sram34xx.S                     |    2 +-
6167  arch/arm/mach-omap2/timer.c                        |    9 +-
6168  arch/arm/mach-omap2/twl-common.c                   |    5 +-
6169  arch/arm/mach-omap2/usb-host.c                     |    6 +-
6170  arch/arm/mach-omap2/usb-musb.c                     |    8 +-
6171  arch/arm/mach-omap2/usb-tusb6010.c                 |    3 +-
6172  arch/arm/mach-omap2/usb.h                          |   82 +
6173  arch/arm/mach-omap2/vc.c                           |    2 +-
6174  arch/arm/mach-omap2/wd_timer.c                     |    2 +-
6175  arch/arm/mach-omap2/wd_timer.h                     |    2 +-
6176  arch/arm/mach-pxa/hx4700.c                         |    8 +-
6177  arch/arm/mach-pxa/pxa3xx-ulpi.c                    |   13 +-
6178  arch/arm/mach-pxa/spitz_pm.c                       |    8 +-
6179  arch/arm/mach-s3c64xx/common.c                     |    1 -
6180  arch/arm/mach-s5p64x0/common.c                     |    2 -
6181  arch/arm/mach-s5pv210/common.c                     |    2 -
6182  arch/arm/mach-shmobile/Kconfig                     |   31 +-
6183  arch/arm/mach-shmobile/Makefile                    |    8 -
6184  arch/arm/mach-shmobile/board-ap4evb.c              |  139 +-
6185  arch/arm/mach-shmobile/board-armadillo800eva.c     |   46 +-
6186  arch/arm/mach-shmobile/board-g3evm.c               |  343 ----
6187  arch/arm/mach-shmobile/board-g4evm.c               |  384 -----
6188  arch/arm/mach-shmobile/board-kzm9g.c               |   14 +-
6189  arch/arm/mach-shmobile/board-mackerel.c            |   82 +-
6190  arch/arm/mach-shmobile/board-marzen.c              |  211 ++-
6191  arch/arm/mach-shmobile/clock-r8a7740.c             |   34 +
6192  arch/arm/mach-shmobile/clock-r8a7779.c             |   23 +-
6193  arch/arm/mach-shmobile/clock-sh7367.c              |  355 ----
6194  arch/arm/mach-shmobile/clock-sh7372.c              |  106 +-
6195  arch/arm/mach-shmobile/clock-sh7377.c              |  366 -----
6196  arch/arm/mach-shmobile/include/mach/common.h       |   18 -
6197  arch/arm/mach-shmobile/include/mach/r8a7779.h      |    2 +-
6198  arch/arm/mach-shmobile/include/mach/sh7367.h       |  332 ----
6199  arch/arm/mach-shmobile/include/mach/sh7372.h       |    8 +-
6200  arch/arm/mach-shmobile/include/mach/sh7377.h       |  360 ----
6201  arch/arm/mach-shmobile/intc-sh7367.c               |  413 -----
6202  arch/arm/mach-shmobile/intc-sh7377.c               |  592 -------
6203  arch/arm/mach-shmobile/pfc-r8a7779.c               |   16 +-
6204  arch/arm/mach-shmobile/pfc-sh7367.c                | 1727 --------------------
6205  arch/arm/mach-shmobile/pfc-sh7377.c                | 1688 -------------------
6206  arch/arm/mach-shmobile/setup-r8a7740.c             |   24 +-
6207  arch/arm/mach-shmobile/setup-r8a7779.c             |   77 +
6208  arch/arm/mach-shmobile/setup-sh7367.c              |  481 ------
6209  arch/arm/mach-shmobile/setup-sh7372.c              |   26 +-
6210  arch/arm/mach-shmobile/setup-sh7377.c              |  549 -------
6211  arch/arm/mach-shmobile/smp-emev2.c                 |   22 +-
6212  arch/arm/mach-shmobile/smp-r8a7779.c               |   25 +-
6213  arch/arm/mach-shmobile/smp-sh73a0.c                |   23 +-
6214  arch/arm/mach-socfpga/Kconfig                      |    1 +
6215  arch/arm/mach-socfpga/Makefile                     |    1 +
6216  .../include/mach/irqs.h => mach-socfpga/core.h}    |   22 +-
6217  arch/arm/mach-socfpga/headsmp.S                    |   25 +
6218  arch/arm/mach-socfpga/platsmp.c                    |  116 ++
6219  arch/arm/mach-socfpga/socfpga.c                    |   54 +-
6220  arch/arm/mach-u300/core.c                          |    2 -
6221  arch/arm/mach-ux500/Kconfig                        |    2 +-
6222  arch/arm/mach-ux500/board-mop500-audio.c           |    3 +-
6223  arch/arm/mach-ux500/board-mop500-pins.c            |  427 ++++-
6224  arch/arm/mach-ux500/board-mop500-sdi.c             |    2 +-
6225  arch/arm/mach-ux500/board-mop500-stuib.c           |   22 +-
6226  arch/arm/mach-ux500/board-mop500.c                 |  156 +-
6227  arch/arm/mach-ux500/board-mop500.h                 |    8 +-
6228  arch/arm/mach-ux500/cpu-db8500.c                   |  113 +-
6229  arch/arm/mach-ux500/cpu.c                          |    3 +
6230  arch/arm/mach-ux500/devices-common.c               |    1 +
6231  arch/arm/mach-ux500/devices-db8500.c               |    4 +-
6232  arch/arm/mach-ux500/devices-db8500.h               |    1 +
6233  arch/arm/mach-ux500/include/mach/irqs.h            |    2 +-
6234  arch/arm/mach-ux500/include/mach/msp.h             |    2 +-
6235  arch/arm/mach-ux500/timer.c                        |    5 +-
6236  arch/arm/mach-ux500/usb.c                          |    4 +-
6237  arch/arm/mach-versatile/core.c                     |    2 +-
6238  arch/arm/mach-vexpress/Kconfig                     |    4 +-
6239  arch/arm/mach-vexpress/Makefile                    |    2 +-
6240  arch/arm/mach-vexpress/ct-ca9x4.c                  |   41 +-
6241  arch/arm/mach-vexpress/include/mach/motherboard.h  |   81 -
6242  arch/arm/mach-vexpress/platsmp.c                   |    3 +-
6243  arch/arm/mach-vexpress/reset.c                     |  141 ++
6244  arch/arm/mach-vexpress/v2m.c                       |  349 +---
6245  arch/arm/mach-vt8500/Kconfig                       |   12 +
6246  arch/arm/mach-vt8500/common.h                      |    3 +
6247  arch/arm/mach-vt8500/include/mach/entry-macro.S    |   26 -
6248  arch/arm/mach-vt8500/include/mach/hardware.h       |   12 -
6249  arch/arm/mach-vt8500/include/mach/i8042.h          |   18 -
6250  arch/arm/mach-vt8500/include/mach/restart.h        |   17 -
6251  arch/arm/mach-vt8500/irq.c                         |  108 +-
6252  arch/arm/mach-vt8500/timer.c                       |    2 +-
6253  arch/arm/mach-vt8500/vt8500.c                      |    3 +-
6254  arch/arm/mm/mmu.c                                  |   16 +
6255  arch/arm/plat-mxc/Kconfig                          |   89 -
6256  arch/arm/plat-mxc/Makefile                         |   24 -
6257  arch/arm/plat-mxc/include/mach/irqs.h              |   21 -
6258  arch/arm/plat-mxc/include/mach/uncompress.h        |  132 --
6259  arch/arm/plat-nomadik/Kconfig                      |   29 -
6260  arch/arm/plat-nomadik/Makefile                     |    5 -
6261  arch/arm/plat-omap/Makefile                        |    4 +-
6262  arch/arm/plat-omap/clock.c                         |  544 ------
6263  arch/arm/plat-omap/common.c                        |   48 -
6264  arch/arm/plat-omap/counter_32k.c                   |    3 -
6265  arch/arm/plat-omap/debug-devices.c                 |    3 +-
6266  arch/arm/plat-omap/debug-leds.c                    |   23 +-
6267  arch/arm/plat-omap/dma.c                           |  132 +-
6268  arch/arm/plat-omap/dmtimer.c                       |   20 +-
6269  arch/arm/plat-omap/fb.c                            |   62 +-
6270  arch/arm/plat-omap/i2c.c                           |  155 +-
6271  .../include/{plat/dma.h => plat-omap/dma-omap.h}   |  201 +--
6272  arch/arm/plat-omap/include/plat/clkdev_omap.h      |   51 -
6273  arch/arm/plat-omap/include/plat/clock.h            |  309 ----
6274  arch/arm/plat-omap/include/plat/common.h           |   42 -
6275  arch/arm/plat-omap/include/plat/counter-32k.h      |    1 +
6276  arch/arm/plat-omap/include/plat/cpu.h              |  468 +-----
6277  .../include/plat}/debug-devices.h                  |    7 -
6278  arch/arm/plat-omap/include/plat/dma-44xx.h         |  147 --
6279  arch/arm/plat-omap/include/plat/dmtimer.h          |    2 +
6280  arch/arm/plat-omap/include/plat/fpga.h             |  193 ---
6281  arch/arm/plat-omap/include/plat/i2c.h              |   30 +-
6282  arch/arm/plat-omap/include/plat/multi.h            |  120 --
6283  arch/arm/plat-omap/include/plat/omap-secure.h      |   14 -
6284  arch/arm/plat-omap/include/plat/sdrc.h             |  164 --
6285  arch/arm/plat-omap/include/plat/sram.h             |   97 +-
6286  arch/arm/plat-omap/include/plat/uncompress.h       |  204 ---
6287  arch/arm/plat-omap/include/plat/usb.h              |  179 --
6288  arch/arm/plat-omap/sram.c                          |  366 +----
6289  arch/arm/plat-omap/sram.h                          |    6 -
6290  arch/arm/plat-versatile/Kconfig                    |    9 -
6291  arch/arm/plat-versatile/Makefile                   |    1 -
6292  arch/avr32/mach-at32ap/include/mach/board.h        |    7 -
6293  drivers/ata/pata_at91.c                            |    2 +-
6294  drivers/bus/omap-ocp2scp.c                         |   68 +-
6295  drivers/char/hw_random/Kconfig                     |    2 +-
6296  drivers/char/hw_random/omap-rng.c                  |    2 -
6297  drivers/clk/Kconfig                                |   16 +-
6298  drivers/clk/Makefile                               |    1 +
6299  drivers/clk/clk-fixed-rate.c                       |    2 +-
6300  drivers/clk/clk-prima2.c                           |   84 +-
6301  drivers/clk/clk-twl6040.c                          |  126 ++
6302  drivers/clk/clk.c                                  |   20 +-
6303  drivers/clk/spear/clk-vco-pll.c                    |    2 +-
6304  drivers/clk/ux500/clk-prcmu.c                      |   55 +
6305  drivers/clk/ux500/clk.h                            |    6 +
6306  drivers/clk/ux500/u8500_clk.c                      |    7 +-
6307  drivers/clk/versatile/Makefile                     |    2 +
6308  drivers/clk/versatile/clk-vexpress-osc.c           |  146 ++
6309  drivers/clk/versatile/clk-vexpress.c               |  142 ++
6310  drivers/clocksource/Kconfig                        |   17 +-
6311  drivers/clocksource/Makefile                       |    1 +
6312  .../timer.c => drivers/clocksource/nomadik-mtu.c   |   11 +-
6313  drivers/crypto/omap-aes.c                          |    8 +-
6314  drivers/crypto/omap-sham.c                         |   10 +-
6315  drivers/crypto/ux500/cryp/cryp_core.c              |    3 +-
6316  drivers/dma/imx-dma.c                              |  137 +-
6317  drivers/dma/imx-sdma.c                             |    1 -
6318  drivers/dma/ipu/ipu_idmac.c                        |    3 +-
6319  drivers/dma/ipu/ipu_irq.c                          |    3 +-
6320  drivers/dma/omap-dma.c                             |    5 +-
6321  drivers/dma/ste_dma40.c                            |    3 +-
6322  drivers/dma/ste_dma40_ll.c                         |    2 +-
6323  drivers/hwmon/Kconfig                              |    8 +
6324  drivers/hwmon/Makefile                             |    1 +
6325  drivers/hwmon/vexpress.c                           |  229 +++
6326  drivers/i2c/busses/i2c-imx.c                       |   40 +-
6327  drivers/input/keyboard/Kconfig                     |    2 +-
6328  drivers/input/touchscreen/atmel_tsadcc.c           |    2 +-
6329  drivers/irqchip/Kconfig                            |    9 +-
6330  drivers/irqchip/Makefile                           |    1 +
6331  drivers/irqchip/irq-bcm2835.c                      |    3 +-
6332  .../irqchip/irq-versatile-fpga.c                   |   54 +-
6333  drivers/media/platform/omap/omap_vout.c            |    4 +-
6334  drivers/media/platform/omap/omap_vout_vrfb.c       |    6 +-
6335  drivers/media/platform/omap/omap_voutdef.h         |    2 +-
6336  drivers/media/platform/omap3isp/isphist.c          |    2 +
6337  drivers/media/platform/omap3isp/ispstat.h          |    2 +-
6338  drivers/media/platform/omap3isp/ispvideo.c         |    1 -
6339  drivers/media/platform/soc_camera/mx2_camera.c     |   95 +-
6340  drivers/media/platform/soc_camera/mx3_camera.c     |    2 +-
6341  drivers/media/platform/soc_camera/omap1_camera.c   |    3 +-
6342  drivers/media/rc/ir-rx51.c                         |    1 -
6343  drivers/mfd/Kconfig                                |    6 +
6344  drivers/mfd/Makefile                               |    1 +
6345  drivers/mfd/ab8500-core.c                          |   13 +-
6346  drivers/mfd/db8500-prcmu.c                         |   16 +-
6347  drivers/mfd/menelaus.c                             |    2 +-
6348  drivers/mfd/omap-usb-host.c                        |    5 +-
6349  drivers/mfd/omap-usb-tll.c                         |    2 +-
6350  drivers/mfd/omap-usb.h                             |    2 +
6351  drivers/mfd/vexpress-config.c                      |  277 ++++
6352  drivers/mfd/vexpress-sysreg.c                      |  552 +++++++
6353  drivers/mmc/host/atmel-mci.c                       |    2 +-
6354  drivers/mmc/host/mxcmmc.c                          |   31 +-
6355  drivers/mmc/host/omap.c                            |   35 +-
6356  drivers/mmc/host/omap_hsmmc.c                      |    4 +-
6357  drivers/mtd/nand/Kconfig                           |    2 +-
6358  drivers/mtd/nand/mxc_nand.c                        |   96 +-
6359  drivers/mtd/nand/omap2.c                           |  129 +-
6360  drivers/mtd/onenand/omap2.c                        |   47 +-
6361  drivers/net/can/at91_can.c                         |    3 +-
6362  drivers/net/ethernet/cadence/at91_ether.c          |    1 +
6363  drivers/pcmcia/at91_cf.c                           |    2 +-
6364  drivers/pcmcia/omap_cf.c                           |    2 +-
6365  drivers/pinctrl/pinctrl-nomadik.c                  |    3 +-
6366  drivers/rtc/rtc-at91rm9200.c                       |    2 +-
6367  .../at91_rtc.h => drivers/rtc/rtc-at91rm9200.h     |    0
6368  drivers/rtc/rtc-at91sam9.c                         |    2 +-
6369  drivers/rtc/rtc-mxc.c                              |   34 +-
6370  drivers/sh/clk/cpg.c                               |   86 +
6371  drivers/spi/spi-atmel.c                            |    2 +-
6372  .../tidspbridge/include/dspbridge/host_os.h        |    1 -
6373  drivers/tty/serial/atmel_serial.c                  |    2 +-
6374  drivers/usb/gadget/at91_udc.c                      |    2 +-
6375  drivers/usb/gadget/atmel_usba_udc.c                |    2 +-
6376  drivers/usb/gadget/omap_udc.c                      |    4 +-
6377  drivers/usb/host/ehci-mxc.c                        |    1 -
6378  drivers/usb/host/ehci-omap.c                       |    3 +-
6379  drivers/usb/host/ohci-at91.c                       |    2 +-
6380  drivers/usb/host/ohci-omap.c                       |    5 +-
6381  drivers/usb/host/ohci-omap3.c                      |    1 -
6382  drivers/usb/musb/am35x.c                           |    3 +-
6383  drivers/usb/musb/musb_dsps.c                       |    3 +-
6384  drivers/usb/musb/omap2430.h                        |    2 +-
6385  drivers/usb/musb/tusb6010_omap.c                   |    9 +-
6386  drivers/video/atmel_lcdfb.c                        |    2 +-
6387  drivers/video/imxfb.c                              |   38 +-
6388  drivers/video/mx3fb.c                              |    3 +-
6389  drivers/video/omap/lcd_inn1510.c                   |    7 +-
6390  drivers/video/omap/lcdc.c                          |    2 +-
6391  drivers/video/omap/omapfb_main.c                   |    2 +-
6392  drivers/video/omap/sossi.c                         |    2 +-
6393  drivers/video/omap2/dss/core.c                     |    2 +-
6394  drivers/video/omap2/dss/dispc.c                    |   43 +-
6395  drivers/video/omap2/dss/dss.c                      |   39 +-
6396  drivers/video/omap2/dss/dss_features.c             |   64 +-
6397  drivers/video/omap2/dss/dss_features.h             |    5 +-
6398  drivers/video/omap2/dss/hdmi.c                     |    3 +-
6399  drivers/video/omap2/omapfb/omapfb-ioctl.c          |    2 +-
6400  drivers/video/omap2/omapfb/omapfb-main.c           |    8 +-
6401  drivers/video/omap2/omapfb/omapfb-sysfs.c          |    2 +-
6402  drivers/video/omap2/vrfb.c                         |  142 +-
6403  drivers/watchdog/imx2_wdt.c                        |    1 -
6404  include/linux/clk-provider.h                       |   16 +-
6405  .../mach/ipu.h => include/linux/dma/ipu-dma.h      |    6 +-
6406  .../linux/irqchip/versatile-fpga.h                 |    0
6407  include/linux/mfd/db8500-prcmu.h                   |    4 +-
6408  include/linux/mfd/dbx500-prcmu.h                   |   10 +
6409  .../include/plat => include/linux/mfd}/menelaus.h  |    2 -
6410  include/linux/platform_data/asoc-imx-ssi.h         |    2 +
6411  include/linux/platform_data/atmel.h                |   67 +
6412  .../linux/platform_data/clocksource-nomadik-mtu.h  |    2 +-
6413  include/linux/platform_data/crypto-ux500.h         |    2 +-
6414  include/linux/platform_data/dma-imx.h              |    4 +-
6415  .../linux/platform_data/dma-ste-dma40.h            |    0
6416  include/linux/platform_data/gpio-omap.h            |    1 -
6417  .../linux/platform_data/leds-omap.h                |    2 -
6418  .../linux/platform_data/mmc-omap.h                 |   48 +-
6419  include/linux/platform_data/mtd-nand-omap2.h       |   46 +-
6420  include/linux/platform_data/mtd-onenand-omap2.h    |   28 +-
6421  .../linux/platform_data/omap_ocp2scp.h             |   23 +-
6422  include/linux/platform_data/usb-omap.h             |   80 +
6423  include/linux/sh_clk.h                             |    9 +
6424  include/linux/vexpress.h                           |  121 ++
6425  include/video/omapdss.h                            |   14 +
6426  .../plat/vrfb.h => include/video/omapvrfb.h        |    2 +
6427  sound/soc/fsl/imx-pcm-fiq.c                        |    1 -
6428  sound/soc/fsl/imx-ssi.c                            |    1 -
6429  sound/soc/omap/am3517evm.c                         |    2 -
6430  sound/soc/omap/n810.c                              |    1 -
6431  sound/soc/omap/omap-pcm.c                          |    9 +-
6432  sound/soc/omap/osk5912.c                           |    1 -
6433  sound/soc/omap/sdp3430.c                           |    2 -
6434  sound/soc/ux500/ux500_pcm.c                        |    3 +-
6435  868 files changed, 15752 insertions(+), 19274 deletions(-)
6436  create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-reset.txt
6437  create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-system.txt
6438  create mode 100644 Documentation/devicetree/bindings/arm/vexpress-sysreg.txt
6439  create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt
6440  create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
6441  create mode 100644 Documentation/hwmon/vexpress
6442  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
6443  delete mode 100644 arch/arm/boot/compressed/head-vt8500.S
6444  create mode 100644 arch/arm/boot/dts/ccu9540.dts
6445  create mode 100644 arch/arm/boot/dts/ecx-2000.dts
6446  create mode 100644 arch/arm/boot/dts/ecx-common.dtsi
6447  create mode 100644 arch/arm/boot/dts/href.dtsi
6448  create mode 100644 arch/arm/boot/dts/hrefprev60.dts
6449  rename arch/arm/boot/dts/{sh7377.dtsi => sh7372-mackerel.dts} (59%)
6450  create mode 100644 arch/arm/boot/dts/stuib.dtsi
6451  delete mode 100644 arch/arm/configs/afeb9260_defconfig
6452  delete mode 100644 arch/arm/configs/cam60_defconfig
6453  create mode 100644 arch/arm/configs/clps711x_defconfig
6454  delete mode 100644 arch/arm/configs/cpu9260_defconfig
6455  delete mode 100644 arch/arm/configs/cpu9g20_defconfig
6456  delete mode 100644 arch/arm/configs/edb7211_defconfig
6457  delete mode 100644 arch/arm/configs/fortunet_defconfig
6458  delete mode 100644 arch/arm/configs/g3evm_defconfig
6459  delete mode 100644 arch/arm/configs/g4evm_defconfig
6460  delete mode 100644 arch/arm/configs/qil-a9260_defconfig
6461  delete mode 100644 arch/arm/configs/sam9_l9260_defconfig
6462  delete mode 100644 arch/arm/configs/stamp9g20_defconfig
6463  delete mode 100644 arch/arm/configs/usb-a9260_defconfig
6464  rename arch/arm/{plat-mxc/include/mach/debug-macro.S => include/debug/imx.S} (59%)
6465  rename arch/arm/mach-at91/{include/mach => }/at91_aic.h (100%)
6466  rename arch/arm/mach-at91/{include/mach => }/at91_rstc.h (100%)
6467  rename arch/arm/mach-at91/{include/mach => }/at91_shdwc.h (100%)
6468  rename arch/arm/mach-at91/{include/mach => }/at91_tc.h (100%)
6469  rename arch/arm/mach-at91/{include/mach => }/board.h (69%)
6470  rename arch/arm/mach-at91/{include/mach => }/gsia18s.h (100%)
6471  delete mode 100644 arch/arm/mach-at91/include/mach/at91_pit.h
6472  rename arch/arm/mach-at91/{include/mach => }/stamp9g20.h (100%)
6473  delete mode 100644 arch/arm/mach-clps711x/edb7211-mm.c
6474  rename arch/arm/mach-clps711x/{edb7211-arch.c => edb7211.c} (56%)
6475  delete mode 100644 arch/arm/mach-highbank/lluart.c
6476  rename arch/arm/{plat-mxc => mach-imx}/3ds_debugboard.c (99%)
6477  rename arch/arm/{plat-mxc/include/mach => mach-imx}/3ds_debugboard.h (100%)
6478  rename arch/arm/{plat-mxc => mach-imx}/avic.c (98%)
6479  rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lilly.h (100%)
6480  rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31lite.h (100%)
6481  rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-mx31moboard.h (100%)
6482  rename arch/arm/{plat-mxc/include/mach => mach-imx}/board-pcm038.h (100%)
6483  rename arch/arm/{plat-mxc/include/mach => mach-imx}/common.h (99%)
6484  rename arch/arm/{plat-mxc => mach-imx}/cpu.c (97%)
6485  rename arch/arm/{plat-mxc => mach-imx}/cpufreq.c (99%)
6486  rename arch/arm/{plat-mxc => mach-imx}/cpuidle.c (100%)
6487  rename arch/arm/{plat-mxc/include/mach => mach-imx}/cpuidle.h (100%)
6488  rename arch/arm/{plat-mxc => mach-imx}/devices/Kconfig (100%)
6489  rename arch/arm/{plat-mxc => mach-imx}/devices/Makefile (98%)
6490  rename arch/arm/{plat-mxc/include/mach => mach-imx/devices}/devices-common.h (97%)
6491  rename arch/arm/{plat-mxc => mach-imx/devices}/devices.c (92%)
6492  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ahci-imx.c (98%)
6493  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fec.c (97%)
6494  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-flexcan.c (96%)
6495  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-fsl-usb2-udc.c (96%)
6496  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio-mxc.c (96%)
6497  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-gpio_keys.c (94%)
6498  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-dma.c (63%)
6499  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-fb.c (79%)
6500  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-i2c.c (76%)
6501  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-keypad.c (97%)
6502  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-ssi.c (98%)
6503  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx-uart.c (98%)
6504  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx2-wdt.c (97%)
6505  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx21-hcd.c (94%)
6506  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx27-coda.c (93%)
6507  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imx_udc.c (96%)
6508  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-imxdi_rtc.c (94%)
6509  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-ipu-core.c (98%)
6510  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx1-camera.c (94%)
6511  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mx2-camera.c (83%)
6512  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-ehci.c (97%)
6513  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc-mmc.c (76%)
6514  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_nand.c (74%)
6515  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_pwm.c (97%)
6516  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rnga.c (95%)
6517  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_rtc.c (77%)
6518  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-mxc_w1.c (95%)
6519  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-pata_imx.c (96%)
6520  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-sdhci-esdhc-imx.c (98%)
6521  rename arch/arm/{plat-mxc => mach-imx}/devices/platform-spi_imx.c (98%)
6522  rename arch/arm/{plat-mxc => mach-imx}/epit.c (99%)
6523  rename arch/arm/{plat-mxc/include/mach => mach-imx}/eukrea-baseboards.h (100%)
6524  rename arch/arm/{plat-mxc/include/mach => mach-imx}/hardware.h (94%)
6525  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iim.h (100%)
6526  delete mode 100644 arch/arm/mach-imx/include/mach/dma-mx1-mx2.h
6527  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx1.h (99%)
6528  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx21.h (99%)
6529  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx25.h (99%)
6530  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx27.h (99%)
6531  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx2x.h (100%)
6532  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx3.h (100%)
6533  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx35.h (99%)
6534  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx50.h (99%)
6535  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-mx51.h (99%)
6536  rename arch/arm/{plat-mxc => mach-imx}/iomux-v1.c (98%)
6537  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v1.h (100%)
6538  rename arch/arm/{plat-mxc => mach-imx}/iomux-v3.c (97%)
6539  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iomux-v3.h (100%)
6540  rename arch/arm/{plat-mxc/include/mach => mach-imx}/iram.h (100%)
6541  rename arch/arm/{plat-mxc => mach-imx}/iram_alloc.c (98%)
6542  rename arch/arm/{plat-mxc => mach-imx}/irq-common.c (100%)
6543  rename arch/arm/{plat-mxc => mach-imx}/irq-common.h (94%)
6544  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx1.h (100%)
6545  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx21.h (100%)
6546  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx25.h (100%)
6547  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx27.h (100%)
6548  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx2x.h (100%)
6549  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx31.h (100%)
6550  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx35.h (100%)
6551  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx3x.h (100%)
6552  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx50.h (100%)
6553  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx51.h (100%)
6554  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx53.h (100%)
6555  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mx6q.h (100%)
6556  rename arch/arm/{plat-mxc/include/mach => mach-imx}/mxc.h (100%)
6557  rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq-ksym.c (100%)
6558  rename arch/arm/{plat-mxc => mach-imx}/ssi-fiq.S (100%)
6559  rename arch/arm/{plat-mxc => mach-imx}/system.c (97%)
6560  rename arch/arm/{plat-mxc => mach-imx}/time.c (99%)
6561  rename arch/arm/{plat-mxc => mach-imx}/tzic.c (98%)
6562  rename arch/arm/{plat-mxc => mach-imx}/ulpi.c (99%)
6563  rename arch/arm/{plat-mxc/include/mach => mach-imx}/ulpi.h (100%)
6564  create mode 100644 arch/arm/mach-omap1/dma.h
6565  create mode 100644 arch/arm/mach-omap1/fpga.h
6566  delete mode 100644 arch/arm/mach-omap1/include/mach/gpio.h
6567  create mode 100644 arch/arm/mach-omap1/include/mach/serial.h
6568  create mode 100644 arch/arm/mach-omap1/include/mach/soc.h
6569  rename arch/arm/{plat-omap/include/plat => mach-omap1/include/mach}/tc.h (100%)
6570  create mode 100644 arch/arm/mach-omap1/mmc.h
6571  create mode 100644 arch/arm/mach-omap1/soc.h
6572  create mode 100644 arch/arm/mach-omap1/sram-init.c
6573  create mode 100644 arch/arm/mach-omap1/sram.h
6574  rename arch/arm/mach-omap2/{include/mach => }/board-zoom.h (100%)
6575  delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
6576  delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c
6577  delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c
6578  create mode 100644 arch/arm/mach-omap2/cm2xxx.c
6579  create mode 100644 arch/arm/mach-omap2/cm2xxx.h
6580  rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (72%)
6581  create mode 100644 arch/arm/mach-omap2/cm3xxx.h
6582  create mode 100644 arch/arm/mach-omap2/cm_common.c
6583  create mode 100644 arch/arm/mach-omap2/dma.h
6584  create mode 100644 arch/arm/mach-omap2/gpmc-nand.h
6585  create mode 100644 arch/arm/mach-omap2/gpmc-onenand.h
6586  rename arch/arm/{plat-omap/include/plat => mach-omap2}/gpmc.h (67%)
6587  create mode 100644 arch/arm/mach-omap2/i2c.h
6588  delete mode 100644 arch/arm/mach-omap2/include/mach/gpio.h
6589  rename arch/arm/{plat-omap/include/plat => mach-omap2/include/mach}/serial.h (87%)
6590  create mode 100644 arch/arm/mach-omap2/mmc.h
6591  rename arch/arm/{plat-omap => mach-omap2}/omap-pm-noop.c (98%)
6592  rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap-pm.h (100%)
6593  rename arch/arm/{plat-omap => mach-omap2}/omap_device.c (99%)
6594  rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_device.h (99%)
6595  rename arch/arm/{plat-omap/include/plat => mach-omap2}/omap_hwmod.h (98%)
6596  delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c
6597  delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c
6598  delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c
6599  create mode 100644 arch/arm/mach-omap2/prm2xxx.c
6600  create mode 100644 arch/arm/mach-omap2/prm2xxx.h
6601  create mode 100644 arch/arm/mach-omap2/prm3xxx.c
6602  create mode 100644 arch/arm/mach-omap2/prm3xxx.h
6603  create mode 100644 arch/arm/mach-omap2/serial.h
6604  create mode 100644 arch/arm/mach-omap2/sram.c
6605  create mode 100644 arch/arm/mach-omap2/sram.h
6606  create mode 100644 arch/arm/mach-omap2/usb.h
6607  delete mode 100644 arch/arm/mach-shmobile/board-g3evm.c
6608  delete mode 100644 arch/arm/mach-shmobile/board-g4evm.c
6609  delete mode 100644 arch/arm/mach-shmobile/clock-sh7367.c
6610  delete mode 100644 arch/arm/mach-shmobile/clock-sh7377.c
6611  delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h
6612  delete mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h
6613  delete mode 100644 arch/arm/mach-shmobile/intc-sh7367.c
6614  delete mode 100644 arch/arm/mach-shmobile/intc-sh7377.c
6615  delete mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c
6616  delete mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c
6617  delete mode 100644 arch/arm/mach-shmobile/setup-sh7367.c
6618  delete mode 100644 arch/arm/mach-shmobile/setup-sh7377.c
6619  rename arch/arm/{mach-vt8500/include/mach/irqs.h => mach-socfpga/core.h} (61%)
6620  create mode 100644 arch/arm/mach-socfpga/headsmp.S
6621  create mode 100644 arch/arm/mach-socfpga/platsmp.c
6622  create mode 100644 arch/arm/mach-vexpress/reset.c
6623  create mode 100644 arch/arm/mach-vt8500/Kconfig
6624  delete mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S
6625  delete mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h
6626  delete mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h
6627  delete mode 100644 arch/arm/mach-vt8500/include/mach/restart.h
6628  delete mode 100644 arch/arm/plat-mxc/Kconfig
6629  delete mode 100644 arch/arm/plat-mxc/Makefile
6630  delete mode 100644 arch/arm/plat-mxc/include/mach/irqs.h
6631  delete mode 100644 arch/arm/plat-mxc/include/mach/uncompress.h
6632  delete mode 100644 arch/arm/plat-nomadik/Kconfig
6633  delete mode 100644 arch/arm/plat-nomadik/Makefile
6634  delete mode 100644 arch/arm/plat-omap/clock.c
6635  delete mode 100644 arch/arm/plat-omap/common.c
6636  rename arch/arm/plat-omap/include/{plat/dma.h => plat-omap/dma-omap.h} (60%)
6637  delete mode 100644 arch/arm/plat-omap/include/plat/clkdev_omap.h
6638  delete mode 100644 arch/arm/plat-omap/include/plat/clock.h
6639  delete mode 100644 arch/arm/plat-omap/include/plat/common.h
6640  create mode 100644 arch/arm/plat-omap/include/plat/counter-32k.h
6641  rename arch/arm/{mach-omap2 => plat-omap/include/plat}/debug-devices.h (54%)
6642  delete mode 100644 arch/arm/plat-omap/include/plat/dma-44xx.h
6643  delete mode 100644 arch/arm/plat-omap/include/plat/fpga.h
6644  delete mode 100644 arch/arm/plat-omap/include/plat/multi.h
6645  delete mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
6646  delete mode 100644 arch/arm/plat-omap/include/plat/sdrc.h
6647  delete mode 100644 arch/arm/plat-omap/include/plat/uncompress.h
6648  delete mode 100644 arch/arm/plat-omap/include/plat/usb.h
6649  delete mode 100644 arch/arm/plat-omap/sram.h
6650  create mode 100644 drivers/clk/clk-twl6040.c
6651  create mode 100644 drivers/clk/versatile/clk-vexpress-osc.c
6652  create mode 100644 drivers/clk/versatile/clk-vexpress.c
6653  rename arch/arm/plat-nomadik/timer.c => drivers/clocksource/nomadik-mtu.c (95%)
6654  create mode 100644 drivers/hwmon/vexpress.c
6655  rename arch/arm/plat-versatile/fpga-irq.c => drivers/irqchip/irq-versatile-fpga.c (83%)
6656  create mode 100644 drivers/mfd/omap-usb.h
6657  create mode 100644 drivers/mfd/vexpress-config.c
6658  create mode 100644 drivers/mfd/vexpress-sysreg.c
6659  rename arch/arm/mach-at91/include/mach/at91_rtc.h => drivers/rtc/rtc-at91rm9200.h (100%)
6660  rename arch/arm/plat-mxc/include/mach/ipu.h => include/linux/dma/ipu-dma.h (97%)
6661  rename arch/arm/plat-versatile/include/plat/fpga-irq.h => include/linux/irqchip/versatile-fpga.h (100%)
6662  rename {arch/arm/plat-omap/include/plat => include/linux/mfd}/menelaus.h (96%)
6663  rename arch/arm/plat-nomadik/include/plat/mtu.h => include/linux/platform_data/clocksource-nomadik-mtu.h (71%)
6664  rename arch/arm/plat-nomadik/include/plat/ste_dma40.h => include/linux/platform_data/dma-ste-dma40.h (100%)
6665  rename arch/arm/plat-omap/include/plat/led.h => include/linux/platform_data/leds-omap.h (91%)
6666  rename arch/arm/plat-omap/include/plat/mmc.h => include/linux/platform_data/mmc-omap.h (80%)
6667  rename arch/arm/plat-mxc/include/mach/timex.h => include/linux/platform_data/omap_ocp2scp.h (53%)
6668  create mode 100644 include/linux/platform_data/usb-omap.h
6669  create mode 100644 include/linux/vexpress.h
6670  rename arch/arm/plat-omap/include/plat/vrfb.h => include/video/omapvrfb.h (95%)
6671 Merging bcm2835/for-next (d7f292e Merge branch 'for-3.8/defconfig' into for-next)
6672 $ git merge bcm2835/for-next
6673 Auto-merging arch/arm/Kconfig
6674 Merge made by the 'recursive' strategy.
6675  .../bindings/watchdog/brcm,bcm2835-pm-wdog.txt     |   13 +++++
6676  arch/arm/Kconfig                                   |    5 +-
6677  arch/arm/boot/dts/bcm2835-rpi-b.dts                |   15 ++++++
6678  arch/arm/boot/dts/bcm2835.dtsi                     |   28 +++++++++++
6679  arch/arm/configs/bcm2835_defconfig                 |    2 -
6680  arch/arm/mach-bcm2835/Makefile.boot                |    4 +-
6681  arch/arm/mach-bcm2835/bcm2835.c                    |   50 +++++++++++++++++++-
6682  arch/arm/mach-bcm2835/include/mach/gpio.h          |    1 +
6683  drivers/clk/clk-bcm2835.c                          |    2 +-
6684  9 files changed, 111 insertions(+), 9 deletions(-)
6685  create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm2835-pm-wdog.txt
6686  create mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h
6687 Merging cortex/for-next (77a3018 Cortex-M3: Add support for exception handling)
6688 $ git merge cortex/for-next
6689 Auto-merging arch/arm/mm/mmu.c
6690 Auto-merging arch/arm/mm/alignment.c
6691 Auto-merging arch/arm/kernel/process.c
6692 Merge made by the 'recursive' strategy.
6693  arch/arm/include/asm/assembler.h   |   13 ++-
6694  arch/arm/include/asm/cp15.h        |   11 ++-
6695  arch/arm/include/asm/cputype.h     |    3 +
6696  arch/arm/include/asm/glue-cache.h  |   25 ++++++
6697  arch/arm/include/asm/glue-df.h     |    8 ++
6698  arch/arm/include/asm/glue-proc.h   |    9 ++
6699  arch/arm/include/asm/irqflags.h    |   22 +++--
6700  arch/arm/include/asm/processor.h   |    7 ++
6701  arch/arm/include/asm/ptrace.h      |    8 ++
6702  arch/arm/include/asm/system_info.h |    1 +
6703  arch/arm/include/uapi/asm/ptrace.h |   36 ++++++--
6704  arch/arm/kernel/asm-offsets.c      |    3 +
6705  arch/arm/kernel/entry-common.S     |    4 +
6706  arch/arm/kernel/entry-header.S     |  148 +++++++++++++++++++++++++++++++++
6707  arch/arm/kernel/entry-v7m.S        |  134 ++++++++++++++++++++++++++++++
6708  arch/arm/kernel/head-common.S      |    9 +-
6709  arch/arm/kernel/head-nommu.S       |    9 +-
6710  arch/arm/kernel/process.c          |    4 +
6711  arch/arm/kernel/ptrace.c           |    3 +
6712  arch/arm/kernel/setup.c            |   13 ++-
6713  arch/arm/kernel/traps.c            |    2 +
6714  arch/arm/mm/alignment.c            |    2 +
6715  arch/arm/mm/mmu.c                  |   17 ++++
6716  arch/arm/mm/nommu.c                |    2 +
6717  arch/arm/mm/proc-v7m.S             |  161 ++++++++++++++++++++++++++++++++++++
6718  25 files changed, 632 insertions(+), 22 deletions(-)
6719  create mode 100644 arch/arm/kernel/entry-v7m.S
6720  create mode 100644 arch/arm/mm/proc-v7m.S
6721 Merging ep93xx/ep93xx-for-next (fab1f74 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
6722 $ git merge ep93xx/ep93xx-for-next
6723 Already up-to-date!
6724 Merge made by the 'recursive' strategy.
6725 Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
6726 $ git merge ixp4xx/next
6727 Auto-merging drivers/crypto/Kconfig
6728 Auto-merging drivers/char/hw_random/Kconfig
6729 Merge made by the 'recursive' strategy.
6730  arch/arm/mach-ixp4xx/common-pci.c               |    1 +
6731  arch/arm/mach-ixp4xx/common.c                   |   13 +++----
6732  arch/arm/mach-ixp4xx/goramo_mlr.c               |    3 +-
6733  arch/arm/mach-ixp4xx/include/mach/debug-macro.S |    4 +-
6734  arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h |   46 ++++++++++-------------
6735  arch/arm/mach-ixp4xx/include/mach/qmgr.h        |   12 +++---
6736  arch/arm/mach-ixp4xx/ixp4xx_npe.c               |    9 ++++-
6737  arch/arm/mach-ixp4xx/ixp4xx_qmgr.c              |   12 +-----
6738  drivers/char/hw_random/Kconfig                  |    6 +--
6739  drivers/char/hw_random/ixp4xx-rng.c             |    5 ++-
6740  drivers/crypto/Kconfig                          |    2 +-
6741  drivers/crypto/ixp4xx_crypto.c                  |   12 +++---
6742  drivers/net/wan/ixp4xx_hss.c                    |    2 +-
6743  13 files changed, 59 insertions(+), 68 deletions(-)
6744 Merging msm/for-next (a0d271c Linux 3.6)
6745 $ git merge msm/for-next
6746 Already up-to-date.
6747 Merging renesas/next (07efb0c Merge branches 'heads/fixes', 'heads/defconfig' and 'heads/soc2' into next)
6748 $ git merge renesas/next
6749 Already up-to-date!
6750 Merge made by the 'recursive' strategy.
6751 Merging samsung/for-next (a9fe9f0 Merge branch 'next/cleanup-samsung-2' into for-next)
6752 $ git merge samsung/for-next
6753 Auto-merging drivers/pinctrl/pinctrl-exynos.c
6754 Removing arch/arm/mach-exynos/dev-drm.c
6755 Auto-merging arch/arm/boot/dts/Makefile
6756 Merge made by the 'recursive' strategy.
6757  .../devicetree/bindings/drm/exynos/hdmi.txt        |   22 +
6758  .../devicetree/bindings/drm/exynos/hdmiddc.txt     |   12 +
6759  .../devicetree/bindings/drm/exynos/hdmiphy.txt     |   12 +
6760  .../devicetree/bindings/drm/exynos/mixer.txt       |   15 +
6761  .../devicetree/bindings/media/s5p-mfc.txt          |   23 +
6762  .../bindings/pinctrl/samsung-pinctrl.txt           |  119 ++-
6763  arch/arm/boot/dts/Makefile                         |    1 +
6764  arch/arm/boot/dts/exynos4210-origen.dts            |   16 +
6765  arch/arm/boot/dts/exynos4210-pinctrl.dtsi          |  278 ++++++
6766  arch/arm/boot/dts/exynos4210-smdkv310.dts          |   16 +
6767  arch/arm/boot/dts/exynos4210.dtsi                  |  244 +----
6768  arch/arm/boot/dts/exynos4212.dtsi                  |   28 +
6769  arch/arm/boot/dts/exynos4412-smdk4412.dts          |   45 +
6770  arch/arm/boot/dts/exynos4412.dtsi                  |   28 +
6771  arch/arm/boot/dts/exynos4x12-pinctrl.dtsi          |  965 ++++++++++++++++++++
6772  arch/arm/boot/dts/exynos4x12.dtsi                  |   69 ++
6773  arch/arm/boot/dts/exynos5250-smdk5250.dts          |   29 +-
6774  arch/arm/boot/dts/exynos5250.dtsi                  |   32 +
6775  arch/arm/mach-exynos/Kconfig                       |    1 +
6776  arch/arm/mach-exynos/Makefile                      |    1 -
6777  arch/arm/mach-exynos/clock-exynos4.c               |    9 +-
6778  arch/arm/mach-exynos/clock-exynos5.c               |   44 +-
6779  arch/arm/mach-exynos/common.c                      |   39 +-
6780  arch/arm/mach-exynos/dev-audio.c                   |    2 +-
6781  arch/arm/mach-exynos/dev-drm.c                     |   29 -
6782  arch/arm/mach-exynos/dev-ohci.c                    |    2 +-
6783  arch/arm/mach-exynos/dev-uart.c                    |   24 -
6784  arch/arm/mach-exynos/include/mach/irqs.h           |    8 +-
6785  arch/arm/mach-exynos/include/mach/map.h            |    3 +-
6786  arch/arm/mach-exynos/include/mach/regs-pmu.h       |    2 -
6787  arch/arm/mach-exynos/mach-exynos4-dt.c             |    4 +
6788  arch/arm/mach-exynos/mach-exynos5-dt.c             |   26 +
6789  arch/arm/mach-exynos/mach-nuri.c                   |   10 +-
6790  arch/arm/mach-exynos/mach-origen.c                 |    9 +-
6791  arch/arm/mach-exynos/mach-smdk4x12.c               |    5 +-
6792  arch/arm/mach-exynos/mach-smdkv310.c               |    9 +-
6793  arch/arm/mach-exynos/mach-universal_c210.c         |    8 +-
6794  arch/arm/mach-s3c64xx/clock.c                      |    4 -
6795  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |  141 ++-
6796  arch/arm/mach-s3c64xx/mach-crag6410.c              |   29 +-
6797  arch/arm/mach-s5pv210/mach-goni.c                  |    1 -
6798  arch/arm/plat-samsung/clock.c                      |   75 +-
6799  arch/arm/plat-samsung/devs.c                       |    5 +-
6800  arch/arm/plat-samsung/include/plat/devs.h          |    2 -
6801  arch/arm/plat-samsung/include/plat/gpio-core.h     |    2 +
6802  arch/arm/plat-samsung/include/plat/mfc.h           |   11 +
6803  arch/arm/plat-samsung/s5p-dev-mfc.c                |   34 +
6804  arch/arm/plat-samsung/s5p-irq-gpioint.c            |    8 +-
6805  drivers/gpio/gpio-samsung.c                        |   68 +-
6806  drivers/pinctrl/pinctrl-exynos.c                   |  477 ++++++----
6807  drivers/pinctrl/pinctrl-exynos.h                   |  170 +---
6808  drivers/pinctrl/pinctrl-samsung.c                  |  205 +++--
6809  drivers/pinctrl/pinctrl-samsung.h                  |   30 +-
6810  53 files changed, 2574 insertions(+), 877 deletions(-)
6811  create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
6812  create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
6813  create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
6814  create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
6815  create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
6816  create mode 100644 arch/arm/boot/dts/exynos4212.dtsi
6817  create mode 100644 arch/arm/boot/dts/exynos4412-smdk4412.dts
6818  create mode 100644 arch/arm/boot/dts/exynos4412.dtsi
6819  create mode 100644 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
6820  create mode 100644 arch/arm/boot/dts/exynos4x12.dtsi
6821  delete mode 100644 arch/arm/mach-exynos/dev-drm.c
6822 Merging tegra/for-next (73bf078 Merge branch 'for-3.8/defconfig' into for-next)
6823 $ git merge tegra/for-next
6824 Auto-merging include/linux/tegra-ahb.h
6825 Auto-merging drivers/crypto/tegra-aes.c
6826 Auto-merging arch/arm/mach-tegra/sleep-tegra30.S
6827 Auto-merging arch/arm/mach-tegra/sleep-tegra20.S
6828 Auto-merging arch/arm/mach-tegra/irammap.h
6829 Auto-merging arch/arm/mach-tegra/iomap.h
6830 Removing arch/arm/mach-tegra/include/mach/irqs.h
6831 Removing arch/arm/mach-tegra/include/mach/dma.h
6832 Removing arch/arm/mach-tegra/include/mach/debug-macro.S
6833 Auto-merging arch/arm/Kconfig.debug
6834 Auto-merging arch/arm/Kconfig
6835 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
6836 Merge made by the 'recursive' strategy.
6837  .../devicetree/bindings/rtc/nvidia,tegra20-rtc.txt |   19 ++
6838  .../bindings/timer/nvidia,tegra20-timer.txt        |   21 ++
6839  .../bindings/timer/nvidia,tegra30-timer.txt        |   23 ++
6840  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
6841  arch/arm/Kconfig                                   |    1 +
6842  arch/arm/Kconfig.debug                             |   38 ++++
6843  arch/arm/boot/dts/tegra20-harmony.dts              |   68 ++----
6844  arch/arm/boot/dts/tegra20-paz00.dts                |   59 ++----
6845  arch/arm/boot/dts/tegra20-seaboard.dts             |   65 ++----
6846  arch/arm/boot/dts/tegra20-tamonten.dtsi            |  137 +++++++-----
6847  arch/arm/boot/dts/tegra20-tec.dts                  |    3 -
6848  arch/arm/boot/dts/tegra20-ventana.dts              |  149 ++++++++-----
6849  arch/arm/boot/dts/tegra20-whistler.dts             |  119 +++--------
6850  arch/arm/boot/dts/tegra20.dtsi                     |   70 ++++++
6851  arch/arm/boot/dts/tegra30-cardhu-a02.dts           |    6 +
6852  arch/arm/boot/dts/tegra30-cardhu-a04.dts           |    6 +
6853  arch/arm/boot/dts/tegra30-cardhu.dtsi              |   84 ++++----
6854  arch/arm/boot/dts/tegra30.dtsi                     |   92 ++++++++
6855  arch/arm/configs/tegra_defconfig                   |    6 +-
6856  arch/arm/include/debug/tegra.S                     |  223 ++++++++++++++++++++
6857  arch/arm/mach-tegra/Kconfig                        |   51 -----
6858  arch/arm/mach-tegra/Makefile                       |   11 +-
6859  arch/arm/mach-tegra/apbio.c                        |    5 +-
6860  arch/arm/mach-tegra/board-dt-tegra20.c             |   16 +-
6861  arch/arm/mach-tegra/board-dt-tegra30.c             |   19 +-
6862  arch/arm/mach-tegra/clock.c                        |    2 -
6863  arch/arm/mach-tegra/common.c                       |   29 +--
6864  arch/arm/mach-tegra/cpu-tegra.c                    |    3 -
6865  arch/arm/mach-tegra/cpuidle-tegra20.c              |   66 ++++++
6866  arch/arm/mach-tegra/cpuidle-tegra30.c              |  188 +++++++++++++++++
6867  arch/arm/mach-tegra/cpuidle.c                      |   85 ++------
6868  arch/arm/mach-tegra/cpuidle.h                      |   32 +++
6869  arch/arm/mach-tegra/flowctrl.c                     |   50 ++++-
6870  arch/arm/mach-tegra/flowctrl.h                     |    8 +
6871  arch/arm/mach-tegra/fuse.c                         |    3 +-
6872  arch/arm/mach-tegra/headsmp.S                      |   63 +++++-
6873  arch/arm/mach-tegra/include/mach/debug-macro.S     |  100 ---------
6874  arch/arm/mach-tegra/include/mach/dma.h             |   54 -----
6875  arch/arm/mach-tegra/include/mach/irqs.h            |  182 ----------------
6876  arch/arm/mach-tegra/include/mach/powergate.h       |    2 +
6877  arch/arm/mach-tegra/include/mach/uncompress.h      |   67 +-----
6878  arch/arm/mach-tegra/io.c                           |    3 +-
6879  arch/arm/mach-tegra/{include/mach => }/iomap.h     |   16 --
6880  arch/arm/mach-tegra/{include/mach => }/irammap.h   |    9 -
6881  arch/arm/mach-tegra/irq.c                          |    3 +-
6882  arch/arm/mach-tegra/pcie.c                         |    5 +-
6883  arch/arm/mach-tegra/platsmp.c                      |    3 +-
6884  arch/arm/mach-tegra/pm.c                           |  218 +++++++++++++++++++
6885  arch/arm/mach-tegra/pm.h                           |   33 +++
6886  arch/arm/mach-tegra/pmc.c                          |    2 +-
6887  arch/arm/mach-tegra/powergate.c                    |    2 +-
6888  arch/arm/mach-tegra/reset.c                        |   11 +-
6889  arch/arm/mach-tegra/reset.h                        |    9 +
6890  .../mach-tegra/{sleep-t20.S => sleep-tegra20.S}    |    2 -
6891  .../mach-tegra/{sleep-t30.S => sleep-tegra30.S}    |   68 +++++-
6892  arch/arm/mach-tegra/sleep.S                        |   73 ++++++-
6893  arch/arm/mach-tegra/sleep.h                        |    7 +-
6894  arch/arm/mach-tegra/tegra20_clocks.c               |    3 +-
6895  arch/arm/mach-tegra/tegra20_clocks_data.c          |    2 -
6896  arch/arm/mach-tegra/tegra2_emc.c                   |    2 -
6897  arch/arm/mach-tegra/tegra30_clocks.c               |  215 ++++++++++++++++++-
6898  arch/arm/mach-tegra/tegra30_clocks.h               |    1 +
6899  arch/arm/mach-tegra/tegra30_clocks_data.c          |   46 ++++
6900  arch/arm/mach-tegra/tegra_cpu_car.h                |   37 ++++
6901  arch/arm/mach-tegra/timer.c                        |   78 ++++---
6902  drivers/amba/tegra-ahb.c                           |    1 +
6903  drivers/crypto/tegra-aes.c                         |    2 -
6904  drivers/iommu/tegra-smmu.c                         |    4 +-
6905  drivers/staging/nvec/nvec.c                        |    1 -
6906  .../include/mach => include/linux}/tegra-ahb.h     |    6 +-
6907  sound/soc/tegra/tegra30_ahub.c                     |    1 -
6908  sound/soc/tegra/tegra_pcm.h                        |    2 -
6909  72 files changed, 2077 insertions(+), 1014 deletions(-)
6910  create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
6911  create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
6912  create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
6913  create mode 100644 arch/arm/include/debug/tegra.S
6914  create mode 100644 arch/arm/mach-tegra/cpuidle-tegra20.c
6915  create mode 100644 arch/arm/mach-tegra/cpuidle-tegra30.c
6916  create mode 100644 arch/arm/mach-tegra/cpuidle.h
6917  delete mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
6918  delete mode 100644 arch/arm/mach-tegra/include/mach/dma.h
6919  delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
6920  rename arch/arm/mach-tegra/{include/mach => }/iomap.h (93%)
6921  rename arch/arm/mach-tegra/{include/mach => }/irammap.h (73%)
6922  create mode 100644 arch/arm/mach-tegra/pm.c
6923  create mode 100644 arch/arm/mach-tegra/pm.h
6924  rename arch/arm/mach-tegra/{sleep-t20.S => sleep-tegra20.S} (98%)
6925  rename arch/arm/mach-tegra/{sleep-t30.S => sleep-tegra30.S} (63%)
6926  rename {arch/arm/mach-tegra/include/mach => include/linux}/tegra-ahb.h (86%)
6927 Merging kvmtool/master (cfb8234 kvm tools: Fast A20 gate emulation)
6928 $ git merge kvmtool/master
6929 Merge made by the 'recursive' strategy.
6930  tools/kvm/Makefile                      |    3 +++
6931  tools/kvm/builtin-balloon.c             |    4 ++--
6932  tools/kvm/builtin-run.c                 |   17 +++++++++++++++--
6933  tools/kvm/builtin-setup.c               |    4 ----
6934  tools/kvm/disk/core.c                   |    2 ++
6935  tools/kvm/hw/rtc.c                      |   30 ++++++++++++++++++------------
6936  tools/kvm/hw/serial.c                   |   10 +++++-----
6937  tools/kvm/include/kvm/kvm.h             |    6 ++++++
6938  tools/kvm/include/kvm/mutex.h           |   20 +++++++++++++-------
6939  tools/kvm/include/kvm/parse-options.h   |   22 +++++++++++-----------
6940  tools/kvm/include/kvm/qcow.h            |    2 +-
6941  tools/kvm/include/kvm/rbtree-interval.h |    3 ++-
6942  tools/kvm/include/kvm/threadpool.h      |    4 ++--
6943  tools/kvm/include/kvm/uip.h             |   10 +++++-----
6944  tools/kvm/ioeventfd.c                   |    2 ++
6945  tools/kvm/kvm-ipc.c                     |    2 ++
6946  tools/kvm/net/uip/buf.c                 |    4 ++--
6947  tools/kvm/net/uip/core.c                |    6 +++---
6948  tools/kvm/net/uip/tcp.c                 |    9 ++++++---
6949  tools/kvm/net/uip/udp.c                 |    5 ++++-
6950  tools/kvm/pci.c                         |    4 ++--
6951  tools/kvm/ui/sdl.c                      |    2 ++
6952  tools/kvm/ui/vnc.c                      |    2 ++
6953  tools/kvm/util/rbtree-interval.c        |    6 +++++-
6954  tools/kvm/util/threadpool.c             |   10 ++++++----
6955  tools/kvm/virtio/blk.c                  |    6 ++++--
6956  tools/kvm/virtio/console.c              |    4 ++--
6957  tools/kvm/virtio/net.c                  |   18 +++++++++++-------
6958  tools/kvm/virtio/pci.c                  |   11 ++++++++---
6959  tools/kvm/x86/ioport.c                  |   22 ++++++++++++++++++++++
6960  30 files changed, 168 insertions(+), 82 deletions(-)
6961 Merging dma-mapping/dma-mapping-next (f75b86d mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls)
6962 $ git merge dma-mapping/dma-mapping-next
6963 Merge made by the 'recursive' strategy.
6964  mm/dmapool.c |   27 +++++++--------------------
6965  1 file changed, 7 insertions(+), 20 deletions(-)
6966 Merging pwm/for-next (5bca7cc pwm: spear: Staticize spear_pwm_config())
6967 $ git merge pwm/for-next
6968 Merge made by the 'recursive' strategy.
6969  .../devicetree/bindings/pwm/spear-pwm.txt          |   18 ++
6970  .../devicetree/bindings/pwm/vt8500-pwm.txt         |   17 ++
6971  drivers/pwm/Kconfig                                |   11 +
6972  drivers/pwm/Makefile                               |    1 +
6973  drivers/pwm/pwm-spear.c                            |  276 ++++++++++++++++++++
6974  drivers/pwm/pwm-vt8500.c                           |   86 ++++--
6975  6 files changed, 386 insertions(+), 23 deletions(-)
6976  create mode 100644 Documentation/devicetree/bindings/pwm/spear-pwm.txt
6977  create mode 100644 Documentation/devicetree/bindings/pwm/vt8500-pwm.txt
6978  create mode 100644 drivers/pwm/pwm-spear.c
6979 Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
6980 $ git merge dma-buf/for-next
6981 Auto-merging drivers/base/dma-buf.c
6982 Merge made by the 'recursive' strategy.
6983  drivers/base/dma-buf.c |    2 ++
6984  1 file changed, 2 insertions(+)
6985 Merging userns/for-next (e9069f4 btrfs: Fix compilation with user namespace support enabled)
6986 $ git merge userns/for-next
6987 Already up-to-date.
6988 Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
6989 $ git merge ktest/for-next
6990 Already up-to-date.
6991 Merging signal/for-next (fae4535 frv: switch to generic fork/vfork/clone)
6992 $ git merge signal/for-next
6993 Resolved 'arch/arm/kernel/process.c' using previous resolution.
6994 Resolved 'arch/sparc/kernel/sys_sparc_64.c' using previous resolution.
6995 Auto-merging kernel/fork.c
6996 Auto-merging kernel/auditsc.c
6997 Auto-merging include/linux/syscalls.h
6998 Auto-merging include/linux/sched.h
6999 Auto-merging drivers/staging/gdm72xx/gdm_usb.c
7000 Auto-merging arch/x86/syscalls/syscall_32.tbl
7001 Auto-merging arch/x86/kernel/process.c
7002 Auto-merging arch/x86/Kconfig
7003 Auto-merging arch/sparc/kernel/systbls_64.S
7004 Auto-merging arch/sparc/kernel/sys_sparc_64.c
7005 CONFLICT (content): Merge conflict in arch/sparc/kernel/sys_sparc_64.c
7006 Auto-merging arch/sparc/kernel/process_64.c
7007 Auto-merging arch/sparc/include/asm/thread_info_64.h
7008 Auto-merging arch/sparc/include/asm/processor_64.h
7009 Auto-merging arch/sparc/Kconfig
7010 Removing arch/sh/kernel/sys_sh64.c
7011 Auto-merging arch/s390/kernel/entry64.S
7012 Auto-merging arch/s390/Kconfig
7013 Auto-merging arch/powerpc/include/asm/unistd.h
7014 Auto-merging arch/mips/kernel/scall64-n32.S
7015 Auto-merging arch/mips/kernel/mips_ksyms.c
7016 Auto-merging arch/mips/include/asm/processor.h
7017 Auto-merging arch/mips/Kconfig
7018 Auto-merging arch/microblaze/kernel/process.c
7019 Auto-merging arch/microblaze/kernel/entry.S
7020 Auto-merging arch/microblaze/kernel/entry-nommu.S
7021 Auto-merging arch/microblaze/include/asm/unistd.h
7022 Auto-merging arch/cris/include/asm/unistd.h
7023 Auto-merging arch/blackfin/include/asm/unistd.h
7024 Removing arch/avr32/kernel/sys_avr32.c
7025 Auto-merging arch/avr32/Kconfig
7026 Auto-merging arch/arm64/kernel/process.c
7027 Auto-merging arch/arm/kernel/process.c
7028 CONFLICT (content): Merge conflict in arch/arm/kernel/process.c
7029 Auto-merging arch/arm/kernel/entry-common.S
7030 Auto-merging arch/arm/kernel/calls.S
7031 Auto-merging arch/arm/Kconfig
7032 Automatic merge failed; fix conflicts and then commit the result.
7033 $ git commit -v -a
7034 [master 4f2856d] Merge remote-tracking branch 'signal/for-next'
7035 $ git diff -M --stat --summary HEAD^..
7036  arch/Kconfig                            |   11 ++
7037  arch/alpha/include/asm/unistd.h         |    3 +
7038  arch/alpha/kernel/binfmt_loader.c       |    4 +-
7039  arch/alpha/kernel/entry.S               |   51 ++------
7040  arch/alpha/kernel/process.c             |   62 ++-------
7041  arch/alpha/kernel/signal.c              |   16 +--
7042  arch/alpha/kernel/systbls.S             |    6 +-
7043  arch/arm/Kconfig                        |    1 +
7044  arch/arm/include/asm/unistd.h           |    3 +
7045  arch/arm/kernel/calls.S                 |    6 +-
7046  arch/arm/kernel/entry-common.S          |   16 ---
7047  arch/arm/kernel/process.c               |   11 +-
7048  arch/arm/kernel/sys_arm.c               |   31 -----
7049  arch/arm64/include/asm/syscalls.h       |   11 +-
7050  arch/arm64/include/asm/unistd32.h       |    6 +-
7051  arch/arm64/kernel/entry.S               |    5 -
7052  arch/arm64/kernel/process.c             |   10 +-
7053  arch/arm64/kernel/sys.c                 |   11 +-
7054  arch/arm64/kernel/sys32.S               |   14 --
7055  arch/arm64/kernel/sys_compat.c          |   20 +--
7056  arch/avr32/Kconfig                      |    2 +
7057  arch/avr32/include/asm/processor.h      |    3 -
7058  arch/avr32/include/asm/unistd.h         |    1 +
7059  arch/avr32/kernel/Makefile              |    2 +-
7060  arch/avr32/kernel/entry-avr32b.S        |   14 +-
7061  arch/avr32/kernel/process.c             |   88 +++----------
7062  arch/avr32/kernel/sys_avr32.c           |   24 ----
7063  arch/avr32/kernel/syscall-stubs.S       |    6 -
7064  arch/avr32/kernel/syscall_table.S       |    2 +-
7065  arch/blackfin/Kconfig                   |    2 +
7066  arch/blackfin/include/asm/processor.h   |    2 -
7067  arch/blackfin/include/asm/unistd.h      |    1 +
7068  arch/blackfin/kernel/entry.S            |   22 ++--
7069  arch/blackfin/kernel/process.c          |   75 +++--------
7070  arch/blackfin/mach-common/entry.S       |   55 --------
7071  arch/c6x/Kconfig                        |    1 +
7072  arch/c6x/include/uapi/asm/unistd.h      |    1 -
7073  arch/c6x/kernel/entry.S                 |   12 +-
7074  arch/cris/Kconfig                       |    2 +
7075  arch/cris/arch-v10/kernel/entry.S       |   17 +--
7076  arch/cris/arch-v10/kernel/process.c     |  106 ++++-----------
7077  arch/cris/arch-v32/kernel/entry.S       |   22 ++--
7078  arch/cris/arch-v32/kernel/process.c     |   96 ++++----------
7079  arch/cris/include/asm/processor.h       |    2 -
7080  arch/cris/include/asm/unistd.h          |    1 +
7081  arch/cris/kernel/crisksyms.c            |    1 -
7082  arch/frv/include/asm/unistd.h           |    3 +
7083  arch/frv/kernel/process.c               |   45 +------
7084  arch/h8300/Kconfig                      |    2 +
7085  arch/h8300/include/asm/processor.h      |    2 -
7086  arch/h8300/include/asm/ptrace.h         |    2 +
7087  arch/h8300/include/asm/unistd.h         |    1 +
7088  arch/h8300/kernel/entry.S               |    9 ++
7089  arch/h8300/kernel/h8300_ksyms.c         |    1 -
7090  arch/h8300/kernel/process.c             |   62 ++-------
7091  arch/h8300/kernel/sys_h8300.c           |   26 ----
7092  arch/hexagon/Kconfig                    |    2 +
7093  arch/hexagon/include/asm/processor.h    |    1 -
7094  arch/hexagon/include/asm/syscall.h      |    3 -
7095  arch/hexagon/include/uapi/asm/ptrace.h  |    4 +
7096  arch/hexagon/include/uapi/asm/unistd.h  |    1 +
7097  arch/hexagon/kernel/process.c           |  102 +++++----------
7098  arch/hexagon/kernel/signal.c            |    4 +-
7099  arch/hexagon/kernel/syscall.c           |   44 +------
7100  arch/hexagon/kernel/vm_entry.S          |    4 +
7101  arch/ia64/Kconfig                       |    2 +
7102  arch/ia64/include/asm/processor.h       |   16 ---
7103  arch/ia64/include/asm/unistd.h          |    1 +
7104  arch/ia64/kernel/entry.S                |   39 +++---
7105  arch/ia64/kernel/head.S                 |   13 --
7106  arch/ia64/kernel/process.c              |  158 +++++++++-------------
7107  arch/m32r/Kconfig                       |    2 +
7108  arch/m32r/include/asm/processor.h       |    5 -
7109  arch/m32r/include/asm/ptrace.h          |    2 +
7110  arch/m32r/include/asm/unistd.h          |    1 +
7111  arch/m32r/kernel/entry.S                |    9 ++
7112  arch/m32r/kernel/m32r_ksyms.c           |    1 -
7113  arch/m32r/kernel/process.c              |  106 ++++-----------
7114  arch/m32r/kernel/sys_m32r.c             |   21 ---
7115  arch/m68k/Kconfig                       |    1 +
7116  arch/m68k/include/asm/unistd.h          |    3 +-
7117  arch/m68k/kernel/entry.S                |   30 ++---
7118  arch/m68k/kernel/process.c              |   86 +++++-------
7119  arch/m68k/kernel/syscalltable.S         |    6 +-
7120  arch/microblaze/Kconfig                 |    2 +
7121  arch/microblaze/include/asm/processor.h |    8 +-
7122  arch/microblaze/include/asm/unistd.h    |    1 +
7123  arch/microblaze/kernel/entry-nommu.S    |   12 +-
7124  arch/microblaze/kernel/entry.S          |   13 +-
7125  arch/microblaze/kernel/process.c        |   72 +++-------
7126  arch/microblaze/kernel/sys_microblaze.c |   39 ------
7127  arch/mips/Kconfig                       |    2 +
7128  arch/mips/include/asm/processor.h       |    2 -
7129  arch/mips/include/asm/ptrace.h          |    6 +
7130  arch/mips/include/asm/unistd.h          |    1 +
7131  arch/mips/kernel/entry.S                |    6 +
7132  arch/mips/kernel/linux32.c              |   21 ---
7133  arch/mips/kernel/mips_ksyms.c           |    2 -
7134  arch/mips/kernel/process.c              |   62 ++++-----
7135  arch/mips/kernel/scall64-n32.S          |    2 +-
7136  arch/mips/kernel/scall64-o32.S          |    2 +-
7137  arch/mips/kernel/syscall.c              |   53 --------
7138  arch/mn10300/Kconfig                    |    1 +
7139  arch/mn10300/include/asm/unistd.h       |    1 -
7140  arch/mn10300/kernel/entry.S             |    7 +-
7141  arch/openrisc/Kconfig                   |    2 +
7142  arch/openrisc/include/asm/processor.h   |    2 -
7143  arch/openrisc/include/uapi/asm/unistd.h |    2 +
7144  arch/openrisc/kernel/entry.S            |   43 +++---
7145  arch/openrisc/kernel/process.c          |  163 ++++++++---------------
7146  arch/parisc/Kconfig                     |    2 +
7147  arch/parisc/include/asm/processor.h     |    1 -
7148  arch/parisc/include/asm/unistd.h        |    1 +
7149  arch/parisc/kernel/entry.S              |  217 +++----------------------------
7150  arch/parisc/kernel/process.c            |   96 +++-----------
7151  arch/parisc/kernel/sys_parisc32.c       |   22 ----
7152  arch/parisc/kernel/syscall_table.S      |    2 +-
7153  arch/powerpc/Kconfig                    |    2 +
7154  arch/powerpc/include/asm/syscalls.h     |    9 --
7155  arch/powerpc/include/asm/unistd.h       |    4 +-
7156  arch/powerpc/kernel/entry_32.S          |    5 -
7157  arch/powerpc/kernel/entry_64.S          |    8 +-
7158  arch/powerpc/kernel/process.c           |   60 +--------
7159  arch/s390/Kconfig                       |    2 +
7160  arch/s390/include/asm/unistd.h          |    4 +-
7161  arch/s390/kernel/entry.S                |   32 +----
7162  arch/s390/kernel/entry64.S              |   26 +---
7163  arch/s390/kernel/process.c              |   52 ++------
7164  arch/score/Kconfig                      |    2 +
7165  arch/score/include/asm/processor.h      |    1 -
7166  arch/score/include/asm/syscalls.h       |    1 -
7167  arch/score/include/asm/unistd.h         |    1 +
7168  arch/score/kernel/entry.S               |   12 +-
7169  arch/score/kernel/process.c             |   55 ++------
7170  arch/score/kernel/sys_score.c           |   54 --------
7171  arch/sh/Kconfig                         |    2 +
7172  arch/sh/include/asm/processor_32.h      |    5 -
7173  arch/sh/include/asm/processor_64.h      |    5 -
7174  arch/sh/include/asm/syscalls_32.h       |    4 -
7175  arch/sh/include/asm/syscalls_64.h       |    4 -
7176  arch/sh/include/asm/unistd.h            |    1 +
7177  arch/sh/kernel/Makefile                 |    3 +-
7178  arch/sh/kernel/cpu/sh5/entry.S          |   19 +++
7179  arch/sh/kernel/entry-common.S           |   13 ++
7180  arch/sh/kernel/process_32.c             |   87 +++----------
7181  arch/sh/kernel/process_64.c             |   85 +++---------
7182  arch/sh/kernel/sys_sh32.c               |   24 ----
7183  arch/sh/kernel/sys_sh64.c               |   50 -------
7184  arch/sparc/Kconfig                      |    2 +
7185  arch/sparc/include/asm/processor_32.h   |    1 -
7186  arch/sparc/include/asm/processor_64.h   |   11 +-
7187  arch/sparc/include/asm/ptrace.h         |   10 +-
7188  arch/sparc/include/asm/switch_to_64.h   |    2 +-
7189  arch/sparc/include/asm/syscalls.h       |    2 -
7190  arch/sparc/include/asm/thread_info_64.h |   25 ++--
7191  arch/sparc/include/asm/uaccess_64.h     |    4 +-
7192  arch/sparc/include/asm/unistd.h         |    1 +
7193  arch/sparc/kernel/entry.S               |   51 ++++----
7194  arch/sparc/kernel/etrap_64.S            |    8 +-
7195  arch/sparc/kernel/process_32.c          |  152 +++++++---------------
7196  arch/sparc/kernel/process_64.c          |  143 +++++---------------
7197  arch/sparc/kernel/sys_sparc32.c         |   36 -----
7198  arch/sparc/kernel/sys_sparc_32.c        |   24 ----
7199  arch/sparc/kernel/sys_sparc_64.c        |   22 ----
7200  arch/sparc/kernel/syscalls.S            |   30 ++---
7201  arch/sparc/kernel/systbls_64.S          |    2 +-
7202  arch/sparc/kernel/traps_64.c            |    4 +-
7203  arch/sparc/mm/init_64.c                 |    2 +-
7204  arch/tile/Kconfig                       |    2 +
7205  arch/tile/include/asm/compat.h          |   15 +--
7206  arch/tile/include/asm/elf.h             |    1 +
7207  arch/tile/include/asm/processor.h       |    6 +-
7208  arch/tile/include/asm/switch_to.h       |    5 +-
7209  arch/tile/include/asm/syscalls.h        |   16 ++-
7210  arch/tile/include/asm/unistd.h          |    1 +
7211  arch/tile/kernel/compat.c               |    5 +-
7212  arch/tile/kernel/compat_signal.c        |   10 +-
7213  arch/tile/kernel/entry.S                |   11 --
7214  arch/tile/kernel/intvec_32.S            |   29 +++--
7215  arch/tile/kernel/intvec_64.S            |   30 +++--
7216  arch/tile/kernel/process.c              |  170 +++++++-----------------
7217  arch/tile/kernel/signal.c               |    9 +-
7218  arch/tile/kernel/sys.c                  |    9 +-
7219  arch/tile/mm/fault.c                    |    5 +-
7220  arch/um/kernel/process.c                |    2 +-
7221  arch/um/kernel/syscall.c                |   23 ----
7222  arch/x86/Kconfig                        |    1 +
7223  arch/x86/ia32/ia32_aout.c               |    5 +-
7224  arch/x86/ia32/ia32entry.S               |    7 +-
7225  arch/x86/ia32/sys_ia32.c                |   11 --
7226  arch/x86/include/asm/sys_ia32.h         |    2 -
7227  arch/x86/include/asm/syscalls.h         |   14 +-
7228  arch/x86/include/asm/unistd.h           |    3 +
7229  arch/x86/kernel/entry_32.S              |   18 ---
7230  arch/x86/kernel/entry_64.S              |   22 +++-
7231  arch/x86/kernel/process.c               |   30 -----
7232  arch/x86/kernel/process_32.c            |   11 +-
7233  arch/x86/kernel/process_64.c            |    7 +-
7234  arch/x86/syscalls/syscall_32.tbl        |    6 +-
7235  arch/x86/um/Kconfig                     |    1 +
7236  arch/x86/um/sys_call_table_32.c         |    3 -
7237  arch/x86/um/syscalls_32.c               |   15 ---
7238  arch/xtensa/include/asm/syscall.h       |    1 -
7239  drivers/staging/gdm72xx/gdm_usb.c       |    4 +-
7240  fs/binfmt_aout.c                        |    5 +-
7241  fs/binfmt_elf.c                         |    5 +-
7242  fs/binfmt_elf_fdpic.c                   |    6 +-
7243  fs/binfmt_em86.c                        |    4 +-
7244  fs/binfmt_flat.c                        |    5 +-
7245  fs/binfmt_misc.c                        |    4 +-
7246  fs/binfmt_script.c                      |    4 +-
7247  fs/binfmt_som.c                         |    5 +-
7248  fs/exec.c                               |   37 +++---
7249  fs/file.c                               |    6 -
7250  fs/fs_struct.c                          |   24 ----
7251  include/asm-generic/syscalls.h          |   14 +-
7252  include/linux/binfmts.h                 |    4 +-
7253  include/linux/compat.h                  |    4 -
7254  include/linux/fdtable.h                 |    1 -
7255  include/linux/fs_struct.h               |    1 -
7256  include/linux/sched.h                   |    3 +-
7257  include/linux/syscalls.h                |    6 +-
7258  kernel/auditsc.c                        |  102 +++------------
7259  kernel/exit.c                           |   92 -------------
7260  kernel/fork.c                           |   43 ++++++
7261  225 files changed, 1248 insertions(+), 3347 deletions(-)
7262  delete mode 100644 arch/avr32/kernel/sys_avr32.c
7263  delete mode 100644 arch/sh/kernel/sys_sh64.c
7264 Merging clk/clk-next (749a267 clk: ux500: Register nomadik keypad clock lookups for u8500)
7265 $ git merge clk/clk-next
7266 Auto-merging drivers/mfd/db8500-prcmu.c
7267 Auto-merging drivers/clocksource/nomadik-mtu.c
7268 Auto-merging drivers/clk/ux500/u8500_clk.c
7269 Auto-merging drivers/clk/clk-bcm2835.c
7270 Auto-merging arch/arm/mach-ux500/cpu-db8500.c
7271 Merge made by the 'recursive' strategy.
7272  arch/arm/mach-ux500/cpu-db8500.c  |    6 --
7273  drivers/clk/clk-bcm2835.c         |    8 +--
7274  drivers/clk/clk-vt8500.c          |   18 ++++++
7275  drivers/clk/clk-wm831x.c          |   34 +++---------
7276  drivers/clk/clk.c                 |  111 ++++++++++++++++++++++++++++++-------
7277  drivers/clk/ux500/clk-prcmu.c     |   17 ++++++
7278  drivers/clk/ux500/clk.h           |    6 ++
7279  drivers/clk/ux500/u8500_clk.c     |   80 ++++++++++++++++++++------
7280  drivers/clocksource/nomadik-mtu.c |    8 ++-
7281  drivers/cpufreq/db8500-cpufreq.c  |  101 ++++++++++++++++++---------------
7282  drivers/mfd/db8500-prcmu.c        |   82 ++++++++++++++++++++++-----
7283  include/linux/clk-provider.h      |    2 +
7284  12 files changed, 340 insertions(+), 133 deletions(-)
7285 Merging random/dev (ec8f02da random: prime last_data value per fips requirements)
7286 $ git merge random/dev
7287 Merge made by the 'recursive' strategy.
7288  drivers/char/random.c |   40 +++++++++++++++++++++++++++-------------
7289  1 file changed, 27 insertions(+), 13 deletions(-)
7290 Merging lzo-update/lzo-update (ba32bf9 lib/lzo: Do not leak implementation details in lzo1x_1_compress())
7291 $ git merge lzo-update/lzo-update
7292 Removing lib/lzo/lzo1x_decompress.c
7293 Auto-merging crypto/testmgr.h
7294 Merge made by the 'recursive' strategy.
7295  crypto/testmgr.h                |   38 ++---
7296  include/linux/lzo.h             |   15 +-
7297  lib/decompress_unlzo.c          |    2 +-
7298  lib/lzo/Makefile                |    2 +-
7299  lib/lzo/lzo1x_compress.c        |  335 +++++++++++++++++++++++----------------
7300  lib/lzo/lzo1x_decompress.c      |  255 -----------------------------
7301  lib/lzo/lzo1x_decompress_safe.c |  237 +++++++++++++++++++++++++++
7302  lib/lzo/lzodefs.h               |   34 +++-
7303  8 files changed, 488 insertions(+), 430 deletions(-)
7304  delete mode 100644 lib/lzo/lzo1x_decompress.c
7305  create mode 100644 lib/lzo/lzo1x_decompress_safe.c
7306 Merging drop-experimental/linux-next (f5c93a1 tools/lguest: remove depends on CONFIG_EXPERIMENTAL)
7307 $ git merge drop-experimental/linux-next
7308 Resolved 'drivers/net/ethernet/intel/Kconfig' using previous resolution.
7309 Resolved 'drivers/ptp/Kconfig' using previous resolution.
7310 Auto-merging net/sctp/Kconfig
7311 Auto-merging net/mac80211/Kconfig
7312 Auto-merging init/Kconfig
7313 Auto-merging drivers/ptp/Kconfig
7314 CONFLICT (content): Merge conflict in drivers/ptp/Kconfig
7315 Auto-merging drivers/net/usb/Kconfig
7316 Auto-merging drivers/net/ethernet/ti/Kconfig
7317 Auto-merging drivers/net/ethernet/intel/Kconfig
7318 CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/Kconfig
7319 Auto-merging drivers/mmc/host/Kconfig
7320 Auto-merging crypto/Kconfig
7321 Auto-merging arch/x86/um/Kconfig
7322 Auto-merging arch/x86/Kconfig
7323 Auto-merging arch/ia64/Kconfig
7324 Automatic merge failed; fix conflicts and then commit the result.
7325 $ git commit -v -a
7326 [master b6ff140] Merge remote-tracking branch 'drop-experimental/linux-next'
7327 $ git diff -M --stat --summary HEAD^..
7328  Documentation/CodingStyle                  |   10 +-----
7329  Documentation/DocBook/kernel-hacking.tmpl  |    7 ----
7330  Documentation/DocBook/kgdb.tmpl            |    6 ++--
7331  Documentation/intel_txt.txt                |    2 +-
7332  Documentation/zh_CN/CodingStyle            |    7 ----
7333  arch/cris/arch-v32/drivers/Kconfig         |    4 +--
7334  arch/ia64/Kconfig                          |    8 ++---
7335  arch/ia64/kvm/Kconfig                      |    2 +-
7336  arch/ia64/xen/Kconfig                      |    2 +-
7337  arch/powerpc/platforms/ps3/Kconfig         |    2 +-
7338  arch/s390/kvm/Kconfig                      |    2 +-
7339  arch/um/Kconfig.net                        |    2 +-
7340  arch/um/Kconfig.um                         |    8 ++---
7341  arch/x86/Kconfig                           |   22 ++++++------
7342  arch/x86/um/Kconfig                        |    3 +-
7343  crypto/Kconfig                             |   15 +++-----
7344  drivers/gpu/drm/udl/Kconfig                |    2 +-
7345  drivers/i2c/muxes/Kconfig                  |    2 --
7346  drivers/ide/Kconfig                        |    8 ++---
7347  drivers/lguest/Kconfig                     |    2 +-
7348  drivers/media/Kconfig                      |    7 ++--
7349  drivers/media/pci/cx25821/Kconfig          |    2 +-
7350  drivers/media/platform/s5p-fimc/Kconfig    |    1 -
7351  drivers/media/platform/s5p-tv/Kconfig      |    3 +-
7352  drivers/media/usb/pvrusb2/Kconfig          |    8 ++---
7353  drivers/mmc/core/Kconfig                   |    3 +-
7354  drivers/mmc/host/Kconfig                   |   20 +++++------
7355  drivers/net/Kconfig                        |    9 +++--
7356  drivers/net/ethernet/8390/Kconfig          |   21 +++++------
7357  drivers/net/ethernet/atheros/Kconfig       |    8 ++---
7358  drivers/net/ethernet/dec/tulip/Kconfig     |    4 +--
7359  drivers/net/ethernet/i825xx/Kconfig        |   12 +++----
7360  drivers/net/ethernet/intel/Kconfig         |    5 ---
7361  drivers/net/ethernet/natsemi/Kconfig       |    3 --
7362  drivers/net/ethernet/packetengines/Kconfig |    4 +--
7363  drivers/net/ethernet/realtek/Kconfig       |    4 +--
7364  drivers/net/ethernet/silan/Kconfig         |    6 ++--
7365  drivers/net/ethernet/ti/Kconfig            |    4 +--
7366  drivers/net/team/Kconfig                   |    3 +-
7367  drivers/net/usb/Kconfig                    |   16 ++++-----
7368  drivers/net/wan/Kconfig                    |    8 ++---
7369  drivers/rpmsg/Kconfig                      |    3 +-
7370  drivers/sbus/char/Kconfig                  |    7 ++--
7371  drivers/virtio/Kconfig                     |    8 ++---
7372  fs/ceph/Kconfig                            |    4 +--
7373  fs/ecryptfs/Kconfig                        |    4 +--
7374  fs/nilfs2/Kconfig                          |    3 +-
7375  fs/xfs/Kconfig                             |    4 +--
7376  init/Kconfig                               |   54 +++++++---------------------
7377  net/9p/Kconfig                             |    2 +-
7378  net/Kconfig                                |    5 ++-
7379  net/ceph/Kconfig                           |    4 +--
7380  net/dccp/Kconfig                           |    4 +--
7381  net/dccp/ccids/Kconfig                     |    5 ++-
7382  net/decnet/Kconfig                         |    4 +--
7383  net/decnet/netfilter/Kconfig               |    2 +-
7384  net/dsa/Kconfig                            |    2 +-
7385  net/ieee802154/Kconfig                     |    3 +-
7386  net/ipv4/Kconfig                           |   11 +-----
7387  net/ipv4/netfilter/Kconfig                 |    4 +--
7388  net/ipv6/Kconfig                           |   24 ++++++-------
7389  net/l2tp/Kconfig                           |    4 +--
7390  net/lapb/Kconfig                           |    3 +-
7391  net/mac80211/Kconfig                       |    2 +-
7392  net/mac802154/Kconfig                      |    2 +-
7393  net/netfilter/Kconfig                      |   24 +++++--------
7394  net/rds/Kconfig                            |    4 +--
7395  net/rxrpc/Kconfig                          |    2 +-
7396  net/sctp/Kconfig                           |    4 +--
7397  net/sunrpc/Kconfig                         |    2 +-
7398  net/tipc/Kconfig                           |    4 +--
7399  net/wanrouter/Kconfig                      |    1 -
7400  net/x25/Kconfig                            |    3 +-
7401  net/xfrm/Kconfig                           |   16 ++++-----
7402  tools/lguest/lguest.txt                    |    8 ++---
7403  75 files changed, 189 insertions(+), 314 deletions(-)
7404 Merging scsi-post-merge/merge-base:master ()
7405 Merging akpm-current/current (d715ab1 h8300: add missing L1_CACHE_SHIFT)
7406 $ git merge akpm-current/current
7407 Merge made by the 'recursive' strategy.
7408 $ git clone -s -l -n -q . ../rebase-tmp
7409 $ cd ../rebase-tmp
7410 $ git fetch --no-tags ../next refs/heads/akpm/master:akpm
7411 From ../next
7412  * [new branch]      akpm/master -> akpm
7413 $ git fetch --no-tags ../next refs/heads/akpm/master-base:akpm-base
7414 From ../next
7415  * [new branch]      akpm/master-base -> akpm-base
7416 $ git checkout akpm
7417 Switched to branch 'akpm'
7418 $ git rebase --onto master akpm-base
7419 First, rewinding head to replay your work on top of it...
7420 Applying: tmpfs: fix shmem_getpage_gfp VM_BUG_ON
7421 Applying: tmpfs: change final i_blocks BUG to WARNING
7422 Applying: mm: add anon_vma_lock to validate_mm()
7423 Applying: mm: fix build warning for uninitialized value
7424 Applying: memcg: oom: fix totalpages calculation for memory.swappiness==0
7425 Applying: doc: describe memcg swappiness more precisely
7426 Applying: mm: fix a regression with HIGHMEM
7427 Applying: mm: vmscan: scale number of pages reclaimed by reclaim/compaction only in direct reclaim
7428 Applying: proc: check vma->vm_file before dereferencing
7429 Applying: CRIS: Fix I/O macros
7430 Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
7431 Applying: vfs: d_obtain_alias() needs to use "/" as default name.
7432 Applying: fs/block_dev.c: page cache wrongly left invalidated after revalidate_disk()
7433 Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
7434 Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
7435 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
7436 Applying: x86 numa: don't check if node is NUMA_NO_NODE
7437 Applying: arch/x86/tools/insn_sanity.c: identify source of messages
7438 Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
7439 Applying: olpc: fix olpc-xo1-sci.c build errors
7440 Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
7441 Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
7442 Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
7443 Applying: irq: tsk->comm is an array
7444 Applying: irq-tsk-comm-is-an-array-fix
7445 Applying: timeconst.pl: remove deprecated defined(@array)
7446 Applying: time: don't inline EXPORT_SYMBOL functions
7447 Applying: fs/pstore/ram.c: fix up section annotations
7448 Applying: h8300: select generic atomic64_t support
7449 Applying: drivers/tty/serial/serial_core.c: fix uart_get_attr_port() shift
7450 Applying: tasklet: ignore disabled tasklet in tasklet_action()
7451 Applying: tasklet: ignore disabled tasklet in tasklet_action v2
7452 Applying: drivers/message/fusion/mptscsih.c: missing break
7453 Applying: drivers/scsi/hptiop: support HighPoint RR4520/RR4522 HBA
7454 Applying: vfs: increment iversion when a file is truncated
7455 Applying: fs: change return values from -EACCES to -EPERM
7456 Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
7457 Applying: mm/page_alloc.c: remove duplicate check
7458 Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
7459 Applying: mm: show migration types in show_mem
7460 Applying: mm, memcg: make mem_cgroup_out_of_memory() static
7461 Applying: mm: use IS_ENABLED(CONFIG_NUMA) instead of NUMA_BUILD
7462 Applying: mm: use IS_ENABLED(CONFIG_COMPACTION) instead of COMPACTION_BUILD
7463 Applying: thp: clean up __collapse_huge_page_isolate
7464 Applying: thp-clean-up-__collapse_huge_page_isolate v2
7465 Applying: mm: introduce mm_find_pmd()
7466 Applying: mm-introduce-mm_find_pmd-fix
7467 Applying: thp: introduce hugepage_vma_check()
7468 Applying: thp: cleanup: introduce mk_huge_pmd()
7469 Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
7470 Applying: memory-hotplug: skip HWPoisoned page when offlining pages
7471 Applying: memory-hotplug: update mce_bad_pages when removing the memory
7472 Applying: memory-hotplug-update-mce_bad_pages-when-removing-the-memory-fix
7473 Applying: memory-hotplug: auto offline page_cgroup when onlining memory block failed
7474 Applying: memory-hotplug: fix NR_FREE_PAGES mismatch
7475 Applying: memory-hotplug: fix NR_FREE_PAGES mismatch's fix
7476 Applying: numa: convert static memory to dynamically allocated memory for per node device
7477 Applying: memory-hotplug: suppress "Device nodeX does not have a release() function" warning
7478 Applying: memory-hotplug, mm/sparse.c: clear the memory to store struct page
7479 Applying: memory-hotplug: allocate zone's pcp before onlining pages
7480 Applying: mm: make zone_pcp_reset independent of MEMORY_HOTREMOVE
7481 Applying: memory-hotplug: build zonelist if a zone is populated after onlining pages
7482 Applying: memory_hotplug: fix possible incorrect node_states[N_NORMAL_MEMORY]
7483 Applying: slub, hotplug: ignore unrelated node's hot-adding and hot-removing
7484 Applying: mm/memory_hotplug.c: update start_pfn in zone and pg_data when spanned_pages == 0.
7485 Applying: mm: add comment on storage key dirty bit semantics
7486 Applying: mm,vmscan: only evict file pages when we have plenty
7487 Applying: mmvmscan-only-evict-file-pages-when-we-have-plenty-fix
7488 Applying: mm: refactor reinsert of swap_info in sys_swapoff()
7489 Applying: mm: do not call frontswap_init() during swapoff
7490 Applying: mm, highmem: use PKMAP_NR() to calculate an index of pkmap
7491 Applying: mm, highmem: remove useless pool_lock
7492 Applying: mm, highmem: remove page_address_pool list
7493 Applying: mm-highmem-remove-page_address_pool-list-v2
7494 Applying: mm, highmem: makes flush_all_zero_pkmaps() return index of last flushed entry
7495 Applying: mm-highmem-makes-flush_all_zero_pkmaps-return-index-of-last-flushed-entry-v2
7496 Applying: mm, highmem: get virtual address of the page using PKMAP_ADDR()
7497 Applying: mm: thp: set the accessed flag for old pages on access fault
7498 Applying: mm: memmap_init_zone() performance improvement
7499 Applying: Documentation/cgroups/memory.txt: s/mem_cgroup_charge/mem_cgroup_change_common/
7500 Applying: mm, oom: allow exiting threads to have access to memory reserves
7501 Applying: memcg: make it possible to use the stock for more than one page
7502 Applying: memcg: reclaim when more than one page needed
7503 Applying: memcg: change defines to an enum
7504 Applying: memcg: kmem accounting basic infrastructure
7505 Applying: mm: add a __GFP_KMEMCG flag
7506 Applying: memcg: kmem controller infrastructure
7507 Applying: mm: allocate kernel pages to the right memcg
7508 Applying: res_counter: return amount of charges after res_counter_uncharge()
7509 Applying: memcg: kmem accounting lifecycle management
7510 Applying: memcg: use static branches when code not in use
7511 Applying: memcg: allow a memcg with kmem charges to be destructed
7512 Applying: memcg: execute the whole memcg freeing in free_worker()
7513 Applying: fork: protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
7514 Applying: memcg: add documentation about the kmem controller
7515 Applying: slab/slub: struct memcg_params
7516 Applying: slab: annotate on-slab caches nodelist locks
7517 Applying: slab/slub: consider a memcg parameter in kmem_create_cache
7518 Applying: memcg: allocate memory for memcg caches whenever a new memcg appears
7519 Applying: memcg: infrastructure to match an allocation to the right cache
7520 Applying: memcg: skip memcg kmem allocations in specified code regions
7521 Applying: sl[au]b: always get the cache from its page in kmem_cache_free()
7522 Applying: sl[au]b: allocate objects from memcg cache
7523 Applying: memcg: destroy memcg caches
7524 Applying: memcg/sl[au]b: track all the memcg children of a kmem_cache
7525 Applying: memcg/sl[au]b: shrink dead caches
7526 Applying: memcg: aggregate memcg cache values in slabinfo
7527 Applying: slab: propagate tunable values
7528 Applying: slub: slub-specific propagation changes
7529 Applying: slub-slub-specific-propagation-changes-fix
7530 Applying: kmem: add slab-specific documentation about the kmem controller
7531 Applying: dmapool: make DMAPOOL_DEBUG detect corruption of free marker
7532 Using index info to reconstruct a base tree...
7533 M       mm/dmapool.c
7534 Falling back to patching base and 3-way merge...
7535 Auto-merging mm/dmapool.c
7536 Applying: dmapool-make-dmapool_debug-detect-corruption-of-free-marker-fix
7537 Applying: mm: hwpoison: fix action_result() to print out dirty/clean
7538 Applying: mm: print out information of file affected by memory error
7539 Applying: mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB
7540 Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix
7541 Applying: mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix
7542 Applying: selftests: add a test program for variable huge page sizes in mmap/shmget
7543 Applying: mm: augment vma rbtree with rb_subtree_gap
7544 Applying: mm: check rb_subtree_gap correctness
7545 Applying: mm-check-rb_subtree_gap-correctness-fix
7546 Applying: mm: rearrange vm_area_struct for fewer cache misses
7547 Applying: mm-rearrange-vm_area_struct-for-fewer-cache-misses-checkpatch-fixes
7548 Applying: mm: vm_unmapped_area() lookup function
7549 Applying: mm-vm_unmapped_area-lookup-function-checkpatch-fixes
7550 Applying: mm: use vm_unmapped_area() on x86_64 architecture
7551 Applying: mm: fix cache coloring on x86_64 architecture
7552 Applying: mm: use vm_unmapped_area() in hugetlbfs
7553 Applying: mm: use vm_unmapped_area() in hugetlbfs on i386 architecture
7554 Applying: mm: use vm_unmapped_area() on mips architecture
7555 Applying: mm-use-vm_unmapped_area-on-mips-architecture-fix
7556 Applying: mm: use vm_unmapped_area() on arm architecture
7557 Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix
7558 Applying: mm: use vm_unmapped_area() on sh architecture
7559 Applying: mm-use-vm_unmapped_area-on-sh-architecture-fix
7560 Applying: mm: use vm_unmapped_area() on sparc64 architecture
7561 Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix
7562 Applying: mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
7563 Applying: mm: use vm_unmapped_area() on sparc32 architecture
7564 Applying: mm: use vm_unmapped_area() in hugetlbfs on tile architecture
7565 Applying: mm/vmscan.c: try_to_freeze() returns boolean
7566 Applying: mm, mempolicy: remove duplicate code
7567 Applying: mm: adjust address_space_operations.migratepage() return code
7568 Applying: mm-adjust-address_space_operationsmigratepage-return-code-fix
7569 Applying: mm: redefine address_space.assoc_mapping
7570 Applying: mm: introduce a common interface for balloon pages mobility
7571 Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix
7572 Applying: mm-introduce-a-common-interface-for-balloon-pages-mobility-fix-fix
7573 Applying: mm: introduce compaction and migration for ballooned pages
7574 Applying: virtio_balloon: introduce migration primitives to balloon pages
7575 Applying: mm: introduce putback_movable_pages()
7576 Applying: mm: add vm event counters for balloon pages compaction
7577 Applying: mm: fix slab.c kernel-doc warnings
7578 Applying: mm: cleanup register_node()
7579 Applying: mm, oom: change type of oom_score_adj to short
7580 Applying: mm, oom: fix race when specifying a thread as the oom origin
7581 Applying: mm: cma: skip watermarks check for already isolated blocks in split_free_page()
7582 Applying: mm: cma: remove watermark hacks
7583 Applying: drop_caches: add some documentation and info message
7584 Applying: drop_caches-add-some-documentation-and-info-messsge-checkpatch-fixes
7585 Applying: swap: add a simple detector for inappropriate swapin readahead
7586 Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
7587 Applying: mm/memblock: reduce overhead in binary search
7588 Applying: scripts/pnmtologo: fix for plain PBM
7589 Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
7590 Applying: Documentation/kernel-parameters.txt: update mem= option's spec according to its implementation
7591 Applying: include/linux/init.h: use the stringify operator for the __define_initcall macro
7592 Applying: scripts/tags.sh: add magic for declarations of popular kernel type
7593 Applying: Documentation: remove reference to feature-removal-schedule.txt
7594 Applying: kernel: remove reference to feature-removal-schedule.txt
7595 Applying: sound: remove reference to feature-removal-schedule.txt
7596 Applying: drivers: remove reference to feature-removal-schedule.txt
7597 Applying: backlight: da903x_bl: use dev_get_drvdata() instead of platform_get_drvdata()
7598 Applying: backlight: 88pm860x_bl: fix checkpatch warning
7599 Applying: backlight: atmel-pwm-bl: fix checkpatch warning
7600 Applying: backlight: corgi_lcd: fix checkpatch error and warning
7601 Applying: backlight: da903x_bl: fix checkpatch warning
7602 Applying: backlight: generic_bl: fix checkpatch warning
7603 Applying: backlight: hp680_bl: fix checkpatch error and warning
7604 Applying: backlight: ili9320: fix checkpatch error and warning
7605 Applying: backlight: jornada720: fix checkpatch error and warning
7606 Applying: backlight: l4f00242t03: fix checkpatch warning
7607 Applying: backlight: lm3630: fix checkpatch warning
7608 Applying: backlight: locomolcd: fix checkpatch error and warning
7609 Applying: backlight: omap1: fix checkpatch warning
7610 Applying: backlight: pcf50633: fix checkpatch warning
7611 Applying: backlight: platform_lcd: fix checkpatch error
7612 Applying: backlight: tdo24m: fix checkpatch warning
7613 Applying: backlight: tosa: fix checkpatch error and warning
7614 Applying: backlight: vgg2432a4: fix checkpatch warning
7615 Applying: backlight: lms283gf05: use devm_gpio_request_one
7616 Applying: backlight: tosa: use devm_gpio_request_one
7617 Applying: drivers/video/backlight/lp855x_bl.c: use generic PWM functions
7618 Applying: drivers-video-backlight-lp855x_blc-use-generic-pwm-functions-fix
7619 Applying: drivers/video/backlight/lp855x_bl.c: remove unnecessary mutex code
7620 Applying: drivers/video/backlight/da9052_bl.c: add missing const
7621 Applying: drivers/video/backlight/lms283gf05.c: add missing const
7622 Applying: drivers/video/backlight/tdo24m.c: add missing const
7623 Applying: drivers/video/backlight/vgg2432a4.c: add missing const
7624 Applying: drivers/video/backlight/s6e63m0.c: remove unnecessary cast of void pointer
7625 Applying: drivers/video/backlight/88pm860x_bl.c: drop devm_kfree of devm_kzalloc'd data
7626 Applying: drivers/video/backlight/max8925_bl.c: drop devm_kfree of devm_kzalloc'd data
7627 Applying: drivers/video/backlight/lm3639_bl.c: fix up world writable sysfs file
7628 Applying: drivers/video/backlight/ep93xx_bl.c: fix section mismatch
7629 Applying: drivers/video/backlight/hp680_bl.c: add missing __devexit macros for remove
7630 Applying: drivers/video/backlight/ili9320.c: add missing __devexit macros for remove
7631 Applying: string: introduce helper to get base file name from given path
7632 Applying: lib: dynamic_debug: use kbasename()
7633 Applying: mm: use kbasename()
7634 Applying: procfs: use kbasename()
7635 Applying: proc_devtree: remove duplicated include from proc_devtree.c
7636 Applying: trace: use kbasename()
7637 Applying: drivers/of/fdt.c: re-use kernel's kbasename()
7638 Applying: sscanf: don't ignore field widths for numeric conversions
7639 Applying: percpu_rw_semaphore: reimplement to not block the readers unnecessarily
7640 Applying: compat: generic compat_sys_sched_rr_get_interval() implementation
7641 Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
7642 Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
7643 Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
7644 Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
7645 Applying: checkpatch: warn on unnecessary line continuations
7646 Applying: epoll: support for disabling items, and a self-test app
7647 Applying: binfmt_elf: fix corner case kfree of uninitialized data
7648 Applying: binfmt_elf-fix-corner-case-kfree-of-uninitialized-data-checkpatch-fixes
7649 Applying: rtc: omap: kicker mechanism support
7650 Applying: ARM: davinci: remove rtc kicker release
7651 Applying: rtc: omap: dt support
7652 Applying: rtc: omap: depend on am33xx
7653 Applying: rtc: omap: add runtime pm support
7654 Applying: drivers/rtc/rtc-imxdi: support for i.MX53
7655 Applying: drivers/rtc/rtc-imxdi.c: add devicetree support
7656 Applying: ARM: mach-imx: support for DryIce RTC in i.MX53
7657 Applying: drivers/rtc/rtc-vt8500.c: convert to use devm_kzalloc
7658 Applying: drivers/rtc/rtc-test.c: avoid calling platform_device_put() twice
7659 Applying: rtc-avoid-calling-platform_device_put-twice-in-test_init-fix
7660 Applying: rtc: rtc-spear: use devm_*() routines
7661 Applying: rtc: rtc-spear: Add clk_{un}prepare() support
7662 Applying: rtc: rtc-spear: Provide flag for no support of UIE mode
7663 Applying: hfsplus: add on-disk layout declarations related to attributes tree
7664 Applying: hfsplus: add functionality of manipulating by records in attributes tree
7665 Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
7666 Applying: hfsplus: add support of manipulation by attributes file
7667 Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
7668 Applying: hfsplus: code style fixes - reworked support of extended attributes
7669 Applying: Documentation/DMA-API-HOWTO.txt: minor grammar corrections
7670 Applying: Documentation: fix Documentation/security/00-INDEX
7671 Applying: kstrto*: add documentation
7672 Applying: simple_strto*: annotate function as obsolete
7673 Applying: proc: don't show nonexistent capabilities
7674 Applying: procfs: add VmFlags field in smaps output
7675 Applying: procfs-add-vmflags-field-in-smaps-output-v4-fix
7676 Applying: /proc/pid/status: add "Seccomp" field
7677 Applying: fork: unshare: remove dead code
7678 Applying: ipc: remove forced assignment of selected message
7679 Applying: ipc: add sysctl to specify desired next object id
7680 Applying: ipc-add-sysctl-to-specify-desired-next-object-id-checkpatch-fixes
7681 Applying: ipc: wrap new sysctls for CRIU inside CONFIG_CHECKPOINT_RESTORE
7682 Applying: Documentation: update sysctl/kernel.txt
7683 Applying: ipc: message queue receive cleanup
7684 Applying: ipc-message-queue-receive-cleanup-checkpatch-fixes
7685 Applying: ipc: introduce message queue copy feature
7686 Applying: ipc: remove redundant MSG_COPY check
7687 Applying: ipc: cleanup do_msgrcv() around MSG_COPY feature
7688 Applying: selftests: IPC message queue copy feature test
7689 Applying: test: IPC message queue copy feature test update
7690 Applying: ipc: simplify free_copy() call
7691 Applying: ipc: convert prepare_copy() from macro to function
7692 Applying: ipc-convert-prepare_copy-from-macro-to-function-fix
7693 Applying: ipc: simplify message copying
7694 Applying: ipc: add more comments to message copying related code
7695 Applying: ipc/sem.c: alternatives to preempt_disable()
7696 Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
7697 Applying: binfmt_elfc-use-get_random_int-to-fix-entropy-depleting-fix
7698 Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
7699 Applying: Documentation/sparse.txt: document context annotations for lock checking
7700 Applying: aoe: describe the behavior of the "err" character device
7701 Applying: aoe: print warning regarding a common reason for dropped transmits
7702 Applying: aoe-print-warning-regarding-a-common-reason-for-dropped-transmits-v2
7703 Applying: aoe: avoid using skb member after dev_queue_xmit
7704 Applying: aoe: update cap on outstanding commands based on config query response
7705 Applying: aoe: support the forgetting (flushing) of a user-specified AoE target
7706 Applying: aoe: support larger I/O requests via aoe_maxsectors module param
7707 Applying: aoe: "payload" sysfs file exports per-AoE-command data transfer size
7708 Applying: aoe: cleanup: remove unused ata_scnt function
7709 Applying: aoe: whitespace cleanup
7710 Applying: aoe: update driver-internal version number to 60
7711 Applying: aoe: provide ATA identify device content to user on request
7712 Applying: aoe: improve network congestion handling
7713 Applying: aoe: err device: include MAC addresses for unexpected responses
7714 Applying: aoe: manipulate aoedev network stats under lock
7715 Applying: aoe: use high-resolution RTTs with fallback to low-res
7716 Applying: aoe: commands in retransmit queue use new destination on failure
7717 Applying: aoe: update driver-internal version to 64+
7718 Applying: Documentation/DMA-API-HOWTO.txt: fix typo
7719 Applying: tools/testing/selftests/kcmp/kcmp_test.c: print reason for failure in kcmp_test
7720 Applying: fix mm: augment vma rbtree with rb_subtree_gap
7721 Applying: fix mm: use vm_unmapped_area() in hugetlbfs on tile architecture
7722 Applying: fix mm: use vm_unmapped_area() in hugetlbfs on sparc64 architecture
7723 Applying: mm-use-vm_unmapped_area-on-sparc64-architecture-fix2
7724 Applying: mm-use-vm_unmapped_area-on-arm-architecture-fix2
7725 Applying: mm: fix for use vm_unmapped_area() in hugetlbfs on i386 architecture
7726 Applying: fix mm: use vm_unmapped_area() on sparc32 architecture
7727 Applying: MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix
7728 $ cd ../next
7729 $ git fetch -f ../rebase-tmp akpm:akpm/master
7730 From ../rebase-tmp
7731  + cc79638...61df919 akpm       -> akpm/master  (forced update)
7732 $ rm -rf ../rebase-tmp
7733 Merging akpm/master (61df919 MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix)
7734 $ git merge --no-ff akpm/master
7735 Merge made by the 'recursive' strategy.
7736  Documentation/00-INDEX                             |    2 -
7737  Documentation/ABI/README                           |    3 -
7738  Documentation/DMA-API-HOWTO.txt                    |    9 +-
7739  Documentation/DocBook/kernel-api.tmpl              |    3 +
7740  Documentation/backlight/lp855x-driver.txt          |   10 +-
7741  Documentation/cgroups/memory.txt                   |   76 +-
7742  Documentation/cgroups/resource_counter.txt         |    7 +-
7743  .../devicetree/bindings/rtc/imxdi-rtc.txt          |   17 +
7744  Documentation/devicetree/bindings/rtc/rtc-omap.txt |   17 +
7745  Documentation/filesystems/proc.txt                 |   42 +-
7746  Documentation/kernel-parameters.txt                |    7 +-
7747  Documentation/memory-hotplug.txt                   |    5 +-
7748  Documentation/scsi/hptiop.txt                      |   69 +-
7749  Documentation/security/00-INDEX                    |    2 +
7750  Documentation/sparse.txt                           |   18 +
7751  Documentation/sysctl/kernel.txt                    |   19 +
7752  Documentation/sysctl/vm.txt                        |   33 +-
7753  arch/arm/mach-davinci/devices-da8xx.c              |   13 +-
7754  arch/arm/mach-imx/clk-imx51-imx53.c                |    1 +
7755  arch/arm/mm/mmap.c                                 |  132 +-
7756  arch/arm64/include/asm/unistd.h                    |    1 +
7757  arch/arm64/kernel/sys_compat.c                     |   15 -
7758  arch/cris/include/asm/io.h                         |   39 +-
7759  arch/h8300/Kconfig                                 |    1 +
7760  arch/mips/mm/mmap.c                                |  111 +-
7761  arch/powerpc/include/asm/machdep.h                 |   36 +-
7762  arch/powerpc/include/asm/systbl.h                  |    2 +-
7763  arch/powerpc/include/asm/unistd.h                  |    1 +
7764  arch/powerpc/kernel/sys_ppc32.c                    |   17 +-
7765  arch/powerpc/kernel/sysfs.c                        |    4 +-
7766  arch/s390/include/asm/page.h                       |    3 +
7767  arch/sh/mm/mmap.c                                  |  136 +-
7768  arch/sparc/include/asm/unistd.h                    |    1 +
7769  arch/sparc/kernel/sys_sparc32.c                    |   14 -
7770  arch/sparc/kernel/sys_sparc_32.c                   |   25 +-
7771  arch/sparc/kernel/sys_sparc_64.c                   |  144 +-
7772  arch/sparc/mm/hugetlbpage.c                        |  124 +-
7773  arch/tile/include/asm/compat.h                     |    2 -
7774  arch/tile/include/asm/unistd.h                     |    1 +
7775  arch/tile/kernel/compat.c                          |   18 -
7776  arch/tile/mm/hugetlbpage.c                         |  139 +-
7777  arch/x86/Kconfig                                   |    1 +
7778  arch/x86/include/asm/elf.h                         |    6 +-
7779  arch/x86/include/asm/mman.h                        |    3 +
7780  arch/x86/include/asm/uv/uv.h                       |    2 +-
7781  arch/x86/kernel/acpi/boot.c                        |    7 +-
7782  arch/x86/kernel/sys_x86_64.c                       |  151 +-
7783  arch/x86/mm/hugetlbpage.c                          |  130 +-
7784  arch/x86/mm/numa.c                                 |    3 +-
7785  arch/x86/platform/iris/iris.c                      |   67 +-
7786  arch/x86/platform/uv/tlb_uv.c                      |   10 +-
7787  arch/x86/tools/insn_sanity.c                       |   10 +-
7788  arch/x86/vdso/vma.c                                |    2 +-
7789  drivers/base/memory.c                              |    9 +-
7790  drivers/base/node.c                                |   58 +-
7791  drivers/block/aoe/aoe.h                            |   32 +-
7792  drivers/block/aoe/aoeblk.c                         |   49 +
7793  drivers/block/aoe/aoechr.c                         |    7 +-
7794  drivers/block/aoe/aoecmd.c                         |  329 +++--
7795  drivers/block/aoe/aoedev.c                         |   82 +-
7796  drivers/block/aoe/aoemain.c                        |    2 +-
7797  drivers/block/aoe/aoenet.c                         |   13 +-
7798  drivers/firmware/dmi_scan.c                        |   78 +-
7799  drivers/gpu/drm/i915/intel_pm.c                    |    3 +-
7800  drivers/message/fusion/mptscsih.c                  |    1 +
7801  drivers/net/ethernet/jme.c                         |   16 +-
7802  drivers/net/wireless/Kconfig                       |    6 +-
7803  drivers/of/fdt.c                                   |   10 +-
7804  drivers/pcmcia/cs.c                                |   37 +-
7805  drivers/rtc/Kconfig                                |   12 +-
7806  drivers/rtc/rtc-imxdi.c                            |   11 +
7807  drivers/rtc/rtc-omap.c                             |   80 +-
7808  drivers/rtc/rtc-spear.c                            |   89 +-
7809  drivers/rtc/rtc-test.c                             |   14 +-
7810  drivers/rtc/rtc-vt8500.c                           |   15 +-
7811  drivers/scsi/hptiop.c                              |  413 +++++-
7812  drivers/scsi/hptiop.h                              |   72 +-
7813  drivers/staging/android/lowmemorykiller.c          |   16 +-
7814  drivers/tty/serial/serial_core.c                   |    6 +-
7815  drivers/video/backlight/88pm860x_bl.c              |   15 +-
7816  drivers/video/backlight/atmel-pwm-bl.c             |    7 +-
7817  drivers/video/backlight/corgi_lcd.c                |   16 +-
7818  drivers/video/backlight/da903x_bl.c                |   15 +-
7819  drivers/video/backlight/da9052_bl.c                |    2 +-
7820  drivers/video/backlight/ep93xx_bl.c                |    4 +-
7821  drivers/video/backlight/generic_bl.c               |    4 +-
7822  drivers/video/backlight/hp680_bl.c                 |    8 +-
7823  drivers/video/backlight/ili9320.c                  |   16 +-
7824  drivers/video/backlight/ili9320.h                  |    2 +-
7825  drivers/video/backlight/jornada720_bl.c            |   34 +-
7826  drivers/video/backlight/jornada720_lcd.c           |    3 +-
7827  drivers/video/backlight/l4f00242t03.c              |    3 +-
7828  drivers/video/backlight/lm3630_bl.c                |    2 +-
7829  drivers/video/backlight/lm3639_bl.c                |    2 +-
7830  drivers/video/backlight/lms283gf05.c               |   16 +-
7831  drivers/video/backlight/locomolcd.c                |   65 +-
7832  drivers/video/backlight/lp855x_bl.c                |   51 +-
7833  drivers/video/backlight/max8925_bl.c               |   11 +-
7834  drivers/video/backlight/omap1_bl.c                 |    4 +-
7835  drivers/video/backlight/pcf50633-backlight.c       |    8 +-
7836  drivers/video/backlight/platform_lcd.c             |    2 +-
7837  drivers/video/backlight/s6e63m0.c                  |    2 +-
7838  drivers/video/backlight/tdo24m.c                   |   33 +-
7839  drivers/video/backlight/tosa_bl.c                  |   10 +-
7840  drivers/video/backlight/tosa_lcd.c                 |   24 +-
7841  drivers/video/backlight/vgg2432a4.c                |   10 +-
7842  drivers/virtio/virtio_balloon.c                    |  132 +-
7843  fs/attr.c                                          |    5 +
7844  fs/autofs4/root.c                                  |    2 +-
7845  fs/binfmt_elf.c                                    |   28 +-
7846  fs/block_dev.c                                     |    9 +-
7847  fs/btrfs/disk-io.c                                 |    8 +-
7848  fs/btrfs/file.c                                    |    3 +-
7849  fs/btrfs/ioctl.c                                   |    2 +-
7850  fs/buffer.c                                        |   12 +-
7851  fs/dcache.c                                        |    2 +-
7852  fs/debugfs/inode.c                                 |    1 -
7853  fs/dlm/config.c                                    |    2 +-
7854  fs/drop_caches.c                                   |    2 +
7855  fs/eventpoll.c                                     |   40 +-
7856  fs/gfs2/glock.c                                    |    2 +-
7857  fs/gfs2/sys.c                                      |   18 +-
7858  fs/hfsplus/Makefile                                |    3 +-
7859  fs/hfsplus/attributes.c                            |  399 +++++
7860  fs/hfsplus/bfind.c                                 |   79 +-
7861  fs/hfsplus/bnode.c                                 |    6 +-
7862  fs/hfsplus/brec.c                                  |   23 +-
7863  fs/hfsplus/btree.c                                 |    8 +
7864  fs/hfsplus/catalog.c                               |   36 +-
7865  fs/hfsplus/dir.c                                   |    6 +-
7866  fs/hfsplus/extents.c                               |    4 +-
7867  fs/hfsplus/hfsplus_fs.h                            |   41 +-
7868  fs/hfsplus/hfsplus_raw.h                           |   68 +-
7869  fs/hfsplus/inode.c                                 |   13 +
7870  fs/hfsplus/ioctl.c                                 |  542 ++++++-
7871  fs/hfsplus/super.c                                 |   33 +-
7872  fs/hfsplus/unicode.c                               |    7 +-
7873  fs/hugetlbfs/inode.c                               |  109 +-
7874  fs/inode.c                                         |    2 +-
7875  fs/ncpfs/ioctl.c                                   |    2 +-
7876  fs/nilfs2/page.c                                   |    2 +-
7877  fs/ocfs2/file.c                                    |    5 +-
7878  fs/proc/array.c                                    |   17 +
7879  fs/proc/base.c                                     |   21 +-
7880  fs/proc/proc_devtree.c                             |    6 +-
7881  fs/proc/task_mmu.c                                 |   53 +
7882  fs/pstore/ram.c                                    |   12 +-
7883  fs/splice.c                                        |    5 +-
7884  fs/udf/file.c                                      |    2 +-
7885  include/linux/balloon_compaction.h                 |  218 +++
7886  include/linux/compat.h                             |    3 +
7887  include/linux/compiler.h                           |    2 +
7888  include/linux/fs.h                                 |    2 +-
7889  include/linux/gfp.h                                |    8 +-
7890  include/linux/highmem.h                            |    1 +
7891  include/linux/huge_mm.h                            |    4 +
7892  include/linux/hugetlb.h                            |    7 +-
7893  include/linux/init.h                               |   40 +-
7894  include/linux/interrupt.h                          |   18 +-
7895  include/linux/ipc_namespace.h                      |    1 +
7896  include/linux/kernel.h                             |   47 +-
7897  include/linux/memcontrol.h                         |  203 +++
7898  include/linux/memory.h                             |    1 +
7899  include/linux/migrate.h                            |   19 +
7900  include/linux/mm.h                                 |   31 +
7901  include/linux/mm_types.h                           |   19 +-
7902  include/linux/mmzone.h                             |    9 -
7903  include/linux/msg.h                                |    6 +-
7904  include/linux/node.h                               |    3 +-
7905  include/linux/oom.h                                |   21 +-
7906  include/linux/page-isolation.h                     |   10 +-
7907  include/linux/pagemap.h                            |   16 +
7908  include/linux/percpu-rwsem.h                       |   83 +-
7909  include/linux/platform_data/lp855x.h               |    9 +-
7910  include/linux/res_counter.h                        |   12 +-
7911  include/linux/rmap.h                               |    3 +
7912  include/linux/sched.h                              |    8 +-
7913  include/linux/shm.h                                |   15 +
7914  include/linux/slab.h                               |   48 +
7915  include/linux/slab_def.h                           |    3 +
7916  include/linux/slub_def.h                           |    9 +-
7917  include/linux/string.h                             |   11 +
7918  include/linux/thread_info.h                        |    2 +
7919  include/linux/types.h                              |    1 +
7920  include/linux/vm_event_item.h                      |    8 +-
7921  include/linux/writeback.h                          |    9 +-
7922  include/trace/events/gfpflags.h                    |    1 +
7923  include/trace/events/oom.h                         |    4 +-
7924  include/trace/events/task.h                        |    8 +-
7925  include/uapi/asm-generic/mman.h                    |   13 +
7926  include/uapi/linux/eventpoll.h                     |    1 +
7927  include/uapi/linux/msg.h                           |    1 +
7928  init/Kconfig                                       |    3 +-
7929  ipc/compat.c                                       |   46 +-
7930  ipc/ipc_sysctl.c                                   |   32 +
7931  ipc/msg.c                                          |  123 +-
7932  ipc/msgutil.c                                      |   43 +
7933  ipc/sem.c                                          |  250 +++-
7934  ipc/shm.c                                          |    3 +-
7935  ipc/util.c                                         |   16 +-
7936  ipc/util.h                                         |    2 +
7937  kernel/cgroup.c                                    |    1 -
7938  kernel/compat.c                                    |   17 +
7939  kernel/fork.c                                      |   11 +-
7940  kernel/irq/manage.c                                |    2 +-
7941  kernel/module.c                                    |    3 -
7942  kernel/res_counter.c                               |   20 +-
7943  kernel/softirq.c                                   |    9 +-
7944  kernel/time.c                                      |    4 +-
7945  kernel/timeconst.pl                                |    2 +-
7946  kernel/trace/trace_uprobe.c                        |    8 +-
7947  lib/Makefile                                       |    2 +-
7948  lib/dynamic_debug.c                                |    9 +-
7949  lib/kstrtox.c                                      |   64 +
7950  lib/percpu-rwsem.c                                 |  123 ++
7951  lib/vsprintf.c                                     |  104 +-
7952  mm/Kconfig                                         |   15 +
7953  mm/Makefile                                        |    3 +-
7954  mm/balloon_compaction.c                            |  271 ++++
7955  mm/compaction.c                                    |   27 +-
7956  mm/dmapool.c                                       |   24 +
7957  mm/highmem.c                                       |  108 +-
7958  mm/huge_memory.c                                   |  174 +--
7959  mm/hugetlb.c                                       |    4 +-
7960  mm/internal.h                                      |   53 +
7961  mm/ksm.c                                           |   21 +-
7962  mm/memblock.c                                      |    5 +
7963  mm/memcontrol.c                                    | 1551 +++++++++++++++++---
7964  mm/memory-failure.c                                |   28 +-
7965  mm/memory.c                                        |   28 +-
7966  mm/memory_hotplug.c                                |  153 +-
7967  mm/mempolicy.c                                     |   21 +-
7968  mm/migrate.c                                       |  100 +-
7969  mm/mmap.c                                          |  486 ++++--
7970  mm/oom_kill.c                                      |   86 +-
7971  mm/page-writeback.c                                |   11 +-
7972  mm/page_alloc.c                                    |  219 +--
7973  mm/page_cgroup.c                                   |    3 +
7974  mm/page_isolation.c                                |   27 +-
7975  mm/rmap.c                                          |   59 +-
7976  mm/shmem.c                                         |   21 +-
7977  mm/slab.c                                          |   98 +-
7978  mm/slab.h                                          |  137 +-
7979  mm/slab_common.c                                   |  118 +-
7980  mm/slob.c                                          |    2 +-
7981  mm/slub.c                                          |  128 +-
7982  mm/sparse.c                                        |   25 +-
7983  mm/swap_state.c                                    |    6 +
7984  mm/swapfile.c                                      |   31 +-
7985  mm/truncate.c                                      |    8 +-
7986  mm/vmalloc.c                                       |    4 +-
7987  mm/vmscan.c                                        |   35 +-
7988  mm/vmstat.c                                        |   10 +-
7989  scripts/checkpatch.pl                              |    9 +
7990  scripts/pnmtologo.c                                |    9 +
7991  scripts/tags.sh                                    |   41 +-
7992  security/selinux/netnode.c                         |    3 +-
7993  sound/Kconfig                                      |    3 -
7994  sound/sound_core.c                                 |    3 +-
7995  tools/testing/selftests/Makefile                   |    2 +-
7996  tools/testing/selftests/epoll/Makefile             |   11 +
7997  tools/testing/selftests/epoll/test_epoll.c         |  364 +++++
7998  tools/testing/selftests/ipc/Makefile               |   25 +
7999  tools/testing/selftests/ipc/msgque.c               |  246 ++++
8000  tools/testing/selftests/kcmp/kcmp_test.c           |    6 +-
8001  tools/testing/selftests/vm/Makefile                |    4 +-
8002  tools/testing/selftests/vm/thuge-gen.c             |  254 ++++
8003  267 files changed, 9148 insertions(+), 3079 deletions(-)
8004  create mode 100644 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
8005  create mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt
8006  create mode 100644 fs/hfsplus/attributes.c
8007  create mode 100644 include/linux/balloon_compaction.h
8008  create mode 100644 lib/percpu-rwsem.c
8009  create mode 100644 mm/balloon_compaction.c
8010  create mode 100644 tools/testing/selftests/epoll/Makefile
8011  create mode 100644 tools/testing/selftests/epoll/test_epoll.c
8012  create mode 100644 tools/testing/selftests/ipc/Makefile
8013  create mode 100644 tools/testing/selftests/ipc/msgque.c
8014  create mode 100644 tools/testing/selftests/vm/thuge-gen.c
8015 $ git revert 61df919011f6
8016 [master f3c91ce] Revert "MM: Support more pagesizes for MAP_HUGETLB/SHM_HUGETLB v7 fix fix fix"
8017  1 file changed, 4 insertions(+)
8018 $ git revert 1656c5150fcb
8019 [master 0ae83cc] Revert "mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix-fix"
8020  1 file changed, 1 insertion(+), 1 deletion(-)
8021 $ git revert 8ebe9d95c30d
8022 [master b031c5f] Revert "mm-support-more-pagesizes-for-map_hugetlb-shm_hugetlb-v7-fix"
8023  1 file changed, 5 insertions(+), 4 deletions(-)
8024 $ git revert dfd3b23108ef
8025 [master b47e763] Revert "mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB"
8026  7 files changed, 19 insertions(+), 97 deletions(-)
8027 $ git revert 92d1079b281f
8028 [master cb76ec1] Revert "staging:iio: add a callback buffer for in kernel push interface"
8029  4 files changed, 166 deletions(-)
8030  delete mode 100644 drivers/iio/buffer_cb.c