Next/merge.log

   1 $ date
   2 Wed Apr 11 11:09:04 EST 2012
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 0034102 Linux 3.4-rc2
   7 Merging origin/master (a9e1e53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
   8 $ git merge origin/master
   9 Updating 0034102..a9e1e53
  10 Fast-forward
  11  arch/sparc/kernel/leon_pci.c               |   13 ---
  12  arch/sparc/mm/fault_32.c                   |   37 ++++++--
  13  arch/sparc/mm/fault_64.c                   |   37 ++++++--
  14  arch/um/drivers/cow.h                      |   35 --------
  15  arch/um/drivers/cow_user.c                 |   43 +++++----
  16  arch/um/drivers/mconsole_kern.c            |    1 +
  17  arch/um/include/asm/Kbuild                 |    3 +-
  18  arch/um/kernel/Makefile                    |    7 +-
  19  arch/um/kernel/process.c                   |    6 +-
  20  arch/um/kernel/skas/mmu.c                  |    1 -
  21  arch/x86/Makefile.um                       |    3 +
  22  arch/x86/um/asm/barrier.h                  |   75 ++++++++++++++++
  23  arch/x86/um/asm/system.h                   |  135 ----------------------------
  24  crypto/Kconfig                             |    6 +-
  25  drivers/i2c/busses/i2c-designware-pcidrv.c |    1 -
  26  drivers/regulator/anatop-regulator.c       |    6 +-
  27  drivers/staging/android/lowmemorykiller.c  |   48 ++--------
  28  scripts/mod/modpost.c                      |    7 +-
  29  scripts/mod/modpost.h                      |    1 +
  30  19 files changed, 186 insertions(+), 279 deletions(-)
  31  create mode 100644 arch/x86/um/asm/barrier.h
  32  delete mode 100644 arch/x86/um/asm/system.h
  33 Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
  34 $ git merge fixes/master
  35 Already up-to-date.
  36 Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
  37 $ git merge kbuild-current/rc-fixes
  38 Already up-to-date.
  39 Merging arm-current/fixes (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
  40 $ git merge arm-current/fixes
  41 Merge made by the 'recursive' strategy.
  42  arch/arm/common/vic.c      |    9 ++++-----
  43  arch/arm/mm/fault.c        |    2 +-
  44  drivers/amba/bus.c         |   42 +-----------------------------------------
  45  drivers/mfd/db8500-prcmu.c |    1 +
  46  drivers/spi/spi-pl022.c    |    2 --
  47  include/linux/amba/bus.h   |    8 --------
  48  6 files changed, 7 insertions(+), 57 deletions(-)
  49 Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
  50 $ git merge m68k-current/for-linus
  51 Already up-to-date.
  52 Merging powerpc-merge/merge (9b218f6 powerpc/eeh: Fix use of set_current_state() in eeh event handling set_current_state() wart)
  53 $ git merge powerpc-merge/merge
  54 Already up-to-date.
  55 Merging sparc/master (d657784 sparc32,leon: fix leon build)
  56 $ git merge sparc/master
  57 Already up-to-date.
  58 Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
  59 $ git merge scsi-rc-fixes/master
  60 Already up-to-date.
  61 Merging net/master (18a223e tcp: fix tcp_rcv_rtt_update() use of an unscaled RTT sample)
  62 $ git merge net/master
  63 Merge made by the 'recursive' strategy.
  64  include/linux/netfilter_ipv6/ip6_tables.h      |   12 +++++++++++-
  65  net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c |   12 ++++++++++--
  66  net/ipv4/tcp.c                                 |    3 +--
  67  net/ipv4/tcp_input.c                           |    7 +++++--
  68  net/ipv6/netfilter/ip6_tables.c                |   14 --------------
  69  net/netfilter/nf_conntrack_core.c              |    2 +-
  70  net/netfilter/nf_conntrack_proto_tcp.c         |    4 ++--
  71  7 files changed, 30 insertions(+), 24 deletions(-)
  72 Merging sound-current/for-linus (fae3d88 ALSA: hda - hide HDMI/ELD printks unless snd.debug=2)
  73 $ git merge sound-current/for-linus
  74 Auto-merging sound/soc/soc-core.c
  75 Auto-merging sound/soc/imx/imx-audmux.c
  76 Auto-merging MAINTAINERS
  77 Merge made by the 'recursive' strategy.
  78  MAINTAINERS                     |    4 +-
  79  include/sound/core.h            |   10 ++++
  80  sound/isa/sscape.c              |    6 ++-
  81  sound/oss/msnd_pinnacle.c       |    8 ++-
  82  sound/pci/asihpi/hpi_internal.h |    4 +-
  83  sound/pci/asihpi/hpios.c        |   10 ++--
  84  sound/pci/hda/hda_codec.h       |    3 ++
  85  sound/pci/hda/hda_eld.c         |    6 +--
  86  sound/pci/hda/hda_proc.c        |   13 +++--
  87  sound/pci/hda/patch_conexant.c  |  108 +++++++++++++++------------------------
  88  sound/pci/hda/patch_hdmi.c      |    9 ++--
  89  sound/soc/codecs/ak4642.c       |    2 +-
  90  sound/soc/codecs/sgtl5000.c     |   25 ++++-----
  91  sound/soc/imx/imx-audmux.c      |    5 +-
  92  sound/soc/pxa/pxa2xx-i2s.c      |    1 +
  93  sound/soc/soc-core.c            |    2 +
  94  sound/soc/tegra/tegra_i2s.c     |    6 ++-
  95  sound/soc/tegra/tegra_spdif.c   |    4 ++
  96  18 files changed, 120 insertions(+), 106 deletions(-)
  97 Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
  98 $ git merge pci-current/for-linus
  99 Already up-to-date.
 100 Merging wireless/master (011afa1 Revert "ath9k: fix going to full-sleep on PS idle")
 101 $ git merge wireless/master
 102 Auto-merging MAINTAINERS
 103 Merge made by the 'recursive' strategy.
 104  MAINTAINERS                                 |    8 +++----
 105  drivers/bcma/Kconfig                        |    2 +-
 106  drivers/bcma/driver_pci_host.c              |    1 +
 107  drivers/bluetooth/ath3k.c                   |    4 ++++
 108  drivers/bluetooth/btusb.c                   |    5 ++++-
 109  drivers/bluetooth/hci_ldisc.c               |    2 +-
 110  drivers/net/wireless/ath/ath9k/main.c       |    8 +++----
 111  drivers/net/wireless/rt2x00/rt2x00dev.c     |    6 +-----
 112  drivers/net/wireless/rtlwifi/base.c         |    5 ++++-
 113  drivers/net/wireless/rtlwifi/rtl8192de/sw.c |    6 ------
 114  include/net/bluetooth/hci.h                 |    3 ++-
 115  include/net/bluetooth/hci_core.h            |   12 ++++++-----
 116  include/net/bluetooth/mgmt.h                |    2 +-
 117  include/net/mac80211.h                      |    2 +-
 118  net/bluetooth/hci_core.c                    |    7 ++++++
 119  net/bluetooth/l2cap_core.c                  |    3 +++
 120  net/bluetooth/l2cap_sock.c                  |    5 +++--
 121  net/bluetooth/mgmt.c                        |   13 +++++++----
 122  net/mac80211/mlme.c                         |    3 +--
 123  net/wireless/nl80211.c                      |   31 ++++++++++++++++-----------
 124  net/wireless/wext-core.c                    |    6 ++++--
 125  21 files changed, 79 insertions(+), 55 deletions(-)
 126 Merging driver-core.current/driver-core-linus (282029c kobject: provide more diagnostic info for kobject_add_internal() failures)
 127 $ git merge driver-core.current/driver-core-linus
 128 Merge made by the 'recursive' strategy.
 129  drivers/base/soc.c |    4 +---
 130  fs/sysfs/dir.c     |    5 ++++-
 131  fs/sysfs/group.c   |    6 +++++-
 132  lib/kobject.c      |   14 +++++++-------
 133  4 files changed, 17 insertions(+), 12 deletions(-)
 134 Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk)
 135 $ git merge tty.current/tty-linus
 136 Auto-merging drivers/tty/serial/pch_uart.c
 137 Merge made by the 'recursive' strategy.
 138  drivers/char/hpet.c                |    4 ++--
 139  drivers/isdn/gigaset/interface.c   |    2 +-
 140  drivers/tty/serial/8250/8250.c     |   12 +++++-----
 141  drivers/tty/serial/8250/8250_pci.c |   16 +-------------
 142  drivers/tty/serial/Kconfig         |    2 +-
 143  drivers/tty/serial/altera_uart.c   |    4 ++--
 144  drivers/tty/serial/amba-pl011.c    |    8 +++----
 145  drivers/tty/serial/atmel_serial.c  |    4 ++++
 146  drivers/tty/serial/omap-serial.c   |   43 +++++++++++++++++-------------------
 147  drivers/tty/serial/pch_uart.c      |    8 +++++++
 148  drivers/tty/serial/samsung.c       |    1 +
 149  drivers/tty/vt/vt.c                |    3 +--
 150  include/linux/serial_core.h        |    2 +-
 151  13 files changed, 52 insertions(+), 57 deletions(-)
 152 Merging usb.current/usb-linus (a65a6f1 USB: serial: fix race between probe and open)
 153 $ git merge usb.current/usb-linus
 154 Merge made by the 'recursive' strategy.
 155  Documentation/usb/URB.txt       |   22 ++++++++++++++++++++++
 156  Documentation/usb/usbmon.txt    |    6 +++---
 157  drivers/usb/Kconfig             |   16 ++++++++--------
 158  drivers/usb/core/driver.c       |    9 +++++++--
 159  drivers/usb/core/hcd.c          |   12 ++++++++++++
 160  drivers/usb/core/message.c      |   11 ++++++-----
 161  drivers/usb/core/urb.c          |   12 ++++++++++++
 162  drivers/usb/gadget/inode.c      |    1 -
 163  drivers/usb/host/ehci-hcd.c     |    3 +++
 164  drivers/usb/host/ehci-hub.c     |   31 ++++++++++++++++---------------
 165  drivers/usb/host/ehci-tegra.c   |    2 ++
 166  drivers/usb/host/ehci.h         |    2 ++
 167  drivers/usb/host/uhci-hub.c     |    5 +++--
 168  drivers/usb/serial/bus.c        |    5 -----
 169  drivers/usb/serial/ftdi_sio.c   |   36 ++++++++++++++++++++----------------
 170  drivers/usb/serial/metro-usb.c  |    6 +++---
 171  drivers/usb/serial/option.c     |    1 +
 172  drivers/usb/serial/pl2303.c     |    2 +-
 173  drivers/usb/serial/sierra.c     |    1 +
 174  drivers/usb/serial/usb-serial.c |   31 ++++++++++---------------------
 175  drivers/usb/storage/usb.c       |   30 ++++++++++++++++++++++++++++++
 176  include/linux/usb/serial.h      |    8 --------
 177  22 files changed, 162 insertions(+), 90 deletions(-)
 178 Merging staging.current/staging-linus (6490311 staging/xgifb: fix display on XGI Volari Z11m cards)
 179 $ git merge staging.current/staging-linus
 180 Auto-merging MAINTAINERS
 181 Merge made by the 'recursive' strategy.
 182  MAINTAINERS                                 |    1 +
 183  drivers/staging/android/Kconfig             |    3 ++-
 184  drivers/staging/android/timed_gpio.c        |   27 +++++++++++++-----------
 185  drivers/staging/iio/inkern.c                |    1 +
 186  drivers/staging/iio/magnetometer/ak8975.c   |    8 ++++---
 187  drivers/staging/media/as102/as102_fw.c      |    2 +-
 188  drivers/staging/omapdrm/omap_drv.c          |    7 ++++---
 189  drivers/staging/ozwpan/TODO                 |    4 +++-
 190  drivers/staging/ramster/Kconfig             |    6 +-----
 191  drivers/staging/rts_pstor/ms.c              |    3 ++-
 192  drivers/staging/rts_pstor/rtsx.c            |    5 +++++
 193  drivers/staging/rts_pstor/rtsx_transport.c  |   11 +++++-----
 194  drivers/staging/sep/sep_main.c              |    6 +++---
 195  drivers/staging/vme/devices/vme_pio2_core.c |    4 ++--
 196  drivers/staging/vt6655/key.c                |    3 +++
 197  drivers/staging/vt6656/key.c                |    3 +++
 198  drivers/staging/xgifb/vb_init.c             |    2 +-
 199  drivers/staging/xgifb/vb_setmode.c          |    7 +++++++
 200  drivers/staging/xgifb/vb_table.h            |   11 +++++++++-
 201  drivers/staging/zsmalloc/zsmalloc-main.c    |   30 ++++++++++++++++-----------
 202  20 files changed, 93 insertions(+), 51 deletions(-)
 203 Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2)
 204 $ git merge char-misc.current/char-misc-linus
 205 Already up-to-date.
 206 Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
 207 $ git merge cpufreq-current/fixes
 208 Already up-to-date.
 209 Merging input-current/for-linus (fb16395 Input: trackpoint - use psmouse_fmt() for messages)
 210 $ git merge input-current/for-linus
 211 Merge made by the 'recursive' strategy.
 212  drivers/input/mouse/elantech.c          |   10 ++++++++--
 213  drivers/input/mouse/sentelic.c          |    8 ++++++++
 214  drivers/input/mouse/trackpoint.c        |   14 ++++++++------
 215  drivers/input/touchscreen/tps6507x-ts.c |    4 +---
 216  4 files changed, 25 insertions(+), 11 deletions(-)
 217 Merging md-current/for-linus (5020ad7 md/raid1,raid10: don't compare excess byte during consistency check.)
 218 $ git merge md-current/for-linus
 219 Already up-to-date.
 220 Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
 221 $ git merge audit-current/for-linus
 222 Already up-to-date.
 223 Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
 224 $ git merge crypto-current/master
 225 Merge made by the 'recursive' strategy.
 226  crypto/sha512_generic.c        |    2 +-
 227  drivers/crypto/ixp4xx_crypto.c |    1 +
 228  drivers/crypto/talitos.c       |   20 +++++++++++++++++---
 229  3 files changed, 19 insertions(+), 4 deletions(-)
 230 Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
 231 $ git merge ide/master
 232 Already up-to-date.
 233 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
 234 $ git merge dwmw2/master
 235 Already up-to-date.
 236 Merging sh-current/sh-fixes-for-linus (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
 237 $ git merge sh-current/sh-fixes-for-linus
 238 Already up-to-date.
 239 Merging irqdomain-current/irqdomain/merge (1acf771 irq_domain: Fix debug output to use "irq" instead of "virq")
 240 $ git merge irqdomain-current/irqdomain/merge
 241 Merge made by the 'recursive' strategy.
 242  arch/c6x/include/asm/irq.h     |    4 ----
 243  arch/c6x/kernel/irq.c          |   13 -------------
 244  arch/powerpc/include/asm/irq.h |    2 --
 245  arch/powerpc/kernel/irq.c      |    6 ------
 246  include/linux/irq.h            |    5 +++++
 247  include/linux/irqdomain.h      |    6 ------
 248  include/linux/types.h          |    6 ++++++
 249  kernel/irq/Kconfig             |    2 +-
 250  kernel/irq/irqdomain.c         |   11 ++++++-----
 251  9 files changed, 18 insertions(+), 37 deletions(-)
 252 Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds)
 253 $ git merge devicetree-current/devicetree/merge
 254 Merge made by the 'recursive' strategy.
 255  include/linux/of_irq.h |   10 ++++++++--
 256  1 file changed, 8 insertions(+), 2 deletions(-)
 257 Merging spi-current/spi/merge (cc4d22a spi/imx: mark base member in spi_imx_data as __iomem)
 258 $ git merge spi-current/spi/merge
 259 Merge made by the 'recursive' strategy.
 260  drivers/spi/spi-davinci.c  |    6 +++---
 261  drivers/spi/spi-fsl-spi.c  |    4 +++-
 262  drivers/spi/spi-imx.c      |    2 +-
 263  include/linux/amba/pl022.h |    2 ++
 264  4 files changed, 9 insertions(+), 5 deletions(-)
 265 Merging gpio-current/gpio/merge (6270d83 gpio: Fix range check in of_gpio_simple_xlate())
 266 $ git merge gpio-current/gpio/merge
 267 Merge made by the 'recursive' strategy.
 268  drivers/gpio/Kconfig          |    2 +-
 269  drivers/gpio/gpio-adp5588.c   |    2 +-
 270  drivers/gpio/gpio-sodaville.c |   23 ++++++++++-------------
 271  drivers/of/gpio.c             |    2 +-
 272  4 files changed, 13 insertions(+), 16 deletions(-)
 273 Merging arm/for-next (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
 274 $ git merge arm/for-next
 275 Already up-to-date.
 276 Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
 277 $ git merge arm-perf/for-next/perf
 278 Already up-to-date.
 279 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
 280 $ git merge davinci/davinci-next
 281 Already up-to-date.
 282 Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
 283 $ git merge samsung/next-samsung
 284 Already up-to-date.
 285 Merging s5p/for-next (cfae12a Merge branch 'next/iommu-samsung' into for-next)
 286 $ git merge s5p/for-next
 287 Removing arch/arm/plat-samsung/include/plat/sysmmu.h
 288 Removing arch/arm/plat-s5p/sysmmu.c
 289 Removing arch/arm/mach-exynos/include/mach/regs-sysmmu.h
 290 Merge made by the 'recursive' strategy.
 291  arch/arm/mach-exynos/Kconfig                    |   10 +-
 292  arch/arm/mach-exynos/Makefile                   |    2 +-
 293  arch/arm/mach-exynos/Makefile.boot              |    3 +
 294  arch/arm/mach-exynos/clock-exynos4.c            |   79 ++--
 295  arch/arm/mach-exynos/clock-exynos4.h            |    2 +
 296  arch/arm/mach-exynos/clock-exynos4210.c         |   11 +
 297  arch/arm/mach-exynos/clock-exynos4212.c         |   28 +-
 298  arch/arm/mach-exynos/clock-exynos5.c            |   90 +++++
 299  arch/arm/mach-exynos/common.c                   |   65 ++--
 300  arch/arm/mach-exynos/dev-sysmmu.c               |  457 ++++++++++++-----------
 301  arch/arm/mach-exynos/include/mach/irqs.h        |   27 +-
 302  arch/arm/mach-exynos/include/mach/map.h         |   42 +++
 303  arch/arm/mach-exynos/include/mach/regs-clock.h  |   11 +
 304  arch/arm/mach-exynos/include/mach/regs-sysmmu.h |   28 --
 305  arch/arm/mach-exynos/include/mach/sysmmu.h      |   88 +++--
 306  arch/arm/mach-exynos/mach-armlex4210.c          |    1 -
 307  arch/arm/mach-exynos/mach-exynos5-dt.c          |    2 +-
 308  arch/arm/mach-exynos/mach-nuri.c                |   51 +--
 309  arch/arm/mach-exynos/mach-smdkv310.c            |    1 -
 310  arch/arm/mach-exynos/mach-universal_c210.c      |    5 +-
 311  arch/arm/mach-s3c64xx/mach-crag6410.c           |   18 +
 312  arch/arm/mach-s5pv210/dma.c                     |    2 -
 313  arch/arm/mach-s5pv210/mach-aquila.c             |    4 +-
 314  arch/arm/mach-s5pv210/mach-goni.c               |    4 +-
 315  arch/arm/plat-s5p/Kconfig                       |    8 -
 316  arch/arm/plat-s5p/Makefile                      |    1 -
 317  arch/arm/plat-s5p/sysmmu.c                      |  313 ----------------
 318  arch/arm/plat-samsung/include/plat/devs.h       |    1 -
 319  arch/arm/plat-samsung/include/plat/sysmmu.h     |   95 -----
 320  29 files changed, 603 insertions(+), 846 deletions(-)
 321  delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h
 322  delete mode 100644 arch/arm/plat-s5p/sysmmu.c
 323  delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h
 324 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
 325 $ git merge xilinx/arm-next
 326 Already up-to-date.
 327 Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
 328 $ git merge blackfin/for-linus
 329 Already up-to-date.
 330 Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
 331 $ git merge c6x/for-linux-next
 332 Already up-to-date.
 333 Merging cris/for-next (4d5914d cris/mm/fault.c: Port OOM changes to do_page_fault)
 334 $ git merge cris/for-next
 335 Merge made by the 'recursive' strategy.
 336  Documentation/cris/README               |   62 +++++++++++++++----------------
 337  arch/cris/arch-v10/kernel/kgdb.c        |    2 +-
 338  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 339  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 340  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 341  arch/cris/include/asm/posix_types.h     |    2 +
 342  arch/cris/kernel/vmlinux.lds.S          |    1 +
 343  arch/cris/mm/fault.c                    |   31 +++++++++++++---
 344  drivers/net/cris/eth_v10.c              |    1 -
 345  9 files changed, 64 insertions(+), 45 deletions(-)
 346 Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
 347 $ git merge quilt/hexagon
 348 Resolved 'arch/hexagon/Kconfig' using previous resolution.
 349 Auto-merging arch/hexagon/kernel/vdso.c
 350 Auto-merging arch/hexagon/kernel/ptrace.c
 351 Auto-merging arch/hexagon/kernel/dma.c
 352 Auto-merging arch/hexagon/Kconfig
 353 CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
 354 Automatic merge failed; fix conflicts and then commit the result.
 355 $ git commit -v -a
 356 [master 16cc62d] Merge branch 'quilt/hexagon'
 357 $ git diff -M --stat --summary HEAD^..
 358  arch/hexagon/Kconfig                      |   23 ++++-------------------
 359  arch/hexagon/Makefile                     |    4 ----
 360  arch/hexagon/include/asm/spinlock_types.h |    2 --
 361  arch/hexagon/kernel/dma.c                 |    1 +
 362  arch/hexagon/kernel/ptrace.c              |    1 +
 363  arch/hexagon/kernel/time.c                |    7 +++----
 364  arch/hexagon/kernel/vdso.c                |    1 +
 365  7 files changed, 10 insertions(+), 29 deletions(-)
 366 Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
 367 $ git merge ia64/next
 368 Auto-merging arch/ia64/sn/kernel/irq.c
 369 Auto-merging arch/ia64/kernel/msi_ia64.c
 370 Auto-merging arch/ia64/kernel/iosapic.c
 371 Merge made by the 'recursive' strategy.
 372  arch/ia64/kernel/iosapic.c   |    4 +++-
 373  arch/ia64/kernel/msi_ia64.c  |    4 ++--
 374  arch/ia64/sn/kernel/irq.c    |    2 +-
 375  arch/ia64/sn/kernel/msi_sn.c |    2 +-
 376  4 files changed, 7 insertions(+), 5 deletions(-)
 377 Merging m68k/for-next (25d0b90 scsi/atari: Make more functions static)
 378 $ git merge m68k/for-next
 379 Merge made by the 'recursive' strategy.
 380  arch/m68k/amiga/platform.c            |  126 ++++++++++++++++++++++++---------
 381  arch/m68k/atari/ataints.c             |    4 +-
 382  arch/m68k/include/asm/atariints.h     |    4 +-
 383  arch/m68k/include/asm/entry.h         |    2 -
 384  drivers/net/ethernet/amd/ariadne.c    |    8 +--
 385  drivers/net/ethernet/amd/atarilance.c |   11 ++-
 386  drivers/scsi/atari_scsi.c             |   26 ++++---
 387  drivers/scsi/atari_scsi.h             |    5 --
 388  8 files changed, 122 insertions(+), 64 deletions(-)
 389 Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code)
 390 $ git merge m68knommu/for-next
 391 Auto-merging arch/m68k/platform/68VZ328/bootlogo.h
 392 Removing arch/m68k/kernel/signal_no.c
 393 Removing arch/m68k/kernel/signal_mm.c
 394 Merge made by the 'recursive' strategy.
 395  arch/m68k/kernel/signal.c                          | 1201 +++++++++++++++++++-
 396  arch/m68k/kernel/signal_mm.c                       | 1115 ------------------
 397  arch/m68k/kernel/signal_no.c                       |  765 -------------
 398  arch/m68k/platform/68EZ328/Makefile                |    6 -
 399  arch/m68k/platform/68VZ328/Makefile                |    9 +-
 400  arch/m68k/platform/{68EZ328 => 68VZ328}/bootlogo.h |    2 +-
 401  6 files changed, 1202 insertions(+), 1896 deletions(-)
 402  delete mode 100644 arch/m68k/kernel/signal_mm.c
 403  delete mode 100644 arch/m68k/kernel/signal_no.c
 404  rename arch/m68k/platform/{68EZ328 => 68VZ328}/bootlogo.h (99%)
 405 Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
 406 $ git merge microblaze/next
 407 Already up-to-date.
 408 Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' into mips-for-linux-next)
 409 $ git merge mips/mips-for-linux-next
 410 Already up-to-date!
 411 Merge made by the 'recursive' strategy.
 412 Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
 413 $ git merge openrisc/for-upstream
 414 Merge made by the 'recursive' strategy.
 415 Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
 416 $ git merge parisc/for-next
 417 Already up-to-date!
 418 Merge made by the 'recursive' strategy.
 419 Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
 420 $ git merge powerpc/next
 421 Already up-to-date.
 422 Merging 4xx/next (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
 423 $ git merge 4xx/next
 424 Already up-to-date.
 425 Merging mpc5xxx/next (7b6bb64 powerpc/5200: convert mpc5200 to use of_platform_populate())
 426 $ git merge mpc5xxx/next
 427 Merge made by the 'recursive' strategy.
 428 Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0)
 429 $ git merge galak/next
 430 Already up-to-date.
 431 Merging s390/features (b7918da [S390] update default configuration)
 432 $ git merge s390/features
 433 Merge made by the 'recursive' strategy.
 434  arch/s390/Kconfig               |    1 -
 435  arch/s390/defconfig             |   37 +++++++++++------------
 436  arch/s390/include/asm/pgalloc.h |    3 --
 437  arch/s390/include/asm/tlb.h     |   22 +-------------
 438  arch/s390/mm/maccess.c          |   27 +++++++++++------
 439  arch/s390/mm/pgtable.c          |   63 +++++++++++++++++++++++++++++++++++++--
 440  drivers/s390/block/dasd_eckd.c  |   24 ++++++++++-----
 441  drivers/s390/char/vmur.c        |    2 +-
 442  8 files changed, 114 insertions(+), 65 deletions(-)
 443 Merging sh/sh-latest (bbb4ce5 serial: sh-sci: modify sci_break_ctl())
 444 $ git merge sh/sh-latest
 445 Merge made by the 'recursive' strategy.
 446  drivers/tty/serial/sh-sci.c |   30 ++++++++++++++++++++++++++----
 447  include/linux/serial_sci.h  |    2 ++
 448  2 files changed, 28 insertions(+), 4 deletions(-)
 449 Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
 450 $ git merge sparc-next/master
 451 Auto-merging arch/sparc/kernel/unaligned_64.c
 452 Auto-merging arch/sparc/kernel/ds.c
 453 Merge made by the 'recursive' strategy.
 454  arch/sparc/kernel/ds.c           |    2 +-
 455  arch/sparc/kernel/unaligned_64.c |    1 -
 456  arch/sparc/mm/srmmu.c            |    2 +-
 457  3 files changed, 2 insertions(+), 3 deletions(-)
 458 Merging tile/master (0638f53 arch/tile: tilegx PCI root complex support)
 459 $ git merge tile/master
 460 Merge made by the 'recursive' strategy.
 461  arch/tile/Kconfig                                  |   48 +-
 462  arch/tile/Makefile                                 |    2 +
 463  arch/tile/gxio/Kconfig                             |   34 +
 464  arch/tile/gxio/Makefile                            |    8 +
 465  arch/tile/gxio/dma_queue.c                         |  236 +++
 466  arch/tile/gxio/iorpc_globals.c                     |  102 +
 467  arch/tile/gxio/iorpc_mpipe.c                       |  571 ++++++
 468  arch/tile/gxio/iorpc_mpipe_info.c                  |   95 +
 469  arch/tile/gxio/iorpc_trio.c                        |  352 ++++
 470  arch/tile/gxio/kiorpc.c                            |   60 +
 471  arch/tile/gxio/mpipe.c                             |  630 ++++++
 472  arch/tile/gxio/trio.c                              |   49 +
 473  arch/tile/include/arch/mpipe.h                     |  321 +++
 474  arch/tile/include/arch/mpipe_constants.h           |   42 +
 475  arch/tile/include/arch/mpipe_def.h                 |   39 +
 476  arch/tile/include/arch/mpipe_shm.h                 |  421 ++++
 477  arch/tile/include/arch/mpipe_shm_def.h             |   23 +
 478  arch/tile/include/arch/spr_def_32.h                |   56 +
 479  arch/tile/include/arch/spr_def_64.h                |   43 +
 480  arch/tile/include/arch/trio.h                      |   68 +
 481  arch/tile/include/arch/trio_constants.h            |   36 +
 482  arch/tile/include/arch/trio_def.h                  |   41 +
 483  arch/tile/include/arch/trio_pcie_intfc.h           |  203 ++
 484  arch/tile/include/arch/trio_pcie_intfc_def.h       |   32 +
 485  arch/tile/include/arch/trio_pcie_rc.h              |  144 ++
 486  arch/tile/include/arch/trio_pcie_rc_def.h          |   24 +
 487  arch/tile/include/arch/trio_shm.h                  |  111 ++
 488  arch/tile/include/arch/trio_shm_def.h              |   19 +
 489  arch/tile/include/asm/Kbuild                       |    2 +-
 490  arch/tile/include/asm/atomic_32.h                  |   10 +
 491  arch/tile/include/asm/byteorder.h                  |   20 +
 492  arch/tile/include/asm/cachectl.h                   |   42 +
 493  arch/tile/include/asm/compat.h                     |    3 -
 494  arch/tile/include/asm/elf.h                        |    5 +
 495  arch/tile/include/asm/futex.h                      |  143 +-
 496  arch/tile/include/asm/hardwall.h                   |   18 +-
 497  arch/tile/include/asm/hugetlb.h                    |   21 +
 498  arch/tile/include/asm/io.h                         |  110 +-
 499  arch/tile/include/asm/irqflags.h                   |   34 +-
 500  arch/tile/include/asm/kexec.h                      |   12 +
 501  arch/tile/include/asm/mmu.h                        |    2 +-
 502  arch/tile/include/asm/mmu_context.h                |    8 +-
 503  arch/tile/include/asm/module.h                     |   40 +
 504  arch/tile/include/asm/page.h                       |   18 +-
 505  arch/tile/include/asm/pci.h                        |   97 +-
 506  arch/tile/include/asm/pgalloc.h                    |   92 +-
 507  arch/tile/include/asm/pgtable.h                    |  111 +-
 508  arch/tile/include/asm/pgtable_32.h                 |   40 +-
 509  arch/tile/include/asm/pgtable_64.h                 |   57 +-
 510  arch/tile/include/asm/processor.h                  |   17 +-
 511  arch/tile/include/asm/setup.h                      |   10 +-
 512  arch/tile/include/asm/syscalls.h                   |    3 +-
 513  arch/tile/include/asm/tlbflush.h                   |   17 +-
 514  arch/tile/include/asm/uaccess.h                    |  222 ++-
 515  arch/tile/include/asm/unistd.h                     |    4 +-
 516  arch/tile/include/gxio/common.h                    |   40 +
 517  arch/tile/include/gxio/dma_queue.h                 |   59 +
 518  arch/tile/include/gxio/iorpc_globals.h             |   38 +
 519  arch/tile/include/gxio/iorpc_mpipe.h               |  124 ++
 520  arch/tile/include/gxio/iorpc_mpipe_info.h          |   46 +
 521  arch/tile/include/gxio/iorpc_trio.h                |  198 ++
 522  arch/tile/include/gxio/kiorpc.h                    |   29 +
 523  arch/tile/include/gxio/mpipe.h                     | 1986 +++++++++++++++++++
 524  arch/tile/include/gxio/trio.h                      |  303 +++
 525  arch/tile/include/hv/drv_mpipe_intf.h              |  602 ++++++
 526  arch/tile/include/hv/drv_trio_intf.h               |  196 ++
 527  arch/tile/include/hv/drv_xgbe_intf.h               |    2 +-
 528  arch/tile/include/hv/hypervisor.h                  |  309 ++-
 529  arch/tile/include/hv/iorpc.h                       |  716 +++++++
 530  arch/tile/kernel/Makefile                          |    7 +-
 531  arch/tile/kernel/entry.S                           |    3 +-
 532  arch/tile/kernel/hardwall.c                        |  754 +++++---
 533  arch/tile/kernel/head_32.S                         |    8 +-
 534  arch/tile/kernel/head_64.S                         |   22 +-
 535  arch/tile/kernel/hvglue.lds                        |    3 +-
 536  arch/tile/kernel/intvec_64.S                       |   80 +-
 537  arch/tile/kernel/machine_kexec.c                   |   42 +-
 538  arch/tile/kernel/module.c                          |   12 +-
 539  arch/tile/kernel/pci_gx.c                          | 1597 +++++++++++++++
 540  arch/tile/kernel/proc.c                            |    1 +
 541  arch/tile/kernel/process.c                         |   16 +-
 542  .../{relocate_kernel.S => relocate_kernel_32.S}    |    0
 543  arch/tile/kernel/relocate_kernel_64.S              |  260 +++
 544  arch/tile/kernel/setup.c                           |  166 +-
 545  arch/tile/kernel/single_step.c                     |   16 +-
 546  arch/tile/kernel/smp.c                             |    2 +-
 547  arch/tile/kernel/smpboot.c                         |    2 +
 548  arch/tile/kernel/sys.c                             |   10 +-
 549  arch/tile/kernel/sysfs.c                           |    8 +
 550  arch/tile/kernel/tlb.c                             |   11 +-
 551  arch/tile/kernel/traps.c                           |   30 +-
 552  arch/tile/lib/atomic_32.c                          |   47 +-
 553  arch/tile/lib/exports.c                            |    8 -
 554  arch/tile/lib/memchr_64.c                          |    8 +-
 555  arch/tile/lib/memcpy_64.c                          |   23 +-
 556  arch/tile/lib/memcpy_tile64.c                      |    8 +-
 557  arch/tile/lib/strchr_64.c                          |   15 +-
 558  arch/tile/lib/string-endian.h                      |   33 +
 559  arch/tile/lib/strlen_64.c                          |   11 +-
 560  arch/tile/lib/usercopy_32.S                        |   76 -
 561  arch/tile/lib/usercopy_64.S                        |   49 -
 562  arch/tile/mm/fault.c                               |   34 +-
 563  arch/tile/mm/homecache.c                           |    1 +
 564  arch/tile/mm/hugetlbpage.c                         |  241 ++-
 565  arch/tile/mm/init.c                                |   19 +-
 566  arch/tile/mm/migrate.h                             |    6 +
 567  arch/tile/mm/migrate_32.S                          |   36 +-
 568  arch/tile/mm/migrate_64.S                          |   34 +-
 569  arch/tile/mm/pgtable.c                             |   47 +-
 570  drivers/net/ethernet/tile/Kconfig                  |    1 +
 571  drivers/net/ethernet/tile/Makefile                 |    4 +-
 572  drivers/net/ethernet/tile/tilegx.c                 | 2045 ++++++++++++++++++++
 573  drivers/pci/quirks.c                               |    6 +-
 574  include/asm-generic/pgtable.h                      |    5 +-
 575  include/linux/hugetlb.h                            |    8 +
 576  init/main.c                                        |   25 +-
 577  mm/hugetlb.c                                       |    1 +
 578  mm/pgtable-generic.c                               |    4 +-
 579  118 files changed, 14239 insertions(+), 1222 deletions(-)
 580  create mode 100644 arch/tile/gxio/Kconfig
 581  create mode 100644 arch/tile/gxio/Makefile
 582  create mode 100644 arch/tile/gxio/dma_queue.c
 583  create mode 100644 arch/tile/gxio/iorpc_globals.c
 584  create mode 100644 arch/tile/gxio/iorpc_mpipe.c
 585  create mode 100644 arch/tile/gxio/iorpc_mpipe_info.c
 586  create mode 100644 arch/tile/gxio/iorpc_trio.c
 587  create mode 100644 arch/tile/gxio/kiorpc.c
 588  create mode 100644 arch/tile/gxio/mpipe.c
 589  create mode 100644 arch/tile/gxio/trio.c
 590  create mode 100644 arch/tile/include/arch/mpipe.h
 591  create mode 100644 arch/tile/include/arch/mpipe_constants.h
 592  create mode 100644 arch/tile/include/arch/mpipe_def.h
 593  create mode 100644 arch/tile/include/arch/mpipe_shm.h
 594  create mode 100644 arch/tile/include/arch/mpipe_shm_def.h
 595  create mode 100644 arch/tile/include/arch/trio.h
 596  create mode 100644 arch/tile/include/arch/trio_constants.h
 597  create mode 100644 arch/tile/include/arch/trio_def.h
 598  create mode 100644 arch/tile/include/arch/trio_pcie_intfc.h
 599  create mode 100644 arch/tile/include/arch/trio_pcie_intfc_def.h
 600  create mode 100644 arch/tile/include/arch/trio_pcie_rc.h
 601  create mode 100644 arch/tile/include/arch/trio_pcie_rc_def.h
 602  create mode 100644 arch/tile/include/arch/trio_shm.h
 603  create mode 100644 arch/tile/include/arch/trio_shm_def.h
 604  create mode 100644 arch/tile/include/asm/cachectl.h
 605  create mode 100644 arch/tile/include/asm/module.h
 606  create mode 100644 arch/tile/include/gxio/common.h
 607  create mode 100644 arch/tile/include/gxio/dma_queue.h
 608  create mode 100644 arch/tile/include/gxio/iorpc_globals.h
 609  create mode 100644 arch/tile/include/gxio/iorpc_mpipe.h
 610  create mode 100644 arch/tile/include/gxio/iorpc_mpipe_info.h
 611  create mode 100644 arch/tile/include/gxio/iorpc_trio.h
 612  create mode 100644 arch/tile/include/gxio/kiorpc.h
 613  create mode 100644 arch/tile/include/gxio/mpipe.h
 614  create mode 100644 arch/tile/include/gxio/trio.h
 615  create mode 100644 arch/tile/include/hv/drv_mpipe_intf.h
 616  create mode 100644 arch/tile/include/hv/drv_trio_intf.h
 617  create mode 100644 arch/tile/include/hv/iorpc.h
 618  create mode 100644 arch/tile/kernel/pci_gx.c
 619  rename arch/tile/kernel/{relocate_kernel.S => relocate_kernel_32.S} (100%)
 620  create mode 100644 arch/tile/kernel/relocate_kernel_64.S
 621  create mode 100644 arch/tile/lib/string-endian.h
 622  create mode 100644 drivers/net/ethernet/tile/tilegx.c
 623 Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
 624 $ git merge unicore32/unicore32
 625 Already up-to-date.
 626 Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
 627 $ git merge ceph/master
 628 Already up-to-date.
 629 Merging cifs/master (f68e556 Make the "word-at-a-time" helper functions more commonly usable)
 630 $ git merge cifs/master
 631 Already up-to-date.
 632 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
 633 $ git merge configfs/linux-next
 634 Already up-to-date.
 635 Merging ecryptfs/next (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
 636 $ git merge ecryptfs/next
 637 Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution.
 638 Auto-merging fs/ecryptfs/mmap.c
 639 Auto-merging fs/ecryptfs/ecryptfs_kernel.h
 640 CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
 641 Automatic merge failed; fix conflicts and then commit the result.
 642 $ git commit -v -a
 643 [master cb09e98] Merge remote-tracking branch 'ecryptfs/next'
 644 $ git diff -M --stat --summary HEAD^..
 645  fs/ecryptfs/mmap.c |   12 ++++++++++--
 646  1 file changed, 10 insertions(+), 2 deletions(-)
 647 Merging ext3/for_next (c2d9fae ext2: Remove s_dirt handling)
 648 $ git merge ext3/for_next
 649 Merge made by the 'recursive' strategy.
 650  Documentation/filesystems/ext3.txt |    6 +++---
 651  fs/ext2/balloc.c                   |    2 --
 652  fs/ext2/ialloc.c                   |    2 --
 653  fs/ext2/super.c                    |    6 ------
 654  fs/ext2/xattr.c                    |    1 -
 655  fs/ext3/ialloc.c                   |   20 ++------------------
 656  fs/jbd/commit.c                    |   10 +++++++---
 657  fs/jbd/journal.c                   |    2 ++
 658  fs/jbd/transaction.c               |    2 --
 659  include/linux/jbd.h                |   15 +++++++++------
 660  include/trace/events/jbd.h         |   24 ++++++++----------------
 661  11 files changed, 31 insertions(+), 59 deletions(-)
 662 Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
 663 $ git merge ext4/dev
 664 Already up-to-date.
 665 Merging fuse/for-next (4273b79 fuse: O_DIRECT support for files)
 666 $ git merge fuse/for-next
 667 Auto-merging fs/fuse/file.c
 668 Merge made by the 'recursive' strategy.
 669  fs/fuse/dir.c  |   25 ++++++-----
 670  fs/fuse/file.c |  129 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 671  2 files changed, 127 insertions(+), 27 deletions(-)
 672 Merging gfs2/master (02ed02f GFS2: Allow caching of rindex glock)
 673 $ git merge gfs2/master
 674 Merge made by the 'recursive' strategy.
 675  fs/gfs2/Kconfig |    7 ++-----
 676  fs/gfs2/aops.c  |    4 ++--
 677  fs/gfs2/bmap.c  |    6 +++++-
 678  fs/gfs2/dir.c   |    4 ++++
 679  fs/gfs2/inode.c |   13 +++++++++++--
 680  fs/gfs2/log.c   |   13 ++++---------
 681  fs/gfs2/lops.c  |   25 +++++++++++--------------
 682  fs/gfs2/rgrp.c  |    8 +++++---
 683  fs/gfs2/xattr.c |   12 ++++++++++++
 684  9 files changed, 56 insertions(+), 36 deletions(-)
 685 Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
 686 $ git merge logfs/master
 687 Merge made by the 'recursive' strategy.
 688  fs/logfs/dev_bdev.c  |    1 +
 689  fs/logfs/inode.c     |   16 ++++++++++++++++
 690  fs/logfs/readwrite.c |    1 -
 691  fs/logfs/segment.c   |    2 +-
 692  4 files changed, 18 insertions(+), 2 deletions(-)
 693 Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup)
 694 $ git merge nfs/linux-next
 695 Merge made by the 'recursive' strategy.
 696  fs/nfs/nfs4state.c       |    7 +++++++
 697  fs/nfs/write.c           |    3 ++-
 698  net/sunrpc/sunrpc_syms.c |   17 +++++++++--------
 699  3 files changed, 18 insertions(+), 9 deletions(-)
 700 Merging nfsd/nfsd-next (797a9d7 nfsd: only register cld pipe notifier when CONFIG_NFSD_V4 is enabled)
 701 $ git merge nfsd/nfsd-next
 702 Already up-to-date.
 703 Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
 704 $ git merge ocfs2/linux-next
 705 Already up-to-date.
 706 Merging omfs/for-next (976d167 Linux 3.1-rc9)
 707 $ git merge omfs/for-next
 708 Already up-to-date.
 709 Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
 710 $ git merge squashfs/master
 711 Already up-to-date.
 712 Merging v9fs/for-next (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
 713 $ git merge v9fs/for-next
 714 Already up-to-date.
 715 Merging ubifs/linux-next (dd775ae Linux 3.4-rc1)
 716 $ git merge ubifs/linux-next
 717 Already up-to-date.
 718 Merging xfs/for-next (0034102 Linux 3.4-rc2)
 719 $ git merge xfs/for-next
 720 Already up-to-date.
 721 Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
 722 $ git merge vfs/for-next
 723 Already up-to-date.
 724 Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
 725 $ git merge pci/next
 726 Already up-to-date.
 727 Merging hid/for-next (2c8cee0 Merge branches 'logitech', 'wacom' and 'waltop' into for-next)
 728 $ git merge hid/for-next
 729 Auto-merging drivers/hid/hid-ids.h
 730 Auto-merging drivers/hid/hid-core.c
 731 Merge made by the 'recursive' strategy.
 732  drivers/hid/Kconfig             |    9 +-
 733  drivers/hid/hid-core.c          |    1 +
 734  drivers/hid/hid-ids.h           |    1 +
 735  drivers/hid/hid-input.c         |   25 +++++-
 736  drivers/hid/hid-lg.c            |   55 +++++++-----
 737  drivers/hid/hid-lg.h            |    5 ++
 738  drivers/hid/hid-lg4ff.c         |    6 +-
 739  drivers/hid/hid-tivo.c          |    2 +-
 740  drivers/hid/hid-wacom.c         |   62 ++++++-------
 741  drivers/hid/hid-waltop.c        |  189 +++++++++++++++++++++++++++++++++++++++
 742  drivers/hid/usbhid/hid-core.c   |   65 +++++++++++---
 743  drivers/hid/usbhid/hid-quirks.c |    1 +
 744  drivers/hid/usbhid/usbhid.h     |    1 +
 745  13 files changed, 341 insertions(+), 81 deletions(-)
 746 Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
 747 $ git merge quilt/i2c
 748 Merge made by the 'recursive' strategy.
 749  drivers/i2c/i2c-dev.c |   30 ++++++++++++++++++++++++++----
 750  1 file changed, 26 insertions(+), 4 deletions(-)
 751 Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap)
 752 $ git merge bjdooks-i2c/next-i2c
 753 Resolved 'drivers/i2c/busses/i2c-omap.c' using previous resolution.
 754 Auto-merging drivers/i2c/busses/i2c-omap.c
 755 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c
 756 Automatic merge failed; fix conflicts and then commit the result.
 757 $ git commit -v -a
 758 [master 0b659b1] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
 759 $ git diff -M --stat --summary HEAD^..
 760 Merging i2c-embedded/i2c-embedded/for-next (bbceeee i2c-eg20t: Remove write-only variables)
 761 $ git merge i2c-embedded/i2c-embedded/for-next
 762 Already up-to-date.
 763 Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
 764 $ git merge quilt/jdelvare-hwmon
 765 Merge made by the 'recursive' strategy.
 766 Merging hwmon-staging/hwmon-next (e0367870 hwmon: use module_pci_driver)
 767 $ git merge hwmon-staging/hwmon-next
 768 Merge made by the 'recursive' strategy.
 769  Documentation/hwmon/it87     |   28 +++++++---
 770  drivers/hwmon/fam15h_power.c |   13 +----
 771  drivers/hwmon/it87.c         |  125 +++++++++++++++++++++++++++++++++---------
 772  drivers/hwmon/k10temp.c      |   13 +----
 773  drivers/hwmon/k8temp.c       |   13 +----
 774  5 files changed, 121 insertions(+), 71 deletions(-)
 775 Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream)
 776 $ git merge v4l-dvb/master
 777 Merge made by the 'recursive' strategy.
 778  drivers/media/dvb/dvb-core/dvb_frontend.c |   12 ++++++-
 779  drivers/media/dvb/dvb-usb/it913x.c        |   54 +++++++++++++++++++++--------
 780  drivers/media/radio/radio-rtrack2.c       |    1 +
 781  drivers/media/rc/ir-raw.c                 |    4 ++-
 782  drivers/media/video/ivtv/ivtv-fileops.c   |    6 ++--
 783  drivers/media/video/ivtv/ivtv-ioctl.c     |    4 +--
 784  drivers/media/video/pwc/pwc-if.c          |    9 +++++
 785  drivers/media/video/pwc/pwc-v4l.c         |    2 ++
 786  drivers/media/video/uvc/uvc_video.c       |   50 ++++++++++++++++----------
 787  drivers/media/video/videobuf-core.c       |    3 +-
 788  drivers/media/video/videobuf2-core.c      |   48 +++++++++++++++++--------
 789  drivers/media/video/vivi.c                |    9 +----
 790  sound/pci/Kconfig                         |    4 +--
 791  13 files changed, 142 insertions(+), 64 deletions(-)
 792 $ git reset --hard HEAD^
 793 HEAD is now at 1b4eae5 Merge remote-tracking branch 'hwmon-staging/hwmon-next'
 794 Merging refs/next/20120410/v4l-dvb
 795 $ git merge refs/next/20120410/v4l-dvb
 796 Merge made by the 'recursive' strategy.
 797  drivers/media/dvb/dvb-core/dvb_frontend.c |   12 ++++++-
 798  drivers/media/dvb/dvb-usb/it913x.c        |   54 +++++++++++++++++++++--------
 799  drivers/media/radio/radio-rtrack2.c       |    1 +
 800  drivers/media/video/ivtv/ivtv-fileops.c   |    6 ++--
 801  drivers/media/video/ivtv/ivtv-ioctl.c     |    4 +--
 802  drivers/media/video/pwc/pwc-if.c          |    9 +++++
 803  drivers/media/video/pwc/pwc-v4l.c         |    2 ++
 804  drivers/media/video/uvc/uvc_video.c       |   50 ++++++++++++++++----------
 805  drivers/media/video/videobuf-core.c       |    3 +-
 806  drivers/media/video/videobuf2-core.c      |   48 +++++++++++++++++--------
 807  drivers/media/video/vivi.c                |    9 +----
 808  sound/pci/Kconfig                         |    4 +--
 809  12 files changed, 139 insertions(+), 63 deletions(-)
 810 Merging kbuild/for-next (51cbc3e Merge branch 'kbuild/rc-fixes' into kbuild/for-next)
 811 $ git merge kbuild/for-next
 812 Already up-to-date!
 813 Merge made by the 'recursive' strategy.
 814 Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
 815 $ git merge kconfig/for-next
 816 Already up-to-date!
 817 Merge made by the 'recursive' strategy.
 818 Merging libata/NEXT (b8cec3c pata_cmd64x: implement sff_irq_check() method)
 819 $ git merge libata/NEXT
 820 Already up-to-date.
 821 Merging infiniband/for-next (dd775ae Linux 3.4-rc1)
 822 $ git merge infiniband/for-next
 823 Already up-to-date.
 824 Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
 825 $ git merge acpi/next
 826 Already up-to-date.
 827 Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
 828 $ git merge cpupowerutils/master
 829 Already up-to-date.
 830 Merging ieee1394/for-next (19f8399 Merge branch 'iso-flush' into for-next)
 831 $ git merge ieee1394/for-next
 832 Already up-to-date!
 833 Merge made by the 'recursive' strategy.
 834 Merging ubi/linux-next (cc83146 UBI: rename MOVE_CANCEL_BITFLIPS to MOVE_TARGET_BITFLIPS)
 835 $ git merge ubi/linux-next
 836 Already up-to-date.
 837 Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
 838 $ git merge dlm/next
 839 Already up-to-date.
 840 Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
 841 $ git merge scsi/master
 842 Already up-to-date.
 843 Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
 844 $ git merge target-updates/for-next
 845 Already up-to-date.
 846 Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
 847 $ git merge target-merge/for-next-merge
 848 Merge made by the 'recursive' strategy.
 849  drivers/scsi/qla2xxx/Kconfig       |    8 +
 850  drivers/scsi/qla2xxx/Makefile      |    3 +-
 851  drivers/scsi/qla2xxx/qla_attr.c    |    5 +-
 852  drivers/scsi/qla2xxx/qla_dbg.c     |    5 +
 853  drivers/scsi/qla2xxx/qla_dbg.h     |    5 +
 854  drivers/scsi/qla2xxx/qla_def.h     |   69 +-
 855  drivers/scsi/qla2xxx/qla_gbl.h     |    7 +
 856  drivers/scsi/qla2xxx/qla_gs.c      |    4 +-
 857  drivers/scsi/qla2xxx/qla_init.c    |   82 +-
 858  drivers/scsi/qla2xxx/qla_iocb.c    |  102 +-
 859  drivers/scsi/qla2xxx/qla_isr.c     |   83 +-
 860  drivers/scsi/qla2xxx/qla_mbx.c     |  101 +
 861  drivers/scsi/qla2xxx/qla_mid.c     |   17 +-
 862  drivers/scsi/qla2xxx/qla_os.c      |  133 +-
 863  drivers/scsi/qla2xxx/qla_target.c  | 4724 ++++++++++++++++++++++++++++++++++++
 864  drivers/scsi/qla2xxx/qla_target.h  |  986 ++++++++
 865  drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1981 +++++++++++++++
 866  drivers/scsi/qla2xxx/tcm_qla2xxx.h |  149 ++
 867  18 files changed, 8429 insertions(+), 35 deletions(-)
 868  create mode 100644 drivers/scsi/qla2xxx/qla_target.c
 869  create mode 100644 drivers/scsi/qla2xxx/qla_target.h
 870  create mode 100644 drivers/scsi/qla2xxx/tcm_qla2xxx.c
 871  create mode 100644 drivers/scsi/qla2xxx/tcm_qla2xxx.h
 872 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
 873 $ git merge ibft/linux-next
 874 Already up-to-date.
 875 Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all)
 876 $ git merge isci/all
 877 Auto-merging drivers/scsi/sd.c
 878 Auto-merging drivers/scsi/scsi_lib.c
 879 Auto-merging drivers/scsi/mvsas/mv_sas.c
 880 Auto-merging drivers/scsi/isci/request.c
 881 Auto-merging drivers/scsi/isci/host.c
 882 Auto-merging drivers/scsi/ipr.c
 883 Auto-merging Documentation/kernel-parameters.txt
 884 Merge made by the 'recursive' strategy.
 885  Documentation/kernel-parameters.txt           |    3 +
 886  drivers/ata/libata-core.c                     |   67 ++-
 887  drivers/ata/libata-eh.c                       |   59 +-
 888  drivers/ata/libata-scsi.c                     |   35 +-
 889  drivers/ata/libata.h                          |    2 +-
 890  drivers/scsi/ipr.c                            |    6 +-
 891  drivers/scsi/isci/host.c                      |  705 ++++++++--------------
 892  drivers/scsi/isci/host.h                      |  126 ++--
 893  drivers/scsi/isci/init.c                      |  271 ++++++++-
 894  drivers/scsi/isci/phy.c                       |   76 ++-
 895  drivers/scsi/isci/phy.h                       |    9 +-
 896  drivers/scsi/isci/port.c                      |   68 ++-
 897  drivers/scsi/isci/port.h                      |   11 +-
 898  drivers/scsi/isci/port_config.c               |   18 +-
 899  drivers/scsi/isci/probe_roms.c                |   12 -
 900  drivers/scsi/isci/probe_roms.h                |    2 -
 901  drivers/scsi/isci/registers.h                 |    8 +
 902  drivers/scsi/isci/remote_device.c             |  576 +++++++++++++-----
 903  drivers/scsi/isci/remote_device.h             |   63 +-
 904  drivers/scsi/isci/remote_node_context.c       |  393 ++++++++----
 905  drivers/scsi/isci/remote_node_context.h       |   43 +-
 906  drivers/scsi/isci/request.c                   |  715 ++++++++++------------
 907  drivers/scsi/isci/request.h                   |  125 +---
 908  drivers/scsi/isci/scu_completion_codes.h      |    2 +
 909  drivers/scsi/isci/task.c                      |  800 +++++--------------------
 910  drivers/scsi/isci/task.h                      |  132 +---
 911  drivers/scsi/isci/unsolicited_frame_control.c |   30 +-
 912  drivers/scsi/isci/unsolicited_frame_control.h |    6 +-
 913  drivers/scsi/libsas/sas_ata.c                 |  158 ++++-
 914  drivers/scsi/libsas/sas_discover.c            |  153 +++--
 915  drivers/scsi/libsas/sas_dump.c                |    1 +
 916  drivers/scsi/libsas/sas_event.c               |   40 +-
 917  drivers/scsi/libsas/sas_expander.c            |   91 ++-
 918  drivers/scsi/libsas/sas_init.c                |  140 ++++-
 919  drivers/scsi/libsas/sas_internal.h            |    7 +-
 920  drivers/scsi/libsas/sas_phy.c                 |   42 +-
 921  drivers/scsi/libsas/sas_port.c                |   67 ++-
 922  drivers/scsi/libsas/sas_scsi_host.c           |  195 +++++-
 923  drivers/scsi/mvsas/mv_sas.c                   |   21 +-
 924  drivers/scsi/pm8001/pm8001_sas.c              |   37 +-
 925  drivers/scsi/scsi.c                           |    4 +
 926  drivers/scsi/scsi_lib.c                       |   10 +-
 927  drivers/scsi/scsi_pm.c                        |    2 +-
 928  drivers/scsi/scsi_priv.h                      |    2 +
 929  drivers/scsi/scsi_transport_sas.c             |    6 +-
 930  drivers/scsi/sd.c                             |    5 +-
 931  include/linux/libata.h                        |   19 +-
 932  include/scsi/libsas.h                         |   90 ++-
 933  include/scsi/sas.h                            |    1 +
 934  include/scsi/sas_ata.h                        |   19 +-
 935  50 files changed, 2934 insertions(+), 2539 deletions(-)
 936 Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
 937 $ git merge slave-dma/next
 938 Merge made by the 'recursive' strategy.
 939  drivers/dma/mxs-dma.c |    2 ++
 940  1 file changed, 2 insertions(+)
 941 Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
 942 $ git merge dmaengine/next
 943 Auto-merging net/ipv6/tcp_ipv6.c
 944 Auto-merging net/ipv4/tcp_ipv4.c
 945 Auto-merging net/ipv4/tcp_input.c
 946 Auto-merging net/ipv4/tcp.c
 947 Auto-merging include/linux/dmaengine.h
 948 Auto-merging drivers/dma/iop-adma.c
 949 Auto-merging drivers/dma/ioat/dma_v3.c
 950 Auto-merging drivers/dma/ioat/dma_v2.c
 951 Auto-merging drivers/dma/ioat/dma.h
 952 Auto-merging drivers/dma/ioat/dma.c
 953 Auto-merging drivers/dma/dmaengine.c
 954 Merge made by the 'recursive' strategy.
 955  drivers/dma/dmaengine.c   |   14 +++++++++++++
 956  drivers/dma/ioat/dma.c    |   16 +++++++--------
 957  drivers/dma/ioat/dma.h    |    6 +++---
 958  drivers/dma/ioat/dma_v2.c |   12 +++++------
 959  drivers/dma/ioat/dma_v2.h |    4 ++--
 960  drivers/dma/ioat/dma_v3.c |   49 +++++++++++++++++++++++++++++++++++++++++----
 961  drivers/dma/iop-adma.c    |    4 ++--
 962  include/linux/dmaengine.h |    1 +
 963  net/ipv4/tcp.c            |    4 ++--
 964  net/ipv4/tcp_input.c      |    2 +-
 965  net/ipv4/tcp_ipv4.c       |    2 +-
 966  net/ipv6/tcp_ipv6.c       |    2 +-
 967  12 files changed, 86 insertions(+), 30 deletions(-)
 968 Merging net-next/master (06eb4ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
 969 $ git merge net-next/master
 970 Auto-merging net/wireless/wext-core.c
 971 Auto-merging net/wireless/nl80211.c
 972 Auto-merging net/netfilter/nf_conntrack_proto_tcp.c
 973 Auto-merging net/netfilter/nf_conntrack_core.c
 974 Auto-merging net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
 975 Removing net/core/kmap_skb.h
 976 Removing drivers/net/ethernet/xscale/ixp2000/pm3386.h
 977 Removing drivers/net/ethernet/xscale/ixp2000/pm3386.c
 978 Removing drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h
 979 Removing drivers/net/ethernet/xscale/ixp2000/ixpdev.h
 980 Removing drivers/net/ethernet/xscale/ixp2000/ixpdev.c
 981 Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode
 982 Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc
 983 Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode
 984 Removing drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc
 985 Removing drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h
 986 Removing drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c
 987 Removing drivers/net/ethernet/xscale/ixp2000/enp2611.c
 988 Removing drivers/net/ethernet/xscale/ixp2000/caleb.h
 989 Removing drivers/net/ethernet/xscale/ixp2000/caleb.c
 990 Removing drivers/net/ethernet/xscale/ixp2000/Makefile
 991 Removing drivers/net/ethernet/xscale/ixp2000/Kconfig
 992 Auto-merging MAINTAINERS
 993 Merge made by the 'recursive' strategy.
 994  Documentation/networking/stmmac.txt                |   29 +-
 995  MAINTAINERS                                        |    6 -
 996  arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h      |    3 +
 997  crypto/ablkcipher.c                                |   12 +-
 998  crypto/aead.c                                      |   12 +-
 999  crypto/ahash.c                                     |    6 +-
1000  crypto/blkcipher.c                                 |    6 +-
1001  crypto/crypto_user.c                               |   22 +-
1002  crypto/pcompress.c                                 |    6 +-
1003  crypto/rng.c                                       |    6 +-
1004  crypto/shash.c                                     |    6 +-
1005  drivers/atm/horizon.c                              |    5 -
1006  drivers/hv/ring_buffer.c                           |   31 -
1007  drivers/infiniband/core/cma.c                      |    6 +-
1008  drivers/infiniband/core/netlink.c                  |    3 +-
1009  drivers/net/can/dev.c                              |   31 +-
1010  drivers/net/ethernet/8390/ax88796.c                |    1 +
1011  drivers/net/ethernet/8390/etherh.c                 |    1 +
1012  drivers/net/ethernet/Kconfig                       |    1 +
1013  drivers/net/ethernet/Makefile                      |    1 +
1014  drivers/net/ethernet/adaptec/starfire.c            |   54 +-
1015  drivers/net/ethernet/adi/bfin_mac.c                |   20 +
1016  drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |    5 +-
1017  drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   17 +-
1018  drivers/net/ethernet/broadcom/bnx2.c               |   41 +-
1019  drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |   20 +-
1020  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  155 ++-
1021  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |   49 +-
1022  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |   10 +-
1023  drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |   92 +-
1024  drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h   |  217 +++-
1025  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |  729 +++++-------
1026  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h   |    3 +
1027  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  302 ++---
1028  drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |    5 +
1029  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |    6 -
1030  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |    3 -
1031  drivers/net/ethernet/broadcom/tg3.c                |    1 +
1032  drivers/net/ethernet/brocade/bna/bfa_ioc.c         |   61 +-
1033  drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c      |  142 ++-
1034  drivers/net/ethernet/brocade/bna/bfi_reg.h         |    6 +
1035  drivers/net/ethernet/brocade/bna/bnad.c            |  316 +++--
1036  drivers/net/ethernet/brocade/bna/bnad.h            |   11 +-
1037  drivers/net/ethernet/brocade/bna/bnad_ethtool.c    |    6 +-
1038  drivers/net/ethernet/cadence/macb.c                |    1 +
1039  drivers/net/ethernet/cisco/enic/enic_main.c        |   22 +-
1040  drivers/net/ethernet/dec/tulip/de2104x.c           |   34 +-
1041  drivers/net/ethernet/dec/tulip/dmfe.c              |  295 ++---
1042  drivers/net/ethernet/dec/tulip/tulip_core.c        |   27 +-
1043  drivers/net/ethernet/dec/tulip/uli526x.c           |  443 ++++---
1044  drivers/net/ethernet/dec/tulip/winbond-840.c       |   17 +-
1045  drivers/net/ethernet/dec/tulip/xircom_cb.c         |  280 +++--
1046  drivers/net/ethernet/dlink/dl2k.c                  |  416 ++++---
1047  drivers/net/ethernet/dlink/dl2k.h                  |   19 +-
1048  drivers/net/ethernet/dlink/sundance.c              |   12 +-
1049  drivers/net/ethernet/dnet.c                        |    1 +
1050  drivers/net/ethernet/fealnx.c                      |   14 +-
1051  drivers/net/ethernet/freescale/fec.c               |    1 +
1052  drivers/net/ethernet/freescale/fec_mpc52xx.c       |    1 +
1053  .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |    1 +
1054  drivers/net/ethernet/freescale/gianfar.h           |    3 +
1055  drivers/net/ethernet/freescale/gianfar_ethtool.c   |   30 +
1056  drivers/net/ethernet/freescale/gianfar_ptp.c       |    2 +
1057  drivers/net/ethernet/freescale/ucc_geth_ethtool.c  |    1 +
1058  drivers/net/ethernet/intel/Kconfig                 |   13 +-
1059  drivers/net/ethernet/intel/e1000/e1000_main.c      |   26 +-
1060  drivers/net/ethernet/intel/e1000e/ethtool.c        |   52 +-
1061  drivers/net/ethernet/intel/e1000e/hw.h             |   47 +-
1062  drivers/net/ethernet/intel/e1000e/netdev.c         |   81 +-
1063  drivers/net/ethernet/intel/igb/Makefile            |    1 +
1064  drivers/net/ethernet/intel/igb/igb.h               |   21 +-
1065  drivers/net/ethernet/intel/igb/igb_main.c          |  178 +--
1066  drivers/net/ethernet/intel/igb/igb_ptp.c           |  381 +++++++
1067  drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c     |   25 +-
1068  drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |   29 +-
1069  drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    2 +-
1070  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    4 +-
1071  drivers/net/ethernet/marvell/mv643xx_eth.c         |    1 +
1072  drivers/net/ethernet/marvell/pxa168_eth.c          |    1 +
1073  drivers/net/ethernet/marvell/sky2.c                |    4 +-
1074  drivers/net/ethernet/mellanox/mlx4/Kconfig         |   12 +
1075  drivers/net/ethernet/mellanox/mlx4/Makefile        |    1 +
1076  drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c     |  254 +++++
1077  drivers/net/ethernet/mellanox/mlx4/en_main.c       |    2 +-
1078  drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |   26 +-
1079  drivers/net/ethernet/mellanox/mlx4/en_port.h       |    2 +
1080  drivers/net/ethernet/mellanox/mlx4/en_resources.c  |    6 +-
1081  drivers/net/ethernet/mellanox/mlx4/en_rx.c         |    4 +-
1082  drivers/net/ethernet/mellanox/mlx4/en_tx.c         |   10 +-
1083  drivers/net/ethernet/mellanox/mlx4/mlx4.h          |   20 +
1084  drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   28 +-
1085  drivers/net/ethernet/mellanox/mlx4/port.c          |   62 +
1086  drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |    7 +-
1087  drivers/net/ethernet/natsemi/natsemi.c             |   67 +-
1088  drivers/net/ethernet/neterion/s2io.c               |   14 +-
1089  drivers/net/ethernet/neterion/vxge/vxge-main.c     |   24 +-
1090  drivers/net/ethernet/neterion/vxge/vxge-main.h     |   15 +-
1091  drivers/net/ethernet/nvidia/forcedeth.c            |    5 -
1092  drivers/net/ethernet/nxp/lpc_eth.c                 |    6 +-
1093  drivers/net/ethernet/packetengines/hamachi.c       |   11 +-
1094  drivers/net/ethernet/packetengines/yellowfin.c     |   32 +-
1095  drivers/net/ethernet/rdc/r6040.c                   |    1 +
1096  drivers/net/ethernet/realtek/8139cp.c              |   21 +-
1097  drivers/net/ethernet/realtek/8139too.c             |  136 +--
1098  drivers/net/ethernet/realtek/r8169.c               |    1 +
1099  drivers/net/ethernet/renesas/Kconfig               |    7 +-
1100  drivers/net/ethernet/renesas/sh_eth.c              |  114 +-
1101  drivers/net/ethernet/renesas/sh_eth.h              |    5 +-
1102  drivers/net/ethernet/silan/sc92031.c               |   34 +-
1103  drivers/net/ethernet/sis/sis190.c                  |   26 +-
1104  drivers/net/ethernet/sis/sis900.c                  |  375 +++---
1105  drivers/net/ethernet/smsc/epic100.c                |  403 ++++---
1106  drivers/net/ethernet/smsc/smsc911x.c               |    1 +
1107  drivers/net/ethernet/smsc/smsc9420.c               |   48 +-
1108  drivers/net/ethernet/stmicro/stmmac/common.h       |   19 +-
1109  drivers/net/ethernet/stmicro/stmmac/dwmac1000.h    |    2 +-
1110  .../net/ethernet/stmicro/stmmac/dwmac1000_core.c   |    4 +-
1111  .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c    |   42 +-
1112  .../net/ethernet/stmicro/stmmac/dwmac100_core.c    |   12 +-
1113  drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c |    6 +-
1114  drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h    |    1 +
1115  drivers/net/ethernet/stmicro/stmmac/enh_desc.c     |   13 +-
1116  drivers/net/ethernet/stmicro/stmmac/norm_desc.c    |   13 +-
1117  drivers/net/ethernet/stmicro/stmmac/stmmac.h       |   48 +-
1118  .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |    1 +
1119  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  109 +-
1120  drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c  |   36 +-
1121  drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c   |    3 +-
1122  .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |    2 +-
1123  drivers/net/ethernet/sun/sungem.c                  |    2 -
1124  drivers/net/ethernet/sun/sunhme.c                  |   18 +-
1125  drivers/net/ethernet/sun/sunhme.h                  |    1 +
1126  drivers/net/ethernet/tehuti/tehuti.c               |    4 -
1127  drivers/net/ethernet/ti/davinci_emac.c             |    1 +
1128  drivers/net/ethernet/via/via-rhine.c               |   12 +-
1129  drivers/net/ethernet/via/via-velocity.c            |    9 +-
1130  drivers/net/ethernet/wiznet/Kconfig                |   81 ++
1131  drivers/net/ethernet/wiznet/Makefile               |    2 +
1132  drivers/net/ethernet/wiznet/w5100.c                |  808 +++++++++++++
1133  drivers/net/ethernet/wiznet/w5300.c                |  722 ++++++++++++
1134  drivers/net/ethernet/xilinx/ll_temac_main.c        |    1 +
1135  drivers/net/ethernet/xscale/Kconfig                |    6 +-
1136  drivers/net/ethernet/xscale/Makefile               |    1 -
1137  drivers/net/ethernet/xscale/ixp2000/Kconfig        |    6 -
1138  drivers/net/ethernet/xscale/ixp2000/Makefile       |    3 -
1139  drivers/net/ethernet/xscale/ixp2000/caleb.c        |  136 ---
1140  drivers/net/ethernet/xscale/ixp2000/caleb.h        |   22 -
1141  drivers/net/ethernet/xscale/ixp2000/enp2611.c      |  232 ----
1142  drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c  |  212 ----
1143  drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h  |  115 --
1144  drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc  |  408 -------
1145  .../net/ethernet/xscale/ixp2000/ixp2400_rx.ucode   |  130 ---
1146  drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc  |  272 -----
1147  .../net/ethernet/xscale/ixp2000/ixp2400_tx.ucode   |   98 --
1148  drivers/net/ethernet/xscale/ixp2000/ixpdev.c       |  437 -------
1149  drivers/net/ethernet/xscale/ixp2000/ixpdev.h       |   29 -
1150  drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h  |   57 -
1151  drivers/net/ethernet/xscale/ixp2000/pm3386.c       |  351 ------
1152  drivers/net/ethernet/xscale/ixp2000/pm3386.h       |   29 -
1153  drivers/net/ethernet/xscale/ixp4xx_eth.c           |   29 +
1154  drivers/net/hippi/rrunner.c                        |   82 +-
1155  drivers/net/hyperv/netvsc.c                        |   41 +-
1156  drivers/net/hyperv/netvsc_drv.c                    |    6 +-
1157  drivers/net/macvlan.c                              |    3 +-
1158  drivers/net/phy/bcm63xx.c                          |    5 +-
1159  drivers/net/phy/davicom.c                          |    7 +-
1160  drivers/net/phy/dp83640.c                          |   31 +
1161  drivers/net/phy/marvell.c                          |   18 +-
1162  drivers/net/ppp/pptp.c                             |    4 +-
1163  drivers/net/team/Kconfig                           |   11 +
1164  drivers/net/team/Makefile                          |    1 +
1165  drivers/net/team/team.c                            |   80 +-
1166  drivers/net/team/team_mode_loadbalance.c           |  188 +++
1167  drivers/net/usb/usbnet.c                           |    1 +
1168  drivers/net/wireless/ath/ath6kl/testmode.c         |    5 +-
1169  drivers/net/wireless/ipw2x00/ipw2100.c             |  131 +--
1170  drivers/net/wireless/ipw2x00/ipw2100.h             |    1 +
1171  drivers/net/wireless/ipw2x00/ipw2200.c             |    4 -
1172  drivers/net/wireless/iwlwifi/iwl-testmode.c        |   71 +-
1173  drivers/net/wireless/mac80211_hwsim.c              |   24 +-
1174  drivers/net/wireless/wl12xx/testmode.c             |    9 +-
1175  drivers/ptp/ptp_clock.c                            |    6 +
1176  drivers/ptp/ptp_ixp46x.c                           |    3 +
1177  include/linux/dcbnl.h                              |   12 +
1178  include/linux/ethtool.h                            |   29 +
1179  include/linux/filter.h                             |    7 +-
1180  include/linux/hyperv.h                             |   27 +
1181  include/linux/if_link.h                            |    2 +
1182  include/linux/if_team.h                            |    8 +
1183  include/linux/mlx4/cmd.h                           |    4 +
1184  include/linux/mlx4/device.h                        |    3 +
1185  include/linux/mlx4/qp.h                            |    3 +-
1186  include/linux/netfilter/ipset/ip_set.h             |   46 +-
1187  include/linux/netfilter/ipset/ip_set_ahash.h       |   21 +-
1188  include/linux/phy.h                                |    3 +
1189  include/linux/platform_data/wiznet.h               |   24 +
1190  include/linux/ptp_clock_kernel.h                   |    8 +
1191  include/linux/stmmac.h                             |   55 +-
1192  include/net/dcbnl.h                                |    2 +
1193  include/net/icmp.h                                 |    1 -
1194  include/net/netlink.h                              |  169 +--
1195  include/net/xfrm.h                                 |    5 +-
1196  net/8021q/vlan_netlink.c                           |   16 +-
1197  net/appletalk/ddp.c                                |    6 +-
1198  net/bridge/br_fdb.c                                |    8 +-
1199  net/bridge/br_netlink.c                            |   25 +-
1200  net/caif/chnl_net.c                                |   14 +-
1201  net/core/ethtool.c                                 |   59 +-
1202  net/core/fib_rules.c                               |   32 +-
1203  net/core/filter.c                                  |   70 +-
1204  net/core/gen_stats.c                               |    3 +-
1205  net/core/kmap_skb.h                                |   19 -
1206  net/core/neighbour.c                               |   75 +-
1207  net/core/rtnetlink.c                               |   70 +-
1208  net/core/skbuff.c                                  |   42 +-
1209  net/dcb/dcbnl.c                                    |   92 +-
1210  net/decnet/dn_dev.c                                |   14 +-
1211  net/decnet/dn_rules.c                              |   10 +-
1212  net/ieee802154/nl-mac.c                            |  146 ++-
1213  net/ieee802154/nl-phy.c                            |   29 +-
1214  net/ipv4/devinet.c                                 |   20 +-
1215  net/ipv4/fib_rules.c                               |   16 +-
1216  net/ipv4/fib_semantics.c                           |   47 +-
1217  net/ipv4/igmp.c                                    |    2 +-
1218  net/ipv4/ip_gre.c                                  |   23 +-
1219  net/ipv4/ipmr.c                                    |    9 +-
1220  net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |    5 +-
1221  net/ipv4/netfilter/nf_conntrack_proto_icmp.c       |   12 +-
1222  net/ipv4/route.c                                   |   47 +-
1223  net/ipv6/addrconf.c                                |   57 +-
1224  net/ipv6/addrconf_core.c                           |    2 +-
1225  net/ipv6/datagram.c                                |   10 +-
1226  net/ipv6/exthdrs.c                                 |   13 +-
1227  net/ipv6/exthdrs_core.c                            |    3 +-
1228  net/ipv6/fib6_rules.c                              |   18 +-
1229  net/ipv6/icmp.c                                    |    5 +-
1230  net/ipv6/ip6mr.c                                   |    9 +-
1231  net/ipv6/mcast.c                                   |    2 +-
1232  net/ipv6/ndisc.c                                   |    5 +-
1233  net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |    9 +-
1234  net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |   12 +-
1235  net/ipv6/route.c                                   |   39 +-
1236  net/ipv6/sit.c                                     |    6 +-
1237  net/l2tp/l2tp_netlink.c                            |  114 +-
1238  net/netfilter/ipset/ip_set_bitmap_ip.c             |   33 +-
1239  net/netfilter/ipset/ip_set_bitmap_ipmac.c          |   43 +-
1240  net/netfilter/ipset/ip_set_bitmap_port.c           |   29 +-
1241  net/netfilter/ipset/ip_set_core.c                  |   43 +-
1242  net/netfilter/ipset/ip_set_hash_ip.c               |   20 +-
1243  net/netfilter/ipset/ip_set_hash_ipport.c           |   37 +-
1244  net/netfilter/ipset/ip_set_hash_ipportip.c         |   45 +-
1245  net/netfilter/ipset/ip_set_hash_ipportnet.c        |   69 +-
1246  net/netfilter/ipset/ip_set_hash_net.c              |   45 +-
1247  net/netfilter/ipset/ip_set_hash_netiface.c         |   52 +-
1248  net/netfilter/ipset/ip_set_hash_netport.c          |   61 +-
1249  net/netfilter/ipset/ip_set_list_set.c              |   23 +-
1250  net/netfilter/ipvs/ip_vs_ctl.c                     |  108 +-
1251  net/netfilter/nf_conntrack_core.c                  |    5 +-
1252  net/netfilter/nf_conntrack_netlink.c               |   83 +-
1253  net/netfilter/nf_conntrack_proto_dccp.c            |   18 +-
1254  net/netfilter/nf_conntrack_proto_generic.c         |    3 +-
1255  net/netfilter/nf_conntrack_proto_gre.c             |    9 +-
1256  net/netfilter/nf_conntrack_proto_sctp.c            |   22 +-
1257  net/netfilter/nf_conntrack_proto_tcp.c             |   68 +-
1258  net/netfilter/nf_conntrack_proto_udp.c             |    9 +-
1259  net/netfilter/nf_conntrack_proto_udplite.c         |    9 +-
1260  net/netfilter/nfnetlink_acct.c                     |   10 +-
1261  net/netfilter/nfnetlink_cttimeout.c                |   11 +-
1262  net/netfilter/nfnetlink_log.c                      |  100 +-
1263  net/netfilter/nfnetlink_queue.c                    |   59 +-
1264  net/netlink/genetlink.c                            |   35 +-
1265  net/nfc/netlink.c                                  |   70 +-
1266  net/openvswitch/datapath.c                         |   34 +-
1267  net/openvswitch/flow.c                             |   18 +-
1268  net/phonet/pn_netlink.c                            |    8 +-
1269  net/sched/act_api.c                                |    9 +-
1270  net/sched/act_csum.c                               |    6 +-
1271  net/sched/act_gact.c                               |    9 +-
1272  net/sched/act_ipt.c                                |   14 +-
1273  net/sched/act_mirred.c                             |    6 +-
1274  net/sched/act_nat.c                                |    6 +-
1275  net/sched/act_pedit.c                              |    6 +-
1276  net/sched/act_police.c                             |   13 +-
1277  net/sched/act_simple.c                             |    8 +-
1278  net/sched/act_skbedit.c                            |   27 +-
1279  net/sched/cls_api.c                                |    3 +-
1280  net/sched/cls_basic.c                              |    5 +-
1281  net/sched/cls_flow.c                               |   35 +-
1282  net/sched/cls_fw.c                                 |   15 +-
1283  net/sched/cls_route.c                              |   16 +-
1284  net/sched/cls_rsvp.h                               |   16 +-
1285  net/sched/cls_tcindex.c                            |   14 +-
1286  net/sched/cls_u32.c                                |   40 +-
1287  net/sched/em_meta.c                                |   19 +-
1288  net/sched/ematch.c                                 |    6 +-
1289  net/sched/sch_api.c                                |    9 +-
1290  net/sched/sch_atm.c                                |   21 +-
1291  net/sched/sch_cbq.c                                |   18 +-
1292  net/sched/sch_choke.c                              |    5 +-
1293  net/sched/sch_drr.c                                |    3 +-
1294  net/sched/sch_dsmark.c                             |   18 +-
1295  net/sched/sch_fifo.c                               |    3 +-
1296  net/sched/sch_generic.c                            |    3 +-
1297  net/sched/sch_gred.c                               |    6 +-
1298  net/sched/sch_hfsc.c                               |    6 +-
1299  net/sched/sch_htb.c                                |    6 +-
1300  net/sched/sch_mqprio.c                             |    3 +-
1301  net/sched/sch_multiq.c                             |    3 +-
1302  net/sched/sch_netem.c                              |   21 +-
1303  net/sched/sch_prio.c                               |    3 +-
1304  net/sched/sch_qfq.c                                |    5 +-
1305  net/sched/sch_red.c                                |    5 +-
1306  net/sched/sch_sfb.c                                |    3 +-
1307  net/sched/sch_sfq.c                                |    3 +-
1308  net/sched/sch_tbf.c                                |    3 +-
1309  net/unix/af_unix.c                                 |   15 +-
1310  net/wireless/nl80211.c                             | 1204 +++++++++++---------
1311  net/wireless/wext-core.c                           |    3 +-
1312  net/xfrm/xfrm_user.c                               |  105 +-
1313  319 files changed, 8878 insertions(+), 7700 deletions(-)
1314  create mode 100644 drivers/net/ethernet/intel/igb/igb_ptp.c
1315  create mode 100644 drivers/net/ethernet/mellanox/mlx4/en_dcb_nl.c
1316  create mode 100644 drivers/net/ethernet/wiznet/Kconfig
1317  create mode 100644 drivers/net/ethernet/wiznet/Makefile
1318  create mode 100644 drivers/net/ethernet/wiznet/w5100.c
1319  create mode 100644 drivers/net/ethernet/wiznet/w5300.c
1320  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/Kconfig
1321  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/Makefile
1322  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/caleb.c
1323  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/caleb.h
1324  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/enp2611.c
1325  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.c
1326  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400-msf.h
1327  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.uc
1328  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_rx.ucode
1329  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.uc
1330  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixp2400_tx.ucode
1331  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixpdev.c
1332  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixpdev.h
1333  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/ixpdev_priv.h
1334  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/pm3386.c
1335  delete mode 100644 drivers/net/ethernet/xscale/ixp2000/pm3386.h
1336  create mode 100644 drivers/net/team/team_mode_loadbalance.c
1337  create mode 100644 include/linux/platform_data/wiznet.h
1338  delete mode 100644 net/core/kmap_skb.h
1339 Merging wireless-next/master (78f9c85 b43: claim support for IBSS RSN)
1340 $ git merge wireless-next/master
1341 Recorded preimage for 'net/wireless/nl80211.c'
1342 Resolved 'drivers/net/wireless/iwlwifi/iwl-testmode.c' using previous resolution.
1343 Auto-merging net/wireless/nl80211.c
1344 CONFLICT (content): Merge conflict in net/wireless/nl80211.c
1345 Auto-merging net/mac80211/mlme.c
1346 Auto-merging net/mac80211/debugfs_sta.c
1347 Auto-merging net/mac80211/debugfs_netdev.c
1348 Auto-merging include/net/mac80211.h
1349 Auto-merging drivers/net/wireless/mac80211_hwsim.c
1350 Auto-merging drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
1351 Auto-merging drivers/net/wireless/iwlwifi/iwl-testmode.c
1352 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
1353 Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c
1354 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.c
1355 Auto-merging drivers/net/wireless/iwlegacy/4965-rs.c
1356 Auto-merging drivers/net/wireless/ath/ath9k/rc.c
1357 Auto-merging drivers/net/wireless/ath/ath9k/main.c
1358 Auto-merging drivers/net/wireless/ath/ath5k/debug.c
1359 Automatic merge failed; fix conflicts and then commit the result.
1360 $ git commit -v -a
1361 Recorded resolution for 'net/wireless/nl80211.c'.
1362 [master 2e6dfff] Merge remote-tracking branch 'wireless-next/master'
1363 $ git diff -M --stat --summary HEAD^..
1364  Documentation/DocBook/80211.tmpl                   |    2 +-
1365  .../networking/mac80211-auth-assoc-deauth.txt      |   10 +-
1366  drivers/net/wireless/ath/ath5k/ani.c               |   44 +-
1367  drivers/net/wireless/ath/ath5k/ath5k.h             |   29 +-
1368  drivers/net/wireless/ath/ath5k/attach.c            |    2 +
1369  drivers/net/wireless/ath/ath5k/base.c              |   22 +
1370  drivers/net/wireless/ath/ath5k/debug.c             |   17 +-
1371  drivers/net/wireless/ath/ath5k/desc.c              |    2 +
1372  drivers/net/wireless/ath/ath5k/dma.c               |    2 +
1373  drivers/net/wireless/ath/ath5k/eeprom.c            |    2 +
1374  drivers/net/wireless/ath/ath5k/initvals.c          |    5 +-
1375  drivers/net/wireless/ath/ath5k/led.c               |    2 +
1376  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    2 +
1377  drivers/net/wireless/ath/ath5k/pci.c               |    4 +-
1378  drivers/net/wireless/ath/ath5k/phy.c               |    2 +
1379  drivers/net/wireless/ath/ath5k/qcu.c               |    2 +
1380  drivers/net/wireless/ath/ath5k/reset.c             |    2 +
1381  drivers/net/wireless/ath/ath5k/sysfs.c             |    2 +
1382  drivers/net/wireless/ath/ath6kl/cfg80211.c         |    2 +
1383  drivers/net/wireless/ath/ath6kl/init.c             |    2 +
1384  drivers/net/wireless/ath/ath6kl/main.c             |    2 +
1385  drivers/net/wireless/ath/ath6kl/txrx.c             |    2 +
1386  drivers/net/wireless/ath/ath9k/ani.c               |   49 +-
1387  drivers/net/wireless/ath/ath9k/ani.h               |    6 +-
1388  drivers/net/wireless/ath/ath9k/ar5008_phy.c        |   38 -
1389  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |   10 +-
1390  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   49 --
1391  drivers/net/wireless/ath/ath9k/ath9k.h             |    3 +
1392  drivers/net/wireless/ath/ath9k/debug.h             |    1 +
1393  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |   11 +-
1394  drivers/net/wireless/ath/ath9k/htc_hst.c           |    4 +-
1395  drivers/net/wireless/ath/ath9k/hw.c                |   73 ++
1396  drivers/net/wireless/ath/ath9k/init.c              |   15 +-
1397  drivers/net/wireless/ath/ath9k/main.c              |   48 +-
1398  drivers/net/wireless/ath/ath9k/pci.c               |    9 +-
1399  drivers/net/wireless/ath/ath9k/rc.c                |    7 +-
1400  drivers/net/wireless/ath/ath9k/recv.c              |    4 +
1401  drivers/net/wireless/ath/carl9170/fw.c             |    2 +
1402  drivers/net/wireless/ath/main.c                    |    4 +-
1403  drivers/net/wireless/ath/regd.c                    |    4 +-
1404  drivers/net/wireless/b43/main.c                    |   16 +
1405  drivers/net/wireless/b43/xmit.c                    |    2 +-
1406  drivers/net/wireless/b43legacy/xmit.c              |   14 +-
1407  drivers/net/wireless/iwlegacy/4965-mac.c           |    4 +-
1408  drivers/net/wireless/iwlegacy/4965-rs.c            |    2 +-
1409  drivers/net/wireless/iwlwifi/Kconfig               |    8 +
1410  drivers/net/wireless/iwlwifi/Makefile              |    2 +
1411  drivers/net/wireless/iwlwifi/iwl-1000.c            |    1 -
1412  drivers/net/wireless/iwlwifi/iwl-2000.c            |   19 +-
1413  drivers/net/wireless/iwlwifi/iwl-5000.c            |    1 -
1414  drivers/net/wireless/iwlwifi/iwl-6000.c            |    3 -
1415  drivers/net/wireless/iwlwifi/iwl-agn-hw.h          |    3 -
1416  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   24 +-
1417  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    4 +-
1418  drivers/net/wireless/iwlwifi/iwl-agn-rx.c          |    7 +-
1419  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |  261 ++++++-
1420  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |  144 +++-
1421  drivers/net/wireless/iwlwifi/iwl-agn.c             |  786 +++++++++++++++++++-
1422  drivers/net/wireless/iwlwifi/iwl-agn.h             |   23 +-
1423  drivers/net/wireless/iwlwifi/iwl-core.c            |  484 +-----------
1424  drivers/net/wireless/iwlwifi/iwl-core.h            |   15 -
1425  drivers/net/wireless/iwlwifi/iwl-debugfs.c         |   58 +-
1426  drivers/net/wireless/iwlwifi/iwl-dev.h             |   24 +-
1427  drivers/net/wireless/iwlwifi/iwl-mac80211.c        |   14 +-
1428  drivers/net/wireless/iwlwifi/iwl-notif-wait.c      |   44 +-
1429  drivers/net/wireless/iwlwifi/iwl-notif-wait.h      |   21 +-
1430  drivers/net/wireless/iwlwifi/iwl-op-mode.h         |   17 +-
1431  drivers/net/wireless/iwlwifi/iwl-pci.c             |    3 +
1432  drivers/net/wireless/iwlwifi/iwl-phy-db.c          |  273 +++++++
1433  drivers/net/wireless/iwlwifi/iwl-phy-db.h          |  123 +++
1434  drivers/net/wireless/iwlwifi/iwl-power.c           |    4 +-
1435  drivers/net/wireless/iwlwifi/iwl-scan.c            |   53 +-
1436  drivers/net/wireless/iwlwifi/iwl-shared.h          |   32 +-
1437  drivers/net/wireless/iwlwifi/iwl-testmode.c        |    9 +-
1438  drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h  |  148 +---
1439  drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c   |  514 ++-----------
1440  drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c   |  218 +-----
1441  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      |  270 ++-----
1442  drivers/net/wireless/iwlwifi/iwl-trans.h           |   95 +--
1443  drivers/net/wireless/iwlwifi/iwl-ucode.c           |  133 ++--
1444  drivers/net/wireless/mac80211_hwsim.c              |   29 +-
1445  drivers/net/wireless/mwifiex/11n.c                 |   17 +-
1446  drivers/net/wireless/mwifiex/cfg80211.c            |   81 +-
1447  drivers/net/wireless/mwifiex/fw.h                  |   23 +-
1448  drivers/net/wireless/mwifiex/ioctl.h               |   49 +-
1449  drivers/net/wireless/mwifiex/join.c                |   14 +-
1450  drivers/net/wireless/mwifiex/main.h                |   14 +-
1451  drivers/net/wireless/mwifiex/scan.c                |   17 +-
1452  drivers/net/wireless/mwifiex/sta_cmd.c             |   98 +++
1453  drivers/net/wireless/mwifiex/sta_cmdresp.c         |   80 +-
1454  drivers/net/wireless/mwifiex/sta_event.c           |   15 +-
1455  drivers/net/wireless/mwifiex/sta_ioctl.c           |   33 -
1456  drivers/net/wireless/p54/main.c                    |   11 +-
1457  drivers/net/wireless/p54/p54.h                     |    1 +
1458  drivers/net/wireless/p54/p54usb.c                  |  195 +++--
1459  drivers/net/wireless/p54/p54usb.h                  |    3 +
1460  drivers/net/wireless/p54/txrx.c                    |    3 +-
1461  drivers/net/wireless/rt2x00/rt2x00leds.c           |   16 +-
1462  drivers/net/wireless/rtlwifi/cam.c                 |    5 +-
1463  drivers/net/wireless/rtlwifi/pci.c                 |    7 +-
1464  drivers/net/wireless/rtlwifi/rc.c                  |    3 +-
1465  drivers/net/wireless/rtlwifi/usb.c                 |   34 +-
1466  drivers/net/wireless/rtlwifi/wifi.h                |   30 +-
1467  drivers/net/wireless/wl12xx/main.c                 |    5 +-
1468  include/linux/ieee80211.h                          |   32 +-
1469  include/linux/nl80211.h                            |   34 +-
1470  include/net/cfg80211.h                             |   18 +-
1471  include/net/mac80211.h                             |   53 +-
1472  net/mac80211/Kconfig                               |   11 +
1473  net/mac80211/Makefile                              |    3 +-
1474  net/mac80211/agg-rx.c                              |   18 +-
1475  net/mac80211/agg-tx.c                              |   18 +-
1476  net/mac80211/cfg.c                                 |   22 +-
1477  net/mac80211/chan.c                                |   26 -
1478  net/mac80211/debugfs_netdev.c                      |   83 +--
1479  net/mac80211/debugfs_sta.c                         |    5 +-
1480  net/mac80211/driver-ops.h                          |   25 +-
1481  net/mac80211/driver-trace.h                        |   41 +-
1482  net/mac80211/ht.c                                  |    9 -
1483  net/mac80211/ibss.c                                |   18 +-
1484  net/mac80211/ieee80211_i.h                         |   60 +-
1485  net/mac80211/iface.c                               |    8 +-
1486  net/mac80211/main.c                                |    6 +-
1487  net/mac80211/mesh.c                                |   33 +-
1488  net/mac80211/mesh.h                                |   23 +-
1489  net/mac80211/mesh_hwmp.c                           |   28 +-
1490  net/mac80211/mesh_plink.c                          |    4 +-
1491  net/mac80211/mesh_sync.c                           |  296 ++++++++
1492  net/mac80211/mlme.c                                |  303 ++++----
1493  net/mac80211/rate.h                                |    7 +-
1494  net/mac80211/rc80211_minstrel_ht.c                 |   15 +-
1495  net/mac80211/rx.c                                  |   10 +-
1496  net/mac80211/sta_info.c                            |   16 +-
1497  net/mac80211/sta_info.h                            |   11 +
1498  net/mac80211/tx.c                                  |   34 +-
1499  net/mac80211/util.c                                |  101 +--
1500  net/mac80211/wme.c                                 |   46 +-
1501  net/mac80211/wme.h                                 |    3 -
1502  net/wireless/mesh.c                                |    3 +
1503  net/wireless/mlme.c                                |   32 +-
1504  net/wireless/nl80211.c                             |   23 +-
1505  net/wireless/reg.c                                 |   10 +
1506  net/wireless/scan.c                                |    2 +-
1507  143 files changed, 3872 insertions(+), 2775 deletions(-)
1508  create mode 100644 drivers/net/wireless/iwlwifi/iwl-phy-db.c
1509  create mode 100644 drivers/net/wireless/iwlwifi/iwl-phy-db.h
1510  create mode 100644 net/mac80211/mesh_sync.c
1511 Merging bluetooth/master (30720c9 Bluetooth: Adds set_default function in L2CAP setup)
1512 $ git merge bluetooth/master
1513 Auto-merging net/bluetooth/l2cap_core.c
1514 Auto-merging net/bluetooth/hci_event.c
1515 Auto-merging net/bluetooth/hci_core.c
1516 Merge made by the 'recursive' strategy.
1517  drivers/bluetooth/hci_ldisc.c     |    2 +-
1518  drivers/bluetooth/hci_vhci.c      |    3 +-
1519  include/net/bluetooth/bluetooth.h |   13 +++
1520  include/net/bluetooth/hci.h       |    7 ++
1521  include/net/bluetooth/hci_core.h  |   16 +--
1522  include/net/bluetooth/l2cap.h     |   63 +++++++++++-
1523  include/net/bluetooth/mgmt.h      |    9 ++
1524  include/net/bluetooth/smp.h       |    2 +-
1525  net/bluetooth/hci_core.c          |   29 +++++-
1526  net/bluetooth/hci_event.c         |   58 +++++++++--
1527  net/bluetooth/hci_sysfs.c         |    5 +-
1528  net/bluetooth/l2cap_core.c        |   52 +++++-----
1529  net/bluetooth/l2cap_sock.c        |   13 +--
1530  net/bluetooth/mgmt.c              |  194 +++++++++++++++++++++++++------------
1531  net/bluetooth/smp.c               |    2 +-
1532  15 files changed, 344 insertions(+), 124 deletions(-)
1533 Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
1534 $ git merge mtd/master
1535 Already up-to-date.
1536 Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser)
1537 $ git merge l2-mtd/master
1538 Merge made by the 'recursive' strategy.
1539  arch/arm/mach-ep93xx/snappercl15.c        |    3 ---
1540  arch/arm/mach-ep93xx/ts72xx.c             |    3 ---
1541  arch/arm/mach-ixp4xx/ixdp425-setup.c      |    3 ---
1542  arch/arm/mach-omap1/board-fsample.c       |    3 ---
1543  arch/arm/mach-omap1/board-h2.c            |    3 ---
1544  arch/arm/mach-omap1/board-h3.c            |    3 ---
1545  arch/arm/mach-omap1/board-perseus2.c      |    3 ---
1546  arch/arm/mach-orion5x/ts78xx-setup.c      |    3 ---
1547  arch/arm/mach-pxa/balloon3.c              |    3 ---
1548  arch/arm/mach-pxa/em-x270.c               |    3 ---
1549  arch/arm/mach-pxa/palmtx.c                |    3 ---
1550  arch/blackfin/mach-bf561/boards/acvilon.c |    3 ---
1551  arch/mips/alchemy/devboards/db1200.c      |    3 ---
1552  arch/mips/alchemy/devboards/db1300.c      |    3 ---
1553  arch/mips/alchemy/devboards/db1550.c      |    3 ---
1554  arch/mips/pnx833x/common/platform.c       |    6 ------
1555  arch/sh/boards/mach-migor/setup.c         |    1 -
1556  drivers/mtd/nand/plat_nand.c              |    8 ++++++--
1557  18 files changed, 6 insertions(+), 54 deletions(-)
1558 Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
1559 $ git merge crypto/master
1560 Merge made by the 'recursive' strategy.
1561  crypto/xor.c                  |    5 +++--
1562  drivers/crypto/caam/caamalg.c |   14 ++++++++++----
1563  drivers/crypto/caam/ctrl.c    |   16 ++++++++++++++++
1564  3 files changed, 29 insertions(+), 6 deletions(-)
1565 Merging sound/for-next (8592db4 Merge branch 'topic/hda' into for-next)
1566 $ git merge sound/for-next
1567 Merge made by the 'recursive' strategy.
1568  sound/pci/hda/patch_conexant.c |   90 ++++++++++++++++++++++++++++++++++------
1569  sound/pci/riptide/riptide.c    |    3 +-
1570  2 files changed, 78 insertions(+), 15 deletions(-)
1571 Merging sound-asoc/for-next (07b6335 Merge branch 'for-3.5' into asoc-next)
1572 $ git merge sound-asoc/for-next
1573 Removing sound/soc/tegra/tegra_spdif.h
1574 Removing sound/soc/tegra/tegra_spdif.c
1575 Removing sound/soc/tegra/tegra_i2s.h
1576 Removing sound/soc/tegra/tegra_i2s.c
1577 Removing sound/soc/tegra/tegra_das.h
1578 Removing sound/soc/tegra/tegra_das.c
1579 Removing sound/soc/imx/Makefile
1580 Removing sound/soc/imx/Kconfig
1581 Auto-merging sound/soc/fsl/imx-ssi.c
1582 Auto-merging sound/soc/fsl/imx-pcm.h
1583 Auto-merging sound/soc/fsl/imx-pcm-dma.c
1584 Auto-merging sound/soc/fsl/eukrea-tlv320.c
1585 Auto-merging MAINTAINERS
1586 Merge made by the 'recursive' strategy.
1587  .../bindings/sound/imx-audio-sgtl5000.txt          |   49 +
1588  MAINTAINERS                                        |    6 +
1589  arch/arm/mach-tegra/board-dt-tegra20.c             |    6 +-
1590  arch/arm/mach-tegra/board-harmony.c                |    1 -
1591  arch/arm/mach-tegra/board-seaboard.c               |    1 -
1592  arch/arm/mach-tegra/board-trimslice.c              |    1 -
1593  arch/arm/mach-tegra/devices.c                      |   11 +-
1594  arch/arm/mach-tegra/devices.h                      |    1 -
1595  arch/arm/mach-tegra/tegra2_clocks.c                |    4 +-
1596  arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig   |    1 +
1597  arch/powerpc/configs/mpc85xx_defconfig             |    1 +
1598  arch/powerpc/configs/mpc85xx_smp_defconfig         |    1 +
1599  include/sound/max98095.h                           |   12 +
1600  include/sound/soc-dai.h                            |    1 +
1601  include/sound/soc-dapm.h                           |   17 +-
1602  include/sound/soc.h                                |   56 +-
1603  sound/soc/Kconfig                                  |    1 -
1604  sound/soc/Makefile                                 |    1 -
1605  sound/soc/codecs/Kconfig                           |    8 +
1606  sound/soc/codecs/Makefile                          |    6 +-
1607  sound/soc/codecs/ac97.c                            |    4 +-
1608  sound/soc/codecs/ad1836.c                          |    4 +-
1609  sound/soc/codecs/ad193x.c                          |    4 +-
1610  sound/soc/codecs/adau1701.c                        |    3 +-
1611  sound/soc/codecs/ak4104.c                          |    3 +-
1612  sound/soc/codecs/ak4535.c                          |    3 +-
1613  sound/soc/codecs/ak4641.c                          |  113 +-
1614  sound/soc/codecs/alc5623.c                         |    3 +-
1615  sound/soc/codecs/alc5632.c                         |    3 +-
1616  sound/soc/codecs/cs4270.c                          |   11 +-
1617  sound/soc/codecs/cs4271.c                          |    3 +-
1618  sound/soc/codecs/cs42l51.c                         |    9 +-
1619  sound/soc/codecs/cs42l73.c                         |   29 +-
1620  sound/soc/codecs/da7210.c                          |  157 +-
1621  sound/soc/codecs/jz4740.c                          |    3 +-
1622  sound/soc/codecs/lm49453.c                         | 1550 ++++++++++++++++++++
1623  sound/soc/codecs/lm49453.h                         |  380 +++++
1624  sound/soc/codecs/max98095.c                        |  158 +-
1625  sound/soc/codecs/max98095.h                        |   22 +
1626  sound/soc/codecs/ml26124.c                         |  681 +++++++++
1627  sound/soc/codecs/ml26124.h                         |  184 +++
1628  sound/soc/codecs/rt5631.c                          |    3 +-
1629  sound/soc/codecs/sgtl5000.c                        |   25 +-
1630  sound/soc/codecs/ssm2602.c                         |    9 +-
1631  sound/soc/codecs/sta32x.c                          |    3 +-
1632  sound/soc/codecs/tlv320aic23.c                     |   13 +-
1633  sound/soc/codecs/tlv320aic26.c                     |    3 +-
1634  sound/soc/codecs/tlv320aic3x.c                     |    3 +-
1635  sound/soc/codecs/tlv320dac33.c                     |   35 +-
1636  sound/soc/codecs/twl4030.c                         |   18 +-
1637  sound/soc/codecs/twl6040.c                         |    9 +-
1638  sound/soc/codecs/uda134x.c                         |    6 +-
1639  sound/soc/codecs/uda1380.c                         |    6 +-
1640  sound/soc/codecs/wl1273.c                          |    6 +-
1641  sound/soc/codecs/wm1250-ev1.c                      |   18 +-
1642  sound/soc/codecs/wm5100.c                          |    9 +-
1643  sound/soc/codecs/wm8400.c                          |  135 +-
1644  sound/soc/codecs/wm8510.c                          |    3 +-
1645  sound/soc/codecs/wm8523.c                          |    3 +-
1646  sound/soc/codecs/wm8728.c                          |    3 +-
1647  sound/soc/codecs/wm8737.c                          |    3 +-
1648  sound/soc/codecs/wm8741.c                          |    3 +-
1649  sound/soc/codecs/wm8750.c                          |    3 +-
1650  sound/soc/codecs/wm8753.c                          |    6 +-
1651  sound/soc/codecs/wm8900.c                          |    3 +-
1652  sound/soc/codecs/wm8903.c                          |    3 +-
1653  sound/soc/codecs/wm8940.c                          |    3 +-
1654  sound/soc/codecs/wm8960.c                          |    3 +-
1655  sound/soc/codecs/wm8962.c                          |   18 +-
1656  sound/soc/codecs/wm8971.c                          |    3 +-
1657  sound/soc/codecs/wm8978.c                          |    3 +-
1658  sound/soc/codecs/wm8988.c                          |    3 +-
1659  sound/soc/codecs/wm8990.c                          |    3 +-
1660  sound/soc/codecs/wm8994.c                          |  115 +-
1661  sound/soc/codecs/wm8994.h                          |    1 +
1662  sound/soc/codecs/wm9705.c                          |    4 +-
1663  sound/soc/codecs/wm9712.c                          |   10 +-
1664  sound/soc/ep93xx/ep93xx-ac97.c                     |   74 +-
1665  sound/soc/ep93xx/ep93xx-i2s.c                      |   49 +-
1666  sound/soc/fsl/Kconfig                              |  121 +-
1667  sound/soc/fsl/Makefile                             |   29 +-
1668  sound/soc/{imx => fsl}/eukrea-tlv320.c             |    2 +-
1669  sound/soc/fsl/fsl_ssi.c                            |  167 ++-
1670  sound/soc/fsl/fsl_utils.c                          |   91 ++
1671  sound/soc/fsl/fsl_utils.h                          |   26 +
1672  sound/soc/{imx => fsl}/imx-audmux.c                |    0
1673  sound/soc/{imx => fsl}/imx-audmux.h                |    0
1674  .../{imx/imx-pcm-dma-mx2.c => fsl/imx-pcm-dma.c}   |    3 +-
1675  sound/soc/{imx => fsl}/imx-pcm-fiq.c               |    0
1676  sound/soc/{imx => fsl}/imx-pcm.c                   |    0
1677  sound/soc/{imx => fsl}/imx-pcm.h                   |    1 +
1678  sound/soc/fsl/imx-sgtl5000.c                       |  190 +++
1679  sound/soc/{imx => fsl}/imx-ssi.c                   |    2 +-
1680  sound/soc/{imx => fsl}/imx-ssi.h                   |    0
1681  sound/soc/fsl/mpc8610_hpcd.c                       |  166 +--
1682  sound/soc/{imx => fsl}/mx27vis-aic32x4.c           |    0
1683  sound/soc/fsl/p1022_ds.c                           |  158 +-
1684  sound/soc/{imx => fsl}/phycore-ac97.c              |    0
1685  sound/soc/{imx => fsl}/wm1133-ev1.c                |    0
1686  sound/soc/imx/Kconfig                              |   79 -
1687  sound/soc/imx/Makefile                             |   22 -
1688  sound/soc/jz4740/jz4740-i2s.c                      |    4 +-
1689  sound/soc/pxa/pxa2xx-i2s.c                         |    4 +-
1690  sound/soc/soc-core.c                               |  346 ++---
1691  sound/soc/soc-dapm.c                               |  252 ++--
1692  sound/soc/soc-jack.c                               |    5 +-
1693  sound/soc/soc-pcm.c                                |    9 +-
1694  sound/soc/tegra/Kconfig                            |   39 +-
1695  sound/soc/tegra/Makefile                           |   14 +-
1696  sound/soc/tegra/tegra20_das.c                      |  260 ++++
1697  sound/soc/tegra/tegra20_das.h                      |  135 ++
1698  sound/soc/tegra/tegra20_i2s.c                      |  501 +++++++
1699  sound/soc/tegra/tegra20_i2s.h                      |  165 +++
1700  sound/soc/tegra/tegra20_spdif.c                    |  399 +++++
1701  sound/soc/tegra/tegra20_spdif.h                    |  472 ++++++
1702  sound/soc/tegra/tegra_alc5632.c                    |   48 +-
1703  sound/soc/tegra/tegra_asoc_utils.c                 |   37 +-
1704  sound/soc/tegra/tegra_asoc_utils.h                 |    9 +-
1705  sound/soc/tegra/tegra_das.c                        |  261 ----
1706  sound/soc/tegra/tegra_das.h                        |  135 --
1707  sound/soc/tegra/tegra_i2s.c                        |  459 ------
1708  sound/soc/tegra/tegra_i2s.h                        |  166 ---
1709  sound/soc/tegra/tegra_pcm.c                        |   28 +-
1710  sound/soc/tegra/tegra_pcm.h                        |    5 +-
1711  sound/soc/tegra/tegra_spdif.c                      |  364 -----
1712  sound/soc/tegra/tegra_spdif.h                      |  473 ------
1713  sound/soc/tegra/tegra_wm8903.c                     |   29 +-
1714  sound/soc/tegra/trimslice.c                        |    7 +-
1715  128 files changed, 6549 insertions(+), 3266 deletions(-)
1716  create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt
1717  create mode 100644 sound/soc/codecs/lm49453.c
1718  create mode 100644 sound/soc/codecs/lm49453.h
1719  create mode 100644 sound/soc/codecs/ml26124.c
1720  create mode 100644 sound/soc/codecs/ml26124.h
1721  rename sound/soc/{imx => fsl}/eukrea-tlv320.c (99%)
1722  create mode 100644 sound/soc/fsl/fsl_utils.c
1723  create mode 100644 sound/soc/fsl/fsl_utils.h
1724  rename sound/soc/{imx => fsl}/imx-audmux.c (100%)
1725  rename sound/soc/{imx => fsl}/imx-audmux.h (100%)
1726  rename sound/soc/{imx/imx-pcm-dma-mx2.c => fsl/imx-pcm-dma.c} (97%)
1727  rename sound/soc/{imx => fsl}/imx-pcm-fiq.c (100%)
1728  rename sound/soc/{imx => fsl}/imx-pcm.c (100%)
1729  rename sound/soc/{imx => fsl}/imx-pcm.h (93%)
1730  create mode 100644 sound/soc/fsl/imx-sgtl5000.c
1731  rename sound/soc/{imx => fsl}/imx-ssi.c (99%)
1732  rename sound/soc/{imx => fsl}/imx-ssi.h (100%)
1733  rename sound/soc/{imx => fsl}/mx27vis-aic32x4.c (100%)
1734  rename sound/soc/{imx => fsl}/phycore-ac97.c (100%)
1735  rename sound/soc/{imx => fsl}/wm1133-ev1.c (100%)
1736  delete mode 100644 sound/soc/imx/Kconfig
1737  delete mode 100644 sound/soc/imx/Makefile
1738  create mode 100644 sound/soc/tegra/tegra20_das.c
1739  create mode 100644 sound/soc/tegra/tegra20_das.h
1740  create mode 100644 sound/soc/tegra/tegra20_i2s.c
1741  create mode 100644 sound/soc/tegra/tegra20_i2s.h
1742  create mode 100644 sound/soc/tegra/tegra20_spdif.c
1743  create mode 100644 sound/soc/tegra/tegra20_spdif.h
1744  delete mode 100644 sound/soc/tegra/tegra_das.c
1745  delete mode 100644 sound/soc/tegra/tegra_das.h
1746  delete mode 100644 sound/soc/tegra/tegra_i2s.c
1747  delete mode 100644 sound/soc/tegra/tegra_i2s.h
1748  delete mode 100644 sound/soc/tegra/tegra_spdif.c
1749  delete mode 100644 sound/soc/tegra/tegra_spdif.h
1750 Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
1751 $ git merge cpufreq/next
1752 Already up-to-date.
1753 Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
1754 $ git merge quilt/rr
1755 Recorded preimage for 'init/main.c'
1756 Resolved 'arch/arm/kernel/kprobes.c' using previous resolution.
1757 Resolved 'drivers/virtio/virtio_balloon.c' using previous resolution.
1758 Auto-merging init/main.c
1759 CONFLICT (content): Merge conflict in init/main.c
1760 Auto-merging drivers/virtio/virtio_balloon.c
1761 CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
1762 Auto-merging arch/arm/kernel/kprobes.c
1763 CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
1764 Auto-merging Documentation/virtual/virtio-spec.txt
1765 Automatic merge failed; fix conflicts and then commit the result.
1766 $ git commit -v -a
1767 Recorded resolution for 'init/main.c'.
1768 [master 8b88d45] Merge branch 'quilt/rr'
1769 $ git diff -M --stat --summary HEAD^..
1770  Documentation/virtual/virtio-spec.txt | 1000 ++++++++++++++++++++++++++++++---
1771  1 file changed, 927 insertions(+), 73 deletions(-)
1772 Merging input/next (d568778 Input: wacom_i2c - do not use irq_to_gpio)
1773 $ git merge input/next
1774 Auto-merging drivers/input/touchscreen/Kconfig
1775 Auto-merging drivers/input/tablet/wacom_wac.c
1776 Auto-merging drivers/input/tablet/wacom_sys.c
1777 Merge made by the 'recursive' strategy.
1778  Documentation/ABI/testing/sysfs-driver-wacom |   15 +-
1779  drivers/input/joystick/a3d.c                 |   13 +-
1780  drivers/input/joystick/adi.c                 |   17 +-
1781  drivers/input/joystick/cobra.c               |   13 +-
1782  drivers/input/joystick/gf2k.c                |   13 +-
1783  drivers/input/joystick/grip.c                |   13 +-
1784  drivers/input/joystick/grip_mp.c             |   13 +-
1785  drivers/input/joystick/guillemot.c           |   13 +-
1786  drivers/input/joystick/interact.c            |   13 +-
1787  drivers/input/joystick/joydump.c             |   13 +-
1788  drivers/input/joystick/magellan.c            |   17 +-
1789  drivers/input/joystick/sidewinder.c          |   13 +-
1790  drivers/input/joystick/spaceball.c           |   17 +-
1791  drivers/input/joystick/spaceorb.c            |   17 +-
1792  drivers/input/joystick/stinger.c             |   17 +-
1793  drivers/input/joystick/tmdc.c                |   13 +-
1794  drivers/input/joystick/twidjoy.c             |   17 +-
1795  drivers/input/joystick/warrior.c             |   17 +-
1796  drivers/input/joystick/zhenhua.c             |   17 +-
1797  drivers/input/keyboard/Kconfig               |   10 +
1798  drivers/input/keyboard/Makefile              |    1 +
1799  drivers/input/keyboard/hil_kbd.c             |   13 +-
1800  drivers/input/keyboard/lkkbd.c               |   17 +-
1801  drivers/input/keyboard/lm8333.c              |  236 +++++++++++++++++++++
1802  drivers/input/keyboard/newtonkbd.c           |   13 +-
1803  drivers/input/keyboard/stowaway.c            |   13 +-
1804  drivers/input/keyboard/sunkbd.c              |   17 +-
1805  drivers/input/keyboard/xtkbd.c               |   13 +-
1806  drivers/input/mouse/sermouse.c               |   13 +-
1807  drivers/input/mouse/vsxxxaa.c                |   14 +-
1808  drivers/input/serio/ps2mult.c                |   13 +-
1809  drivers/input/serio/serio_raw.c              |   13 +-
1810  drivers/input/serio/xilinx_ps2.c             |   35 ++--
1811  drivers/input/tablet/wacom_sys.c             |   96 +++++++--
1812  drivers/input/tablet/wacom_wac.c             |  125 +++++++++++-
1813  drivers/input/tablet/wacom_wac.h             |    4 +
1814  drivers/input/touchscreen/Kconfig            |   12 ++
1815  drivers/input/touchscreen/Makefile           |    1 +
1816  drivers/input/touchscreen/dynapro.c          |   17 +-
1817  drivers/input/touchscreen/elo.c              |   17 +-
1818  drivers/input/touchscreen/fujitsu_ts.c       |   13 +-
1819  drivers/input/touchscreen/gunze.c            |   17 +-
1820  drivers/input/touchscreen/h3600_ts_input.c   |   17 +-
1821  drivers/input/touchscreen/hampshire.c        |   17 +-
1822  drivers/input/touchscreen/inexio.c           |   17 +-
1823  drivers/input/touchscreen/mtouch.c           |   17 +-
1824  drivers/input/touchscreen/penmount.c         |   17 +-
1825  drivers/input/touchscreen/st1232.c           |   20 +-
1826  drivers/input/touchscreen/touchit213.c       |   17 +-
1827  drivers/input/touchscreen/touchright.c       |   17 +-
1828  drivers/input/touchscreen/touchwin.c         |   17 +-
1829  drivers/input/touchscreen/tsc40.c            |   12 +-
1830  drivers/input/touchscreen/wacom_i2c.c        |  282 ++++++++++++++++++++++++++
1831  drivers/input/touchscreen/wacom_w8001.c      |   13 +-
1832  include/linux/gameport.h                     |   13 ++
1833  include/linux/input/lm8333.h                 |   24 +++
1834  include/linux/serio.h                        |   13 ++
1835  57 files changed, 880 insertions(+), 637 deletions(-)
1836  create mode 100644 drivers/input/keyboard/lm8333.c
1837  create mode 100644 drivers/input/touchscreen/wacom_i2c.c
1838  create mode 100644 include/linux/input/lm8333.h
1839 Merging input-mt/for-next (0034102 Linux 3.4-rc2)
1840 $ git merge input-mt/for-next
1841 Already up-to-date.
1842 Merging cgroup/for-next (cbe128e cgroup: get rid of populate for memcg)
1843 $ git merge cgroup/for-next
1844 Auto-merging kernel/cpuset.c
1845 Auto-merging Documentation/feature-removal-schedule.txt
1846 Merge made by the 'recursive' strategy.
1847  Documentation/feature-removal-schedule.txt |    9 +
1848  block/blk-cgroup.c                         |   45 +--
1849  include/linux/cgroup.h                     |   80 ++--
1850  include/net/sock.h                         |   12 +-
1851  include/net/tcp_memcontrol.h               |    4 +-
1852  kernel/cgroup.c                            |  550 +++++++++++++++++++++-------
1853  kernel/cgroup_freezer.c                    |   11 +-
1854  kernel/cpuset.c                            |   31 +-
1855  kernel/sched/core.c                        |   16 +-
1856  mm/memcontrol.c                            |  115 +++---
1857  net/core/netprio_cgroup.c                  |   30 +-
1858  net/core/sock.c                            |   10 +-
1859  net/ipv4/tcp_memcontrol.c                  |   77 ++--
1860  net/sched/cls_cgroup.c                     |   31 +-
1861  security/device_cgroup.c                   |   10 +-
1862  15 files changed, 637 insertions(+), 394 deletions(-)
1863 Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
1864 $ git merge block/for-next
1865 Already up-to-date.
1866 Merging quilt/device-mapper (4b63eba This device-mapper target creates a read-only device that transparently validates the data on one underlying device against a pre-generated tree of cryptographic checksums stored on a second device.)
1867 $ git merge quilt/device-mapper
1868 Merge made by the 'recursive' strategy.
1869 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
1870 $ git merge embedded/master
1871 Already up-to-date.
1872 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
1873 $ git merge firmware/master
1874 Already up-to-date.
1875 Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
1876 $ git merge pcmcia/master
1877 Already up-to-date.
1878 Merging mmc/mmc-next (aaed8df mmc: sdhci: Log what timeout was set if the timeout is too large)
1879 $ git merge mmc/mmc-next
1880 Merge made by the 'recursive' strategy.
1881  drivers/mmc/card/block.c       |   54 +++++++++++++++++++--------
1882  drivers/mmc/card/queue.c       |    2 +-
1883  drivers/mmc/core/core.c        |    9 +++--
1884  drivers/mmc/host/davinci_mmc.c |    1 +
1885  drivers/mmc/host/dw_mmc.c      |    4 +-
1886  drivers/mmc/host/omap_hsmmc.c  |   80 +++++++++++++++++++++++-----------------
1887  drivers/mmc/host/sdhci.c       |    4 +-
1888  7 files changed, 97 insertions(+), 57 deletions(-)
1889 Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
1890 $ git merge kgdb/kgdb-next
1891 Already up-to-date.
1892 Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
1893 $ git merge slab/for-next
1894 Auto-merging mm/slub.c
1895 Auto-merging include/linux/slub_def.h
1896 Merge made by the 'recursive' strategy.
1897  include/linux/slub_def.h |    1 -
1898  mm/slub.c                |  166 +++++++++++++++++++++++++---------------------
1899  2 files changed, 89 insertions(+), 78 deletions(-)
1900 Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
1901 $ git merge uclinux/for-next
1902 Already up-to-date.
1903 Merging md/for-next (b58fc3e md/raid1,raid10: Fix calculation of 'vcnt' when processing error recovery.)
1904 $ git merge md/for-next
1905 Auto-merging crypto/xor.c
1906 Merge made by the 'recursive' strategy.
1907  crypto/xor.c              |   13 +-
1908  drivers/md/bitmap.c       |    3 -
1909  drivers/md/md.c           |  296 ++++++++++-
1910  drivers/md/md.h           |    8 +-
1911  drivers/md/raid1.c        |    7 +-
1912  drivers/md/raid10.c       | 1242 +++++++++++++++++++++++++++++++++++++++------
1913  drivers/md/raid10.h       |   35 +-
1914  drivers/md/raid5.c        |  206 ++++++--
1915  drivers/md/raid5.h        |    6 +
1916  include/linux/raid/md_p.h |   15 +-
1917  include/linux/raid/pq.h   |   18 +-
1918  lib/raid6/algos.c         |  128 +++--
1919  lib/raid6/mktables.c      |   25 +
1920  lib/raid6/recov.c         |  341 ++++++++++++-
1921  lib/raid6/test/test.c     |   32 +-
1922  lib/raid6/x86.h           |   13 +-
1923  16 files changed, 2073 insertions(+), 315 deletions(-)
1924 $ git reset --hard HEAD^
1925 HEAD is now at 8b29a8c Merge remote-tracking branch 'slab/for-next'
1926 Merging refs/next/20120410/md
1927 $ git merge refs/next/20120410/md
1928 Merge made by the 'recursive' strategy.
1929  drivers/md/md.c           |  299 ++++++++++-
1930  drivers/md/md.h           |    8 +-
1931  drivers/md/raid1.c        |    4 +-
1932  drivers/md/raid10.c       | 1236 +++++++++++++++++++++++++++++++++++++++------
1933  drivers/md/raid10.h       |   35 +-
1934  drivers/md/raid5.c        |  206 ++++++--
1935  drivers/md/raid5.h        |    6 +
1936  include/linux/raid/md_p.h |   15 +-
1937  8 files changed, 1565 insertions(+), 244 deletions(-)
1938 Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
1939 $ git merge mfd/for-next
1940 Already up-to-date.
1941 Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
1942 $ git merge battery/master
1943 Already up-to-date.
1944 Merging drm/drm-next (5466c7b drm/i915: use DDC_ADDR instead of hard-coding it)
1945 $ git merge drm/drm-next
1946 Already up-to-date.
1947 Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
1948 $ git merge fbdev/fbdev-next
1949 Auto-merging arch/arm/mach-s5pv210/mach-goni.c
1950 Auto-merging arch/arm/mach-s5pv210/mach-aquila.c
1951 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
1952 Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
1953 Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
1954 Auto-merging arch/arm/mach-exynos/mach-nuri.c
1955 Merge made by the 'recursive' strategy.
1956  arch/arm/mach-exynos/mach-nuri.c           |   26 +-
1957  arch/arm/mach-exynos/mach-origen.c         |   24 +-
1958  arch/arm/mach-exynos/mach-smdkv310.c       |   28 ++-
1959  arch/arm/mach-exynos/mach-universal_c210.c |   26 +-
1960  arch/arm/mach-s3c24xx/mach-smdk2416.c      |   27 +-
1961  arch/arm/mach-s3c64xx/mach-anw6410.c       |   25 +-
1962  arch/arm/mach-s3c64xx/mach-crag6410.c      |   25 +-
1963  arch/arm/mach-s3c64xx/mach-hmt.c           |   24 +-
1964  arch/arm/mach-s3c64xx/mach-mini6410.c      |   92 ++++---
1965  arch/arm/mach-s3c64xx/mach-real6410.c      |   90 ++++---
1966  arch/arm/mach-s3c64xx/mach-smartq5.c       |   26 +-
1967  arch/arm/mach-s3c64xx/mach-smartq7.c       |   26 +-
1968  arch/arm/mach-s3c64xx/mach-smdk6410.c      |   25 +-
1969  arch/arm/mach-s5p64x0/mach-smdk6440.c      |   24 +-
1970  arch/arm/mach-s5p64x0/mach-smdk6450.c      |   24 +-
1971  arch/arm/mach-s5pc100/mach-smdkc100.c      |   27 +-
1972  arch/arm/mach-s5pv210/mach-aquila.c        |   36 ++-
1973  arch/arm/mach-s5pv210/mach-goni.c          |   26 +-
1974  arch/arm/mach-s5pv210/mach-smdkv210.c      |   24 +-
1975  arch/arm/plat-samsung/include/plat/fb.h    |   11 +-
1976  drivers/video/au1100fb.c                   |    5 +-
1977  drivers/video/au1200fb.c                   |    2 +-
1978  drivers/video/kyro/STG4000Reg.h            |  376 ++++++++++++++--------------
1979  drivers/video/pxa3xx-gcu.c                 |    5 +-
1980  drivers/video/s3c-fb.c                     |  135 +++++-----
1981  drivers/video/uvesafb.c                    |   11 +-
1982  26 files changed, 628 insertions(+), 542 deletions(-)
1983 Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
1984 $ git merge viafb/viafb-next
1985 Already up-to-date.
1986 Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
1987 $ git merge omap_dss2/for-next
1988 Already up-to-date.
1989 Merging regulator/for-next (cf0ff3d Merge branch 'regulator-drivers' into regulator-next)
1990 $ git merge regulator/for-next
1991 Auto-merging sound/soc/codecs/sgtl5000.c
1992 Merge made by the 'recursive' strategy.
1993  drivers/regulator/88pm8607.c                 |  107 +++-----
1994  drivers/regulator/Kconfig                    |   21 +-
1995  drivers/regulator/Makefile                   |    4 +-
1996  drivers/regulator/aat2870-regulator.c        |    9 +-
1997  drivers/regulator/ab3100.c                   |   29 +--
1998  drivers/regulator/ab8500.c                   |   43 +--
1999  drivers/regulator/ad5398.c                   |   19 +-
2000  drivers/regulator/anatop-regulator.c         |    9 +-
2001  drivers/regulator/core.c                     |  138 +++++-----
2002  drivers/regulator/da903x.c                   |    8 +-
2003  drivers/regulator/da9052-regulator.c         |  324 +++++++----------------
2004  drivers/regulator/db8500-prcmu.c             |    8 +-
2005  drivers/regulator/dummy.c                    |    6 +-
2006  drivers/regulator/fixed.c                    |   65 ++---
2007  drivers/regulator/gpio-regulator.c           |   21 +-
2008  drivers/regulator/isl6271a-regulator.c       |   18 +-
2009  drivers/regulator/lp3971.c                   |   87 ++-----
2010  drivers/regulator/lp3972.c                   |   74 ++----
2011  drivers/regulator/max1586.c                  |   12 +-
2012  drivers/regulator/max8649.c                  |   30 +--
2013  drivers/regulator/max8660.c                  |   12 +-
2014  drivers/regulator/max8925-regulator.c        |   25 +-
2015  drivers/regulator/max8952.c                  |   46 ++--
2016  drivers/regulator/max8997.c                  |  179 +++++--------
2017  drivers/regulator/max8998.c                  |   28 +-
2018  drivers/regulator/mc13783-regulator.c        |   12 +-
2019  drivers/regulator/mc13892-regulator.c        |   25 +-
2020  drivers/regulator/mc13xxx-regulator-core.c   |   54 +---
2021  drivers/regulator/mc13xxx.h                  |    2 -
2022  drivers/regulator/pcap-regulator.c           |   54 ++--
2023  drivers/regulator/pcf50633-regulator.c       |   88 +++----
2024  drivers/regulator/rc5t583-regulator.c        |  361 ++++++++++++++++++++++++++
2025  drivers/regulator/s5m8767.c                  |  321 +++++++++++------------
2026  drivers/regulator/tps6105x-regulator.c       |   11 +-
2027  drivers/regulator/tps62360-regulator.c       |   46 ++--
2028  drivers/regulator/tps65023-regulator.c       |  131 +++-------
2029  drivers/regulator/tps6507x-regulator.c       |    8 +-
2030  drivers/regulator/tps65090-regulator.c       |  201 ++++++++++++++
2031  drivers/regulator/tps65217-regulator.c       |   10 +-
2032  drivers/regulator/tps6524x-regulator.c       |   44 +---
2033  drivers/regulator/tps6586x-regulator.c       |  107 +++-----
2034  drivers/regulator/tps65910-regulator.c       |    8 +-
2035  drivers/regulator/tps65912-regulator.c       |   53 ++--
2036  drivers/regulator/twl-regulator.c            |   72 ++---
2037  drivers/regulator/wm831x-dcdc.c              |   41 +--
2038  drivers/regulator/wm831x-isink.c             |    8 +-
2039  drivers/regulator/wm831x-ldo.c               |   28 +-
2040  drivers/regulator/wm8350-regulator.c         |   11 +-
2041  drivers/regulator/wm8400-regulator.c         |    7 +-
2042  drivers/regulator/wm8994-regulator.c         |   10 +-
2043  include/linux/mfd/rc5t583.h                  |   29 +++
2044  include/linux/mfd/s5m87xx/s5m-core.h         |    1 +
2045  include/linux/mfd/s5m87xx/s5m-pmic.h         |   29 +++
2046  include/linux/regulator/driver.h             |   36 ++-
2047  include/linux/regulator/fixed.h              |    7 +
2048  include/linux/regulator/tps65090-regulator.h |   50 ++++
2049  sound/soc/codecs/sgtl5000.c                  |    8 +-
2050  57 files changed, 1738 insertions(+), 1457 deletions(-)
2051  create mode 100644 drivers/regulator/rc5t583-regulator.c
2052  create mode 100644 drivers/regulator/tps65090-regulator.c
2053  create mode 100644 include/linux/regulator/tps65090-regulator.h
2054 Merging security/next (9ccf010 maintainers: update wiki url for the security subsystem)
2055 $ git merge security/next
2056 Auto-merging MAINTAINERS
2057 Merge made by the 'recursive' strategy.
2058  MAINTAINERS |    3 ++-
2059  1 file changed, 2 insertions(+), 1 deletion(-)
2060 Merging selinux/master (ecf093d SELinux: add default_type statements)
2061 $ git merge selinux/master
2062 Auto-merging security/selinux/selinuxfs.c
2063 Auto-merging net/xfrm/xfrm_policy.c
2064 Merge made by the 'recursive' strategy.
2065  net/xfrm/xfrm_policy.c              |    1 +
2066  security/selinux/include/security.h |    4 +++-
2067  security/selinux/selinuxfs.c        |    3 ++-
2068  security/selinux/ss/context.h       |   20 ++++++++++++++++
2069  security/selinux/ss/mls.c           |   24 +++++++++++++++++++
2070  security/selinux/ss/policydb.c      |   44 +++++++++++++++++++++++++++++++++++
2071  security/selinux/ss/policydb.h      |   14 +++++++++++
2072  security/selinux/ss/services.c      |   42 ++++++++++++++++++++++++++-------
2073  8 files changed, 141 insertions(+), 11 deletions(-)
2074 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
2075 $ git merge lblnet/master
2076 Already up-to-date.
2077 Merging watchdog/master (0034102 Linux 3.4-rc2)
2078 $ git merge watchdog/master
2079 Already up-to-date.
2080 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
2081 $ git merge dwmw2-iommu/master
2082 Already up-to-date.
2083 Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' into next)
2084 $ git merge iommu/next
2085 Already up-to-date.
2086 Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
2087 $ git merge osd/linux-next
2088 Already up-to-date.
2089 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
2090 $ git merge jc_docs/docs-next
2091 Already up-to-date.
2092 Merging trivial/for-next (b3aa158 workqueue: Fix workqueue_execute_end() comment)
2093 $ git merge trivial/for-next
2094 Auto-merging drivers/video/au1100fb.c
2095 Auto-merging drivers/regulator/tps65910-regulator.c
2096 Auto-merging drivers/net/ethernet/realtek/r8169.c
2097 Auto-merging MAINTAINERS
2098 Merge made by the 'recursive' strategy.
2099  CREDITS                                |    4 ++--
2100  Documentation/hwmon/wm831x             |    2 +-
2101  Documentation/sound/oss/ALS            |    4 ++--
2102  Documentation/usb/dwc3.txt             |    2 +-
2103  Documentation/usb/wusb-cbaf            |    2 +-
2104  Documentation/video4linux/README.cpia2 |    2 +-
2105  MAINTAINERS                            |    2 +-
2106  Makefile                               |   12 +++++++-----
2107  arch/alpha/kernel/pci_iommu.c          |   20 ++++++++++----------
2108  arch/arm/nwfpe/fpmodule.c              |    2 +-
2109  arch/mips/kernel/mips-mt.c             |    2 +-
2110  arch/mips/lantiq/xway/gpio.c           |    2 +-
2111  arch/mips/lantiq/xway/gpio_ebu.c       |    2 +-
2112  arch/mips/lantiq/xway/gpio_stp.c       |    2 +-
2113  arch/mips/pci/pci-lantiq.c             |    2 +-
2114  arch/mips/sni/pcimt.c                  |    2 +-
2115  drivers/gpu/drm/radeon/radeon_gart.c   |    2 +-
2116  drivers/mfd/tps65911-comparator.c      |    2 +-
2117  drivers/mtd/devices/docg3.c            |   16 ++++++++--------
2118  drivers/net/ethernet/realtek/r8169.c   |    2 +-
2119  drivers/parisc/superio.c               |    2 +-
2120  drivers/platform/x86/fujitsu-laptop.c  |    2 +-
2121  drivers/power/bq27x00_battery.c        |    2 +-
2122  drivers/regulator/tps65910-regulator.c |   20 ++++++++++----------
2123  drivers/scsi/esp_scsi.c                |    2 +-
2124  drivers/usb/gadget/u_serial.c          |    2 +-
2125  drivers/usb/storage/unusual_devs.h     |    2 +-
2126  drivers/video/au1100fb.c               |    2 +-
2127  drivers/w1/w1.c                        |    2 +-
2128  fs/btrfs/disk-io.c                     |    2 +-
2129  include/linux/mfd/wm831x/pdata.h       |    2 +-
2130  include/trace/events/workqueue.h       |    2 +-
2131  kernel/semaphore.c                     |    2 +-
2132  net/atm/lec.h                          |    4 ++--
2133  sound/isa/als100.c                     |    2 +-
2134  sound/pci/hda/patch_realtek.c          |    2 +-
2135  36 files changed, 70 insertions(+), 68 deletions(-)
2136 Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
2137 $ git merge audit/for-next
2138 Already up-to-date.
2139 Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
2140 $ git merge pm/linux-next
2141 Already up-to-date.
2142 Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
2143 $ git merge apm/for-next
2144 Already up-to-date.
2145 Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
2146 $ git merge fsnotify/for-next
2147 Auto-merging fs/notify/notification.c
2148 Merge made by the 'recursive' strategy.
2149  fs/notify/dnotify/dnotify.c          |    4 +-
2150  fs/notify/fanotify/fanotify.c        |    6 +++
2151  fs/notify/fanotify/fanotify_user.c   |   37 +++++++++-----
2152  fs/notify/group.c                    |   47 ++++++++++--------
2153  fs/notify/inode_mark.c               |   14 ++++--
2154  fs/notify/inotify/inotify_fsnotify.c |    4 +-
2155  fs/notify/inotify/inotify_user.c     |   34 ++++++-------
2156  fs/notify/mark.c                     |   91 +++++++++++++++++++---------------
2157  fs/notify/notification.c             |    1 +
2158  fs/notify/vfsmount_mark.c            |   14 ++++--
2159  include/linux/fsnotify_backend.h     |   31 ++++++++----
2160  kernel/audit_tree.c                  |   10 ++--
2161  kernel/audit_watch.c                 |    4 +-
2162  13 files changed, 178 insertions(+), 119 deletions(-)
2163 Merging edac/linux_next (a4b4be3 edac: rename channel_info to rank_info)
2164 $ git merge edac/linux_next
2165 Already up-to-date.
2166 Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
2167 $ git merge edac-amd/for-next
2168 Merge made by the 'recursive' strategy.
2169 Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
2170 $ git merge devicetree/devicetree/next
2171 Already up-to-date.
2172 Merging spi/spi/next (6810d77 spi/devicetree: Move devicetree support code into spi directory)
2173 $ git merge spi/spi/next
2174 Removing include/linux/of_spi.h
2175 Removing drivers/of/of_spi.c
2176 Merge made by the 'recursive' strategy.
2177  drivers/of/Kconfig            |    6 --
2178  drivers/of/Makefile           |    1 -
2179  drivers/of/of_spi.c           |   99 -------------------------------
2180  drivers/spi/spi-dw-pci.c      |   13 +---
2181  drivers/spi/spi-fsl-espi.c    |    1 -
2182  drivers/spi/spi-fsl-lib.c     |    1 -
2183  drivers/spi/spi-omap2-mcspi.c |  132 ++++++++++++++++-------------------------
2184  drivers/spi/spi-ppc4xx.c      |    1 -
2185  drivers/spi/spi-pxa2xx-pci.c  |   12 +---
2186  drivers/spi/spi.c             |   92 +++++++++++++++++++++++++++-
2187  include/linux/of_spi.h        |   23 -------
2188  11 files changed, 143 insertions(+), 238 deletions(-)
2189  delete mode 100644 drivers/of/of_spi.c
2190  delete mode 100644 include/linux/of_spi.h
2191 Merging tip/auto-latest (911bcb2 Merge branch 'linus')
2192 $ git merge tip/auto-latest
2193 Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
2194 Auto-merging Makefile
2195 Auto-merging MAINTAINERS
2196 Auto-merging Documentation/feature-removal-schedule.txt
2197 CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
2198 Automatic merge failed; fix conflicts and then commit the result.
2199 $ git commit -v -a
2200 [master da04671b] Merge remote-tracking branch 'tip/auto-latest'
2201 $ git diff -M --stat --summary HEAD^..
2202  Documentation/feature-removal-schedule.txt   |    8 +
2203  MAINTAINERS                                  |    8 +
2204  Makefile                                     |   10 +
2205  arch/Kconfig                                 |   17 +
2206  arch/x86/Kconfig                             |   36 +-
2207  arch/x86/boot/compressed/eboot.c             |   14 +-
2208  arch/x86/boot/header.S                       |   26 +-
2209  arch/x86/boot/tools/build.c                  |   24 +-
2210  arch/x86/include/asm/e820.h                  |    7 +
2211  arch/x86/include/asm/efi.h                   |    5 -
2212  arch/x86/include/asm/msr-index.h             |    5 +
2213  arch/x86/include/asm/perf_event.h            |    2 +
2214  arch/x86/include/asm/spinlock.h              |    2 -
2215  arch/x86/include/asm/thread_info.h           |    2 +
2216  arch/x86/include/asm/uprobes.h               |   57 +
2217  arch/x86/kernel/Makefile                     |    1 +
2218  arch/x86/kernel/cpu/perf_event_amd_ibs.c     |  438 ++++++-
2219  arch/x86/kernel/e820.c                       |    3 +-
2220  arch/x86/kernel/reboot.c                     |  277 ++---
2221  arch/x86/kernel/setup.c                      |   21 +-
2222  arch/x86/kernel/signal.c                     |    6 +
2223  arch/x86/kernel/uprobes.c                    |  674 +++++++++++
2224  arch/x86/mm/init.c                           |   21 +-
2225  arch/x86/mm/tlb.c                            |    8 +-
2226  arch/x86/platform/efi/efi.c                  |   37 +-
2227  arch/x86/platform/efi/efi_64.c               |   17 -
2228  fs/proc/stat.c                               |   34 +-
2229  include/linux/mm_types.h                     |    2 +
2230  include/linux/sched.h                        |    4 +
2231  include/linux/uprobes.h                      |  164 +++
2232  kernel/events/Makefile                       |    3 +
2233  kernel/events/uprobes.c                      | 1662 ++++++++++++++++++++++++++
2234  kernel/fork.c                                |    9 +
2235  kernel/itimer.c                              |    5 +-
2236  kernel/signal.c                              |    4 +
2237  lib/Kconfig.debug                            |    9 +
2238  mm/mmap.c                                    |   33 +-
2239  scripts/kconfig/Makefile                     |    7 +-
2240  tools/kvm/.gitignore                         |   12 +
2241  tools/kvm/CREDITS-Git                        |   30 +
2242  tools/kvm/Documentation/kernel-debugging.txt |   15 +
2243  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
2244  tools/kvm/Documentation/kvm-debug.txt        |   16 +
2245  tools/kvm/Documentation/kvm-list.txt         |   16 +
2246  tools/kvm/Documentation/kvm-pause.txt        |   16 +
2247  tools/kvm/Documentation/kvm-resume.txt       |   16 +
2248  tools/kvm/Documentation/kvm-run.txt          |   62 +
2249  tools/kvm/Documentation/kvm-sandbox.txt      |   16 +
2250  tools/kvm/Documentation/kvm-setup.txt        |   15 +
2251  tools/kvm/Documentation/kvm-stat.txt         |   19 +
2252  tools/kvm/Documentation/kvm-stop.txt         |   16 +
2253  tools/kvm/Documentation/kvm-version.txt      |   21 +
2254  tools/kvm/Documentation/virtio-console.txt   |   41 +
2255  tools/kvm/Makefile                           |  427 +++++++
2256  tools/kvm/README                             |  109 ++
2257  tools/kvm/builtin-balloon.c                  |   80 ++
2258  tools/kvm/builtin-debug.c                    |  103 ++
2259  tools/kvm/builtin-help.c                     |   63 +
2260  tools/kvm/builtin-list.c                     |  149 +++
2261  tools/kvm/builtin-pause.c                    |   88 ++
2262  tools/kvm/builtin-resume.c                   |   88 ++
2263  tools/kvm/builtin-run.c                      | 1378 +++++++++++++++++++++
2264  tools/kvm/builtin-sandbox.c                  |    9 +
2265  tools/kvm/builtin-setup.c                    |  232 ++++
2266  tools/kvm/builtin-stat.c                     |  127 ++
2267  tools/kvm/builtin-stop.c                     |   70 ++
2268  tools/kvm/builtin-version.c                  |   15 +
2269  tools/kvm/code16gcc.h                        |   15 +
2270  tools/kvm/command-list.txt                   |   15 +
2271  tools/kvm/config/feature-tests.mak           |  168 +++
2272  tools/kvm/config/utilities.mak               |  188 +++
2273  tools/kvm/disk/blk.c                         |   42 +
2274  tools/kvm/disk/core.c                        |  260 ++++
2275  tools/kvm/disk/qcow.c                        | 1529 +++++++++++++++++++++++
2276  tools/kvm/disk/raw.c                         |  141 +++
2277  tools/kvm/framebuffer.c                      |   75 ++
2278  tools/kvm/guest/init.c                       |   38 +
2279  tools/kvm/guest/init_stage2.c                |   55 +
2280  tools/kvm/guest/passwd                       |    1 +
2281  tools/kvm/guest_compat.c                     |   99 ++
2282  tools/kvm/hw/i8042.c                         |  348 ++++++
2283  tools/kvm/hw/pci-shmem.c                     |  268 +++++
2284  tools/kvm/hw/rtc.c                           |  137 +++
2285  tools/kvm/hw/serial.c                        |  447 +++++++
2286  tools/kvm/hw/vesa.c                          |   85 ++
2287  tools/kvm/include/asm/hweight.h              |    8 +
2288  tools/kvm/include/bios/memcpy.h              |    9 +
2289  tools/kvm/include/kvm/8250-serial.h          |   11 +
2290  tools/kvm/include/kvm/apic.h                 |   17 +
2291  tools/kvm/include/kvm/brlock.h               |   41 +
2292  tools/kvm/include/kvm/builtin-balloon.h      |    9 +
2293  tools/kvm/include/kvm/builtin-debug.h        |   18 +
2294  tools/kvm/include/kvm/builtin-help.h         |    6 +
2295  tools/kvm/include/kvm/builtin-list.h         |   10 +
2296  tools/kvm/include/kvm/builtin-pause.h        |    9 +
2297  tools/kvm/include/kvm/builtin-resume.h       |    9 +
2298  tools/kvm/include/kvm/builtin-run.h          |   11 +
2299  tools/kvm/include/kvm/builtin-sandbox.h      |    6 +
2300  tools/kvm/include/kvm/builtin-setup.h        |   11 +
2301  tools/kvm/include/kvm/builtin-stat.h         |    9 +
2302  tools/kvm/include/kvm/builtin-stop.h         |    9 +
2303  tools/kvm/include/kvm/builtin-version.h      |    6 +
2304  tools/kvm/include/kvm/compiler.h             |   10 +
2305  tools/kvm/include/kvm/disk-image.h           |   81 ++
2306  tools/kvm/include/kvm/e820.h                 |   13 +
2307  tools/kvm/include/kvm/framebuffer.h          |   35 +
2308  tools/kvm/include/kvm/guest_compat.h         |    9 +
2309  tools/kvm/include/kvm/i8042.h                |   12 +
2310  tools/kvm/include/kvm/ioeventfd.h            |   27 +
2311  tools/kvm/include/kvm/ioport.h               |   69 ++
2312  tools/kvm/include/kvm/irq.h                  |   33 +
2313  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
2314  tools/kvm/include/kvm/kvm-cpu.h              |   24 +
2315  tools/kvm/include/kvm/kvm-ipc.h              |   24 +
2316  tools/kvm/include/kvm/kvm.h                  |   93 ++
2317  tools/kvm/include/kvm/msi.h                  |   10 +
2318  tools/kvm/include/kvm/mutex.h                |   33 +
2319  tools/kvm/include/kvm/parse-options.h        |  214 ++++
2320  tools/kvm/include/kvm/pci-shmem.h            |   28 +
2321  tools/kvm/include/kvm/pci.h                  |   95 ++
2322  tools/kvm/include/kvm/qcow.h                 |  133 +++
2323  tools/kvm/include/kvm/rbtree-interval.h      |   28 +
2324  tools/kvm/include/kvm/read-write.h           |   43 +
2325  tools/kvm/include/kvm/rtc.h                  |    9 +
2326  tools/kvm/include/kvm/rwsem.h                |   39 +
2327  tools/kvm/include/kvm/sdl.h                  |   22 +
2328  tools/kvm/include/kvm/segment.h              |   21 +
2329  tools/kvm/include/kvm/strbuf.h               |   19 +
2330  tools/kvm/include/kvm/symbol.h               |   30 +
2331  tools/kvm/include/kvm/term.h                 |   20 +
2332  tools/kvm/include/kvm/threadpool.h           |   37 +
2333  tools/kvm/include/kvm/types.h                |    7 +
2334  tools/kvm/include/kvm/uip.h                  |  358 ++++++
2335  tools/kvm/include/kvm/util.h                 |   95 ++
2336  tools/kvm/include/kvm/vesa.h                 |   18 +
2337  tools/kvm/include/kvm/virtio-9p.h            |   74 ++
2338  tools/kvm/include/kvm/virtio-balloon.h       |    8 +
2339  tools/kvm/include/kvm/virtio-blk.h           |   12 +
2340  tools/kvm/include/kvm/virtio-console.h       |    9 +
2341  tools/kvm/include/kvm/virtio-net.h           |   23 +
2342  tools/kvm/include/kvm/virtio-pci-dev.h       |   37 +
2343  tools/kvm/include/kvm/virtio-pci.h           |   49 +
2344  tools/kvm/include/kvm/virtio-rng.h           |    9 +
2345  tools/kvm/include/kvm/virtio-trans.h         |   44 +
2346  tools/kvm/include/kvm/virtio.h               |   67 ++
2347  tools/kvm/include/kvm/vnc.h                  |   20 +
2348  tools/kvm/include/linux/bitops.h             |   33 +
2349  tools/kvm/include/linux/byteorder.h          |    7 +
2350  tools/kvm/include/linux/compiler.h           |   19 +
2351  tools/kvm/include/linux/kernel.h             |   39 +
2352  tools/kvm/include/linux/module.h             |    6 +
2353  tools/kvm/include/linux/prefetch.h           |    6 +
2354  tools/kvm/include/linux/types.h              |   51 +
2355  tools/kvm/ioeventfd.c                        |  209 ++++
2356  tools/kvm/ioport.c                           |  195 +++
2357  tools/kvm/kvm-cmd.c                          |   91 ++
2358  tools/kvm/kvm-cpu.c                          |  175 +++
2359  tools/kvm/kvm-ipc.c                          |  231 ++++
2360  tools/kvm/kvm.c                              |  587 +++++++++
2361  tools/kvm/main.c                             |   19 +
2362  tools/kvm/mmio.c                             |  137 +++
2363  tools/kvm/net/uip/arp.c                      |   30 +
2364  tools/kvm/net/uip/buf.c                      |  114 ++
2365  tools/kvm/net/uip/core.c                     |  190 +++
2366  tools/kvm/net/uip/csum.c                     |   92 ++
2367  tools/kvm/net/uip/dhcp.c                     |  203 ++++
2368  tools/kvm/net/uip/icmp.c                     |   29 +
2369  tools/kvm/net/uip/ipv4.c                     |   29 +
2370  tools/kvm/net/uip/tcp.c                      |  317 +++++
2371  tools/kvm/net/uip/udp.c                      |  236 ++++
2372  tools/kvm/pci.c                              |  213 ++++
2373  tools/kvm/powerpc/boot.c                     |    8 +
2374  tools/kvm/powerpc/cpu_info.c                 |   83 ++
2375  tools/kvm/powerpc/cpu_info.h                 |   43 +
2376  tools/kvm/powerpc/include/kvm/barrier.h      |    6 +
2377  tools/kvm/powerpc/include/kvm/kvm-arch.h     |   88 ++
2378  tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h |   76 ++
2379  tools/kvm/powerpc/ioport.c                   |   18 +
2380  tools/kvm/powerpc/irq.c                      |   75 ++
2381  tools/kvm/powerpc/kvm-cpu.c                  |  291 +++++
2382  tools/kvm/powerpc/kvm.c                      |  460 +++++++
2383  tools/kvm/powerpc/spapr.h                    |   93 ++
2384  tools/kvm/powerpc/spapr_hcall.c              |  134 +++
2385  tools/kvm/powerpc/spapr_hvcons.c             |  102 ++
2386  tools/kvm/powerpc/spapr_hvcons.h             |   19 +
2387  tools/kvm/powerpc/spapr_pci.c                |  423 +++++++
2388  tools/kvm/powerpc/spapr_pci.h                |   57 +
2389  tools/kvm/powerpc/spapr_rtas.c               |  229 ++++
2390  tools/kvm/powerpc/xics.c                     |  514 ++++++++
2391  tools/kvm/powerpc/xics.h                     |   23 +
2392  tools/kvm/symbol.c                           |  131 ++
2393  tools/kvm/term.c                             |  166 +++
2394  tools/kvm/tests/Makefile                     |   19 +
2395  tools/kvm/tests/boot/Makefile                |   13 +
2396  tools/kvm/tests/boot/init.c                  |   11 +
2397  tools/kvm/tests/kernel/.gitignore            |    2 +
2398  tools/kvm/tests/kernel/Makefile              |   20 +
2399  tools/kvm/tests/kernel/README                |   16 +
2400  tools/kvm/tests/kernel/kernel.S              |    8 +
2401  tools/kvm/tests/pit/.gitignore               |    2 +
2402  tools/kvm/tests/pit/Makefile                 |   20 +
2403  tools/kvm/tests/pit/README                   |   16 +
2404  tools/kvm/tests/pit/tick.S                   |  109 ++
2405  tools/kvm/ui/sdl.c                           |  303 +++++
2406  tools/kvm/ui/vnc.c                           |  230 ++++
2407  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
2408  tools/kvm/util/generate-cmdlist.sh           |   23 +
2409  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
2410  tools/kvm/util/parse-options.c               |  577 +++++++++
2411  tools/kvm/util/rbtree-interval.c             |   89 ++
2412  tools/kvm/util/read-write.c                  |  344 ++++++
2413  tools/kvm/util/set_private_br.sh             |   51 +
2414  tools/kvm/util/strbuf.c                      |   39 +
2415  tools/kvm/util/threadpool.c                  |  145 +++
2416  tools/kvm/util/util.c                        |  115 ++
2417  tools/kvm/virtio/9p-pdu.c                    |  287 +++++
2418  tools/kvm/virtio/9p.c                        | 1326 ++++++++++++++++++++
2419  tools/kvm/virtio/balloon.c                   |  275 +++++
2420  tools/kvm/virtio/blk.c                       |  290 +++++
2421  tools/kvm/virtio/console.c                   |  203 ++++
2422  tools/kvm/virtio/core.c                      |  158 +++
2423  tools/kvm/virtio/net.c                       |  547 +++++++++
2424  tools/kvm/virtio/pci.c                       |  380 ++++++
2425  tools/kvm/virtio/rng.c                       |  203 ++++
2426  tools/kvm/virtio/trans.c                     |   24 +
2427  tools/kvm/x86/bios.c                         |  174 +++
2428  tools/kvm/x86/bios/.gitignore                |    3 +
2429  tools/kvm/x86/bios/bios-rom.S                |   12 +
2430  tools/kvm/x86/bios/e820.c                    |   72 ++
2431  tools/kvm/x86/bios/entry.S                   |   92 ++
2432  tools/kvm/x86/bios/gen-offsets.sh            |   14 +
2433  tools/kvm/x86/bios/int10.c                   |  110 ++
2434  tools/kvm/x86/bios/int15.c                   |   18 +
2435  tools/kvm/x86/bios/local.S                   |    7 +
2436  tools/kvm/x86/bios/macro.S                   |   25 +
2437  tools/kvm/x86/bios/memcpy.c                  |   23 +
2438  tools/kvm/x86/bios/rom.ld.S                  |   16 +
2439  tools/kvm/x86/boot.c                         |   41 +
2440  tools/kvm/x86/cpuid.c                        |   55 +
2441  tools/kvm/x86/include/kvm/assembly.h         |   24 +
2442  tools/kvm/x86/include/kvm/barrier.h          |   16 +
2443  tools/kvm/x86/include/kvm/bios-export.h      |   13 +
2444  tools/kvm/x86/include/kvm/bios.h             |   93 ++
2445  tools/kvm/x86/include/kvm/boot-protocol.h    |   16 +
2446  tools/kvm/x86/include/kvm/cpufeature.h       |   41 +
2447  tools/kvm/x86/include/kvm/interrupt.h        |   26 +
2448  tools/kvm/x86/include/kvm/kvm-arch.h         |   65 +
2449  tools/kvm/x86/include/kvm/kvm-cpu-arch.h     |   49 +
2450  tools/kvm/x86/include/kvm/mptable.h          |    9 +
2451  tools/kvm/x86/interrupt.c                    |   28 +
2452  tools/kvm/x86/ioport.c                       |   77 ++
2453  tools/kvm/x86/irq.c                          |  229 ++++
2454  tools/kvm/x86/kvm-cpu.c                      |  425 +++++++
2455  tools/kvm/x86/kvm.c                          |  385 ++++++
2456  tools/kvm/x86/mptable.c                      |  287 +++++
2457  tools/perf/builtin-sched.c                   |    1 +
2458  256 files changed, 27508 insertions(+), 229 deletions(-)
2459  create mode 100644 arch/x86/include/asm/uprobes.h
2460  create mode 100644 arch/x86/kernel/uprobes.c
2461  create mode 100644 include/linux/uprobes.h
2462  create mode 100644 kernel/events/uprobes.c
2463  create mode 100644 tools/kvm/.gitignore
2464  create mode 100644 tools/kvm/CREDITS-Git
2465  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
2466  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
2467  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
2468  create mode 100644 tools/kvm/Documentation/kvm-list.txt
2469  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
2470  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
2471  create mode 100644 tools/kvm/Documentation/kvm-run.txt
2472  create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
2473  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
2474  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
2475  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
2476  create mode 100644 tools/kvm/Documentation/kvm-version.txt
2477  create mode 100644 tools/kvm/Documentation/virtio-console.txt
2478  create mode 100644 tools/kvm/Makefile
2479  create mode 100644 tools/kvm/README
2480  create mode 100644 tools/kvm/builtin-balloon.c
2481  create mode 100644 tools/kvm/builtin-debug.c
2482  create mode 100644 tools/kvm/builtin-help.c
2483  create mode 100644 tools/kvm/builtin-list.c
2484  create mode 100644 tools/kvm/builtin-pause.c
2485  create mode 100644 tools/kvm/builtin-resume.c
2486  create mode 100644 tools/kvm/builtin-run.c
2487  create mode 100644 tools/kvm/builtin-sandbox.c
2488  create mode 100644 tools/kvm/builtin-setup.c
2489  create mode 100644 tools/kvm/builtin-stat.c
2490  create mode 100644 tools/kvm/builtin-stop.c
2491  create mode 100644 tools/kvm/builtin-version.c
2492  create mode 100644 tools/kvm/code16gcc.h
2493  create mode 100644 tools/kvm/command-list.txt
2494  create mode 100644 tools/kvm/config/feature-tests.mak
2495  create mode 100644 tools/kvm/config/utilities.mak
2496  create mode 100644 tools/kvm/disk/blk.c
2497  create mode 100644 tools/kvm/disk/core.c
2498  create mode 100644 tools/kvm/disk/qcow.c
2499  create mode 100644 tools/kvm/disk/raw.c
2500  create mode 100644 tools/kvm/framebuffer.c
2501  create mode 100644 tools/kvm/guest/init.c
2502  create mode 100644 tools/kvm/guest/init_stage2.c
2503  create mode 100644 tools/kvm/guest/passwd
2504  create mode 100644 tools/kvm/guest_compat.c
2505  create mode 100644 tools/kvm/hw/i8042.c
2506  create mode 100644 tools/kvm/hw/pci-shmem.c
2507  create mode 100644 tools/kvm/hw/rtc.c
2508  create mode 100644 tools/kvm/hw/serial.c
2509  create mode 100644 tools/kvm/hw/vesa.c
2510  create mode 100644 tools/kvm/include/asm/hweight.h
2511  create mode 100644 tools/kvm/include/bios/memcpy.h
2512  create mode 100644 tools/kvm/include/kvm/8250-serial.h
2513  create mode 100644 tools/kvm/include/kvm/apic.h
2514  create mode 100644 tools/kvm/include/kvm/brlock.h
2515  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
2516  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
2517  create mode 100644 tools/kvm/include/kvm/builtin-help.h
2518  create mode 100644 tools/kvm/include/kvm/builtin-list.h
2519  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
2520  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
2521  create mode 100644 tools/kvm/include/kvm/builtin-run.h
2522  create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
2523  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
2524  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
2525  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
2526  create mode 100644 tools/kvm/include/kvm/builtin-version.h
2527  create mode 100644 tools/kvm/include/kvm/compiler.h
2528  create mode 100644 tools/kvm/include/kvm/disk-image.h
2529  create mode 100644 tools/kvm/include/kvm/e820.h
2530  create mode 100644 tools/kvm/include/kvm/framebuffer.h
2531  create mode 100644 tools/kvm/include/kvm/guest_compat.h
2532  create mode 100644 tools/kvm/include/kvm/i8042.h
2533  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
2534  create mode 100644 tools/kvm/include/kvm/ioport.h
2535  create mode 100644 tools/kvm/include/kvm/irq.h
2536  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
2537  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
2538  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
2539  create mode 100644 tools/kvm/include/kvm/kvm.h
2540  create mode 100644 tools/kvm/include/kvm/msi.h
2541  create mode 100644 tools/kvm/include/kvm/mutex.h
2542  create mode 100644 tools/kvm/include/kvm/parse-options.h
2543  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
2544  create mode 100644 tools/kvm/include/kvm/pci.h
2545  create mode 100644 tools/kvm/include/kvm/qcow.h
2546  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
2547  create mode 100644 tools/kvm/include/kvm/read-write.h
2548  create mode 100644 tools/kvm/include/kvm/rtc.h
2549  create mode 100644 tools/kvm/include/kvm/rwsem.h
2550  create mode 100644 tools/kvm/include/kvm/sdl.h
2551  create mode 100644 tools/kvm/include/kvm/segment.h
2552  create mode 100644 tools/kvm/include/kvm/strbuf.h
2553  create mode 100644 tools/kvm/include/kvm/symbol.h
2554  create mode 100644 tools/kvm/include/kvm/term.h
2555  create mode 100644 tools/kvm/include/kvm/threadpool.h
2556  create mode 100644 tools/kvm/include/kvm/types.h
2557  create mode 100644 tools/kvm/include/kvm/uip.h
2558  create mode 100644 tools/kvm/include/kvm/util.h
2559  create mode 100644 tools/kvm/include/kvm/vesa.h
2560  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
2561  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
2562  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
2563  create mode 100644 tools/kvm/include/kvm/virtio-console.h
2564  create mode 100644 tools/kvm/include/kvm/virtio-net.h
2565  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
2566  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
2567  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
2568  create mode 100644 tools/kvm/include/kvm/virtio-trans.h
2569  create mode 100644 tools/kvm/include/kvm/virtio.h
2570  create mode 100644 tools/kvm/include/kvm/vnc.h
2571  create mode 100644 tools/kvm/include/linux/bitops.h
2572  create mode 100644 tools/kvm/include/linux/byteorder.h
2573  create mode 100644 tools/kvm/include/linux/compiler.h
2574  create mode 100644 tools/kvm/include/linux/kernel.h
2575  create mode 100644 tools/kvm/include/linux/module.h
2576  create mode 100644 tools/kvm/include/linux/prefetch.h
2577  create mode 100644 tools/kvm/include/linux/types.h
2578  create mode 100644 tools/kvm/ioeventfd.c
2579  create mode 100644 tools/kvm/ioport.c
2580  create mode 100644 tools/kvm/kvm-cmd.c
2581  create mode 100644 tools/kvm/kvm-cpu.c
2582  create mode 100644 tools/kvm/kvm-ipc.c
2583  create mode 100644 tools/kvm/kvm.c
2584  create mode 100644 tools/kvm/main.c
2585  create mode 100644 tools/kvm/mmio.c
2586  create mode 100644 tools/kvm/net/uip/arp.c
2587  create mode 100644 tools/kvm/net/uip/buf.c
2588  create mode 100644 tools/kvm/net/uip/core.c
2589  create mode 100644 tools/kvm/net/uip/csum.c
2590  create mode 100644 tools/kvm/net/uip/dhcp.c
2591  create mode 100644 tools/kvm/net/uip/icmp.c
2592  create mode 100644 tools/kvm/net/uip/ipv4.c
2593  create mode 100644 tools/kvm/net/uip/tcp.c
2594  create mode 100644 tools/kvm/net/uip/udp.c
2595  create mode 100644 tools/kvm/pci.c
2596  create mode 100644 tools/kvm/powerpc/boot.c
2597  create mode 100644 tools/kvm/powerpc/cpu_info.c
2598  create mode 100644 tools/kvm/powerpc/cpu_info.h
2599  create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
2600  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
2601  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
2602  create mode 100644 tools/kvm/powerpc/ioport.c
2603  create mode 100644 tools/kvm/powerpc/irq.c
2604  create mode 100644 tools/kvm/powerpc/kvm-cpu.c
2605  create mode 100644 tools/kvm/powerpc/kvm.c
2606  create mode 100644 tools/kvm/powerpc/spapr.h
2607  create mode 100644 tools/kvm/powerpc/spapr_hcall.c
2608  create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
2609  create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
2610  create mode 100644 tools/kvm/powerpc/spapr_pci.c
2611  create mode 100644 tools/kvm/powerpc/spapr_pci.h
2612  create mode 100644 tools/kvm/powerpc/spapr_rtas.c
2613  create mode 100644 tools/kvm/powerpc/xics.c
2614  create mode 100644 tools/kvm/powerpc/xics.h
2615  create mode 100644 tools/kvm/symbol.c
2616  create mode 100644 tools/kvm/term.c
2617  create mode 100644 tools/kvm/tests/Makefile
2618  create mode 100644 tools/kvm/tests/boot/Makefile
2619  create mode 100644 tools/kvm/tests/boot/init.c
2620  create mode 100644 tools/kvm/tests/kernel/.gitignore
2621  create mode 100644 tools/kvm/tests/kernel/Makefile
2622  create mode 100644 tools/kvm/tests/kernel/README
2623  create mode 100644 tools/kvm/tests/kernel/kernel.S
2624  create mode 100644 tools/kvm/tests/pit/.gitignore
2625  create mode 100644 tools/kvm/tests/pit/Makefile
2626  create mode 100644 tools/kvm/tests/pit/README
2627  create mode 100644 tools/kvm/tests/pit/tick.S
2628  create mode 100644 tools/kvm/ui/sdl.c
2629  create mode 100644 tools/kvm/ui/vnc.c
2630  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
2631  create mode 100755 tools/kvm/util/generate-cmdlist.sh
2632  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
2633  create mode 100644 tools/kvm/util/parse-options.c
2634  create mode 100644 tools/kvm/util/rbtree-interval.c
2635  create mode 100644 tools/kvm/util/read-write.c
2636  create mode 100755 tools/kvm/util/set_private_br.sh
2637  create mode 100644 tools/kvm/util/strbuf.c
2638  create mode 100644 tools/kvm/util/threadpool.c
2639  create mode 100644 tools/kvm/util/util.c
2640  create mode 100644 tools/kvm/virtio/9p-pdu.c
2641  create mode 100644 tools/kvm/virtio/9p.c
2642  create mode 100644 tools/kvm/virtio/balloon.c
2643  create mode 100644 tools/kvm/virtio/blk.c
2644  create mode 100644 tools/kvm/virtio/console.c
2645  create mode 100644 tools/kvm/virtio/core.c
2646  create mode 100644 tools/kvm/virtio/net.c
2647  create mode 100644 tools/kvm/virtio/pci.c
2648  create mode 100644 tools/kvm/virtio/rng.c
2649  create mode 100644 tools/kvm/virtio/trans.c
2650  create mode 100644 tools/kvm/x86/bios.c
2651  create mode 100644 tools/kvm/x86/bios/.gitignore
2652  create mode 100644 tools/kvm/x86/bios/bios-rom.S
2653  create mode 100644 tools/kvm/x86/bios/e820.c
2654  create mode 100644 tools/kvm/x86/bios/entry.S
2655  create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
2656  create mode 100644 tools/kvm/x86/bios/int10.c
2657  create mode 100644 tools/kvm/x86/bios/int15.c
2658  create mode 100644 tools/kvm/x86/bios/local.S
2659  create mode 100644 tools/kvm/x86/bios/macro.S
2660  create mode 100644 tools/kvm/x86/bios/memcpy.c
2661  create mode 100644 tools/kvm/x86/bios/rom.ld.S
2662  create mode 100644 tools/kvm/x86/boot.c
2663  create mode 100644 tools/kvm/x86/cpuid.c
2664  create mode 100644 tools/kvm/x86/include/kvm/assembly.h
2665  create mode 100644 tools/kvm/x86/include/kvm/barrier.h
2666  create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
2667  create mode 100644 tools/kvm/x86/include/kvm/bios.h
2668  create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
2669  create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
2670  create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
2671  create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
2672  create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
2673  create mode 100644 tools/kvm/x86/include/kvm/mptable.h
2674  create mode 100644 tools/kvm/x86/interrupt.c
2675  create mode 100644 tools/kvm/x86/ioport.c
2676  create mode 100644 tools/kvm/x86/irq.c
2677  create mode 100644 tools/kvm/x86/kvm-cpu.c
2678  create mode 100644 tools/kvm/x86/kvm.c
2679  create mode 100644 tools/kvm/x86/mptable.c
2680 Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
2681 $ git merge rcu/rcu/next
2682 Already up-to-date.
2683 Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
2684 $ git merge cputime/cputime
2685 Already up-to-date.
2686 Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
2687 $ git merge uprobes/for-next
2688 Already up-to-date.
2689 Merging kmemleak/kmemleak (d65b4e9 Linux 3.3-rc3)
2690 $ git merge kmemleak/kmemleak
2691 Already up-to-date.
2692 Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
2693 $ git merge kvm/linux-next
2694 Already up-to-date.
2695 Merging oprofile/for-next (c16fa4f Linux 3.3)
2696 $ git merge oprofile/for-next
2697 Already up-to-date.
2698 Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
2699 $ git merge xen/upstream/xen
2700 Resolved 'arch/x86/include/asm/cmpxchg.h' using previous resolution.
2701 Auto-merging arch/x86/include/asm/cmpxchg.h
2702 CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
2703 Automatic merge failed; fix conflicts and then commit the result.
2704 $ git commit -v -a
2705 [master 756d812] Merge remote-tracking branch 'xen/upstream/xen'
2706 $ git diff -M --stat --summary HEAD^..
2707 Merging xen-two/linux-next (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next)
2708 $ git merge xen-two/linux-next
2709 Resolved 'arch/x86/include/asm/io_apic.h' using previous resolution.
2710 Resolved 'arch/x86/kernel/apic/io_apic.c' using previous resolution.
2711 Auto-merging arch/x86/kernel/apic/io_apic.c
2712 CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
2713 Auto-merging arch/x86/include/asm/io_apic.h
2714 CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
2715 Automatic merge failed; fix conflicts and then commit the result.
2716 $ git commit -v -a
2717 [master 8822098] Merge remote-tracking branch 'xen-two/linux-next'
2718 $ git diff -M --stat --summary HEAD^..
2719  drivers/xen/cpu_hotplug.c |   15 ++++++++-------
2720  1 file changed, 8 insertions(+), 7 deletions(-)
2721 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
2722 $ git merge xen-pvhvm/linux-next
2723 Already up-to-date.
2724 Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
2725 $ git merge percpu/for-next
2726 Already up-to-date.
2727 Merging workqueues/for-next (e06ffa1 workqueue: use percpu allocator for cwq on UP)
2728 $ git merge workqueues/for-next
2729 Already up-to-date.
2730 Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
2731 $ git merge drivers-x86/linux-next
2732 Already up-to-date.
2733 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
2734 $ git merge hwpoison/hwpoison
2735 Already up-to-date.
2736 Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
2737 $ git merge sysctl/master
2738 Already up-to-date.
2739 Merging regmap/for-next (36e88a5 Merge branch 'regmap-stride' into regmap-next)
2740 $ git merge regmap/for-next
2741 Merge made by the 'recursive' strategy.
2742  drivers/base/regmap/Kconfig           |    3 +
2743  drivers/base/regmap/Makefile          |    1 +
2744  drivers/base/regmap/internal.h        |   22 +++-
2745  drivers/base/regmap/regcache-lzo.c    |   11 +-
2746  drivers/base/regmap/regcache-rbtree.c |   44 ++++---
2747  drivers/base/regmap/regcache.c        |   34 +++--
2748  drivers/base/regmap/regmap-debugfs.c  |   18 ++-
2749  drivers/base/regmap/regmap-i2c.c      |   13 +-
2750  drivers/base/regmap/regmap-irq.c      |   34 +++--
2751  drivers/base/regmap/regmap-mmio.c     |  224 +++++++++++++++++++++++++++++++++
2752  drivers/base/regmap/regmap-spi.c      |   13 +-
2753  drivers/base/regmap/regmap.c          |  169 +++++++++++++++++++------
2754  include/linux/regmap.h                |   28 ++++-
2755  13 files changed, 503 insertions(+), 111 deletions(-)
2756  create mode 100644 drivers/base/regmap/regmap-mmio.c
2757 $ git reset --hard HEAD^
2758 HEAD is now at 8822098 Merge remote-tracking branch 'xen-two/linux-next'
2759 Merging refs/next/20120410/regmap
2760 $ git merge refs/next/20120410/regmap
2761 Auto-merging drivers/base/regmap/regcache-rbtree.c
2762 Merge made by the 'recursive' strategy.
2763  drivers/base/regmap/Kconfig           |    3 +
2764  drivers/base/regmap/Makefile          |    1 +
2765  drivers/base/regmap/internal.h        |   11 +-
2766  drivers/base/regmap/regcache-rbtree.c |    4 +-
2767  drivers/base/regmap/regcache.c        |   20 ++--
2768  drivers/base/regmap/regmap-i2c.c      |   13 +-
2769  drivers/base/regmap/regmap-mmio.c     |  211 +++++++++++++++++++++++++++++++++
2770  drivers/base/regmap/regmap-spi.c      |   13 +-
2771  drivers/base/regmap/regmap.c          |   87 ++++++++++----
2772  include/linux/regmap.h                |   19 ++-
2773  10 files changed, 332 insertions(+), 50 deletions(-)
2774  create mode 100644 drivers/base/regmap/regmap-mmio.c
2775 Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
2776 $ git merge hsi/for-next
2777 Already up-to-date.
2778 Merging driver-core/driver-core-next (ecf1948 w1: fix slave driver registration error message)
2779 $ git merge driver-core/driver-core-next
2780 Merge made by the 'recursive' strategy.
2781  drivers/hv/hv.c           |    2 +-
2782  drivers/hv/hyperv_vmbus.h |    2 +-
2783  2 files changed, 2 insertions(+), 2 deletions(-)
2784 Merging tty/tty-next (59d59b0 ISDN: remove uses of isdn_tty_revision)
2785 $ git merge tty/tty-next
2786 Auto-merging drivers/usb/gadget/u_serial.c
2787 Auto-merging drivers/tty/vt/vt.c
2788 Auto-merging drivers/tty/serial/pch_uart.c
2789 Removing drivers/tty/serial/68328serial.h
2790 Merge made by the 'recursive' strategy.
2791  drivers/isdn/i4l/isdn_common.c   |    5 -
2792  drivers/isdn/i4l/isdn_tty.c      |  466 +++++++++++++++-----------------------
2793  drivers/net/usb/hso.c            |  105 ++++-----
2794  drivers/s390/char/con3215.c      |   74 +++---
2795  drivers/s390/char/keyboard.c     |   30 +--
2796  drivers/s390/char/keyboard.h     |   14 +-
2797  drivers/s390/char/sclp_tty.c     |   33 +--
2798  drivers/s390/char/sclp_vt220.c   |   33 ++-
2799  drivers/s390/char/tty3270.c      |  121 +++++-----
2800  drivers/tty/bfin_jtag_comm.c     |   44 ++--
2801  drivers/tty/hvc/hvc_console.c    |   93 ++++----
2802  drivers/tty/hvc/hvc_console.h    |    4 +-
2803  drivers/tty/hvc/hvcs.c           |   74 +++---
2804  drivers/tty/hvc/hvsi.c           |  128 +++++------
2805  drivers/tty/hvc/hvsi_lib.c       |    2 +-
2806  drivers/tty/ipwireless/tty.c     |   81 +++----
2807  drivers/tty/serial/68328serial.c |  383 +++++++++++++------------------
2808  drivers/tty/serial/68328serial.h |  186 ---------------
2809  drivers/tty/serial/crisv10.c     |   28 +--
2810  drivers/tty/serial/pch_uart.c    |   53 +++--
2811  drivers/tty/tty_buffer.c         |   85 +++++--
2812  drivers/tty/vt/vt.c              |   68 +++---
2813  drivers/usb/gadget/u_serial.c    |   51 ++---
2814  include/linux/generic_serial.h   |   64 +-----
2815  include/linux/isdn.h             |   26 +--
2816  net/bluetooth/rfcomm/tty.c       |  133 +++++------
2817  26 files changed, 946 insertions(+), 1438 deletions(-)
2818  delete mode 100644 drivers/tty/serial/68328serial.h
2819 Merging usb/usb-next (af58105 USB: io_ti: fix abuse of interface data)
2820 $ git merge usb/usb-next
2821 Auto-merging drivers/usb/serial/metro-usb.c
2822 Merge made by the 'recursive' strategy.
2823  drivers/usb/serial/io_ti.c     |   17 +-
2824  drivers/usb/serial/metro-usb.c |   83 +++++-
2825  drivers/usb/serial/whiteheat.c |  544 +---------------------------------------
2826  3 files changed, 94 insertions(+), 550 deletions(-)
2827 Merging staging/staging-next (b330f60 staging: replace open-coded ARRAY_SIZEs)
2828 $ git merge staging/staging-next
2829 Auto-merging drivers/staging/xgifb/vb_table.h
2830 Auto-merging drivers/staging/xgifb/vb_setmode.c
2831 Auto-merging drivers/staging/xgifb/vb_init.c
2832 Removing drivers/staging/serial/TODO
2833 Removing drivers/staging/serial/Makefile
2834 Removing drivers/staging/serial/Kconfig
2835 Removing drivers/staging/serial/68360serial.c
2836 Auto-merging drivers/staging/rts_pstor/rtsx_transport.c
2837 Auto-merging drivers/staging/rts_pstor/ms.c
2838 Auto-merging drivers/staging/omapdrm/omap_drv.c
2839 Merge made by the 'recursive' strategy.
2840  drivers/staging/Kconfig                            |    2 -
2841  drivers/staging/Makefile                           |    1 -
2842  drivers/staging/android/persistent_ram.c           |    4 +-
2843  drivers/staging/bcm/DDRInit.c                      |   26 +-
2844  drivers/staging/bcm/IPv6Protocol.c                 |  409 +--
2845  drivers/staging/bcm/Misc.c                         |    2 +-
2846  drivers/staging/comedi/Kconfig                     |  112 +-
2847  drivers/staging/comedi/comedi_fops.c               |   43 +-
2848  drivers/staging/comedi/comedidev.h                 |   15 +-
2849  drivers/staging/comedi/drivers.c                   |  253 +-
2850  .../staging/comedi/drivers/addi-data/addi_common.c |    2 +-
2851  drivers/staging/comedi/drivers/adl_pci6208.c       |    2 +-
2852  drivers/staging/comedi/drivers/adl_pci7230.c       |    2 +-
2853  drivers/staging/comedi/drivers/adl_pci7296.c       |    2 +-
2854  drivers/staging/comedi/drivers/adl_pci7432.c       |    2 +-
2855  drivers/staging/comedi/drivers/adl_pci8164.c       |    2 +-
2856  drivers/staging/comedi/drivers/adl_pci9111.c       |    2 +-
2857  drivers/staging/comedi/drivers/adl_pci9118.c       |    2 +-
2858  drivers/staging/comedi/drivers/adv_pci1710.c       |    2 +-
2859  drivers/staging/comedi/drivers/adv_pci1723.c       |    2 +-
2860  drivers/staging/comedi/drivers/adv_pci_dio.c       |    2 +-
2861  drivers/staging/comedi/drivers/amplc_dio200.c      |   79 +-
2862  drivers/staging/comedi/drivers/amplc_pc236.c       |   65 +-
2863  drivers/staging/comedi/drivers/amplc_pc263.c       |   67 +-
2864  drivers/staging/comedi/drivers/amplc_pci224.c      |  147 +-
2865  drivers/staging/comedi/drivers/amplc_pci230.c      |    2 +-
2866  drivers/staging/comedi/drivers/cb_pcidas.c         |    2 +-
2867  drivers/staging/comedi/drivers/cb_pcidas64.c       |    2 +-
2868  drivers/staging/comedi/drivers/cb_pcidda.c         |    2 +-
2869  drivers/staging/comedi/drivers/cb_pcidio.c         |    2 +-
2870  drivers/staging/comedi/drivers/cb_pcimdas.c        |    2 +-
2871  drivers/staging/comedi/drivers/cb_pcimdda.c        |    2 +-
2872  drivers/staging/comedi/drivers/contec_pci_dio.c    |    2 +-
2873  drivers/staging/comedi/drivers/daqboard2000.c      |    2 +-
2874  drivers/staging/comedi/drivers/das08.c             |  123 +-
2875  drivers/staging/comedi/drivers/dt3000.c            |    2 +-
2876  drivers/staging/comedi/drivers/dt9812.c            |    2 +-
2877  drivers/staging/comedi/drivers/dyna_pci10xx.c      |    2 +-
2878  drivers/staging/comedi/drivers/gsc_hpdi.c          |    2 +-
2879  drivers/staging/comedi/drivers/jr3_pci.c           |    2 +-
2880  drivers/staging/comedi/drivers/ke_counter.c        |    2 +-
2881  drivers/staging/comedi/drivers/me4000.c            |    2 +-
2882  drivers/staging/comedi/drivers/me_daq.c            |    2 +-
2883  drivers/staging/comedi/drivers/ni_6527.c           |    2 +-
2884  drivers/staging/comedi/drivers/ni_65xx.c           |    2 +-
2885  drivers/staging/comedi/drivers/ni_660x.c           |    2 +-
2886  drivers/staging/comedi/drivers/ni_670x.c           |    2 +-
2887  drivers/staging/comedi/drivers/ni_labpc.c          |    2 +-
2888  drivers/staging/comedi/drivers/ni_pcidio.c         |    2 +-
2889  drivers/staging/comedi/drivers/ni_pcimio.c         |    2 +-
2890  drivers/staging/comedi/drivers/rtd520.c            |   10 +-
2891  drivers/staging/comedi/drivers/s626.c              |    2 +-
2892  drivers/staging/comedi/drivers/skel.c              |    2 +-
2893  drivers/staging/comedi/drivers/usbdux.c            |  124 +-
2894  drivers/staging/comedi/drivers/usbduxfast.c        |   10 +-
2895  drivers/staging/comedi/drivers/usbduxsigma.c       |   12 +-
2896  drivers/staging/comedi/drivers/vmk80xx.c           |    6 +-
2897  drivers/staging/comedi/internal.h                  |    1 +
2898  drivers/staging/iio/Documentation/generic_buffer.c |    4 +-
2899  drivers/staging/iio/accel/lis3l02dq_core.c         |    2 +-
2900  drivers/staging/iio/adc/max1363_core.c             |   10 +-
2901  drivers/staging/iio/iio.h                          |    2 +
2902  drivers/staging/iio/imu/adis16400_core.c           |    2 +-
2903  drivers/staging/iio/meter/ade7758_core.c           |    2 +-
2904  drivers/staging/media/as102/as102_usb_drv.c        |    5 +-
2905  drivers/staging/media/go7007/README                |    2 +-
2906  drivers/staging/mei/init.c                         |    2 +-
2907  drivers/staging/mei/interface.h                    |    3 +-
2908  drivers/staging/mei/main.c                         |   21 +-
2909  drivers/staging/mei/wd.c                           |   74 +-
2910  drivers/staging/nvec/nvec.h                        |    2 +-
2911  drivers/staging/octeon/ethernet-rx.c               |    2 +-
2912  drivers/staging/octeon/ethernet-tx.c               |   10 +-
2913  drivers/staging/octeon/ethernet-util.h             |    2 +-
2914  drivers/staging/octeon/ethernet.c                  |    2 +-
2915  drivers/staging/olpc_dcon/olpc_dcon_xo_1.c         |    2 +-
2916  drivers/staging/omapdrm/Makefile                   |    1 +
2917  drivers/staging/omapdrm/omap_dmm_tiler.c           |    4 +-
2918  drivers/staging/omapdrm/omap_drv.c                 |    4 +-
2919  drivers/staging/omapdrm/omap_drv.h                 |    7 +
2920  drivers/staging/omapdrm/omap_fb.c                  |    2 +-
2921  drivers/staging/omapdrm/omap_gem.c                 |   26 +-
2922  drivers/staging/omapdrm/omap_gem_dmabuf.c          |  150 +
2923  drivers/staging/omapdrm/tcm-sita.c                 |    2 +-
2924  drivers/staging/ozwpan/ozappif.h                   |   12 +-
2925  drivers/staging/ozwpan/ozcdev.c                    |   17 -
2926  drivers/staging/ozwpan/ozevent.c                   |  195 +-
2927  drivers/staging/ozwpan/ozevent.h                   |   11 +-
2928  drivers/staging/ozwpan/ozeventdef.h                |   19 +-
2929  drivers/staging/ozwpan/ozhcd.c                     |    2 +-
2930  drivers/staging/ozwpan/ozmain.c                    |    8 +-
2931  drivers/staging/panel/panel.c                      |    2 +-
2932  drivers/staging/quatech_usb2/quatech_usb2.c        |    2 +-
2933  drivers/staging/ramster/cluster/tcp.c              |    4 +-
2934  drivers/staging/ramster/xvmalloc.c                 |    2 +-
2935  drivers/staging/ramster/zcache-main.c              |    2 +-
2936  .../rtl8187se/ieee80211/ieee80211_softmac.c        |    2 +-
2937  drivers/staging/rtl8187se/r8185b_init.c            | 1325 ++++-----
2938  .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |    2 +-
2939  drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c     |    2 +-
2940  drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |    2 +-
2941  drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |    4 +-
2942  drivers/staging/rtl8192e/rtllib_wx.c               |    2 +-
2943  drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |    2 +-
2944  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    2 +-
2945  drivers/staging/rtl8192u/r8192U_wx.c               |    4 +-
2946  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    4 +-
2947  drivers/staging/rts5139/ms.c                       |    5 +-
2948  drivers/staging/rts_pstor/ms.c                     |    2 +-
2949  drivers/staging/rts_pstor/rtsx_transport.c         |    4 +-
2950  drivers/staging/serial/68360serial.c               | 2979 --------------------
2951  drivers/staging/serial/Kconfig                     |   16 -
2952  drivers/staging/serial/Makefile                    |    1 -
2953  drivers/staging/serial/TODO                        |    6 -
2954  drivers/staging/telephony/ixj.c                    |  228 +-
2955  drivers/staging/tidspbridge/core/io_sm.c           |    2 +-
2956  drivers/staging/tidspbridge/core/ue_deh.c          |    2 +-
2957  drivers/staging/usbip/stub_dev.c                   |   12 +-
2958  drivers/staging/usbip/usbip_common.h               |   17 +
2959  drivers/staging/usbip/usbip_protocol.txt           |    2 +-
2960  .../staging/usbip/userspace/libsrc/vhci_driver.c   |   20 +-
2961  drivers/staging/usbip/vhci_hcd.c                   |    8 +-
2962  drivers/staging/usbip/vhci_rx.c                    |    2 +-
2963  drivers/staging/usbip/vhci_sysfs.c                 |    4 +-
2964  drivers/staging/vme/bridges/vme_tsi148.c           |  181 +-
2965  drivers/staging/vme/bridges/vme_tsi148.h           |   21 +-
2966  drivers/staging/vme/devices/vme_pio2_gpio.c        |    2 +-
2967  drivers/staging/vme/devices/vme_user.c             |   43 +-
2968  drivers/staging/vt6655/wpa.c                       |    4 +-
2969  drivers/staging/vt6656/wpa.c                       |    4 +-
2970  drivers/staging/wlags49_h2/README.ubuntu           |    2 +-
2971  drivers/staging/wlags49_h2/wl_netdev.c             |    9 +-
2972  drivers/staging/wlags49_h2/wl_profile.c            |    8 +-
2973  drivers/staging/xgifb/XGI_main.h                   |  221 +-
2974  drivers/staging/xgifb/XGI_main_26.c                |  101 +-
2975  drivers/staging/xgifb/XGIfb.h                      |    6 +-
2976  drivers/staging/xgifb/vb_init.c                    |   78 +-
2977  drivers/staging/xgifb/vb_setmode.c                 | 1457 +++-------
2978  drivers/staging/xgifb/vb_struct.h                  |   27 -
2979  drivers/staging/xgifb/vb_table.h                   |  725 +----
2980  drivers/staging/xgifb/vgatypes.h                   |    2 -
2981  141 files changed, 2967 insertions(+), 6791 deletions(-)
2982  create mode 100644 drivers/staging/omapdrm/omap_gem_dmabuf.c
2983  delete mode 100644 drivers/staging/serial/68360serial.c
2984  delete mode 100644 drivers/staging/serial/Kconfig
2985  delete mode 100644 drivers/staging/serial/Makefile
2986  delete mode 100644 drivers/staging/serial/TODO
2987 Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2)
2988 $ git merge char-misc/char-misc-next
2989 Already up-to-date.
2990 Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
2991 $ git merge tmem/linux-next
2992 Auto-merging mm/swapfile.c
2993 Auto-merging include/linux/swap.h
2994 Merge made by the 'recursive' strategy.
2995  Documentation/vm/frontswap.txt |  210 +++++++++++++++++++++++++++++++
2996  include/linux/frontswap.h      |  126 +++++++++++++++++++
2997  include/linux/swap.h           |    4 +
2998  include/linux/swapfile.h       |   13 ++
2999  mm/Kconfig                     |   17 +++
3000  mm/Makefile                    |    1 +
3001  mm/frontswap.c                 |  273 ++++++++++++++++++++++++++++++++++++++++
3002  mm/page_io.c                   |   12 ++
3003  mm/swapfile.c                  |   54 ++++++--
3004  9 files changed, 697 insertions(+), 13 deletions(-)
3005  create mode 100644 Documentation/vm/frontswap.txt
3006  create mode 100644 include/linux/frontswap.h
3007  create mode 100644 include/linux/swapfile.h
3008  create mode 100644 mm/frontswap.c
3009 Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
3010 $ git merge writeback/writeback-for-next
3011 Already up-to-date.
3012 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
3013 $ git merge arm-dt/devicetree/arm-next
3014 Already up-to-date.
3015 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
3016 $ git merge hwspinlock/linux-next
3017 Already up-to-date.
3018 Merging pinctrl/for-next (a57be23 pinctrl: tegra: Add complete device tree support)
3019 $ git merge pinctrl/for-next
3020 Removing Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt
3021 Merge made by the 'recursive' strategy.
3022  .../bindings/pinctrl/nvidia,tegra20-pinmux.txt     |  132 +++++++++++
3023  .../bindings/pinctrl/nvidia,tegra30-pinmux.txt     |  132 +++++++++++
3024  .../bindings/pinctrl/pinctrl-bindings.txt          |  128 ++++++++++
3025  .../devicetree/bindings/pinmux/pinmux_nvidia.txt   |    5 -
3026  Documentation/pinctrl.txt                          |   46 ++--
3027  drivers/of/base.c                                  |   41 ++++
3028  drivers/pinctrl/Kconfig                            |    5 +
3029  drivers/pinctrl/Makefile                           |    1 +
3030  drivers/pinctrl/core.c                             |  112 +++++++--
3031  drivers/pinctrl/core.h                             |   11 +-
3032  drivers/pinctrl/devicetree.c                       |  249 ++++++++++++++++++++
3033  drivers/pinctrl/devicetree.h                       |   35 +++
3034  drivers/pinctrl/pinconf.c                          |    3 +-
3035  drivers/pinctrl/pinctrl-coh901.c                   |    4 +-
3036  drivers/pinctrl/pinctrl-pxa3xx.c                   |   24 +-
3037  drivers/pinctrl/pinctrl-sirf.c                     |   20 +-
3038  drivers/pinctrl/pinctrl-tegra.c                    |  245 ++++++++++++++++---
3039  drivers/pinctrl/pinctrl-u300.c                     |   20 +-
3040  drivers/pinctrl/pinmux.c                           |   11 +-
3041  include/linux/of.h                                 |   35 +++
3042  include/linux/pinctrl/machine.h                    |    2 +
3043  include/linux/pinctrl/pinctrl.h                    |   13 +-
3044  include/linux/pinctrl/pinmux.h                     |    7 +-
3045  23 files changed, 1134 insertions(+), 147 deletions(-)
3046  create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt
3047  create mode 100644 Documentation/devicetree/bindings/pinctrl/nvidia,tegra30-pinmux.txt
3048  create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
3049  delete mode 100644 Documentation/devicetree/bindings/pinmux/pinmux_nvidia.txt
3050  create mode 100644 drivers/pinctrl/devicetree.c
3051  create mode 100644 drivers/pinctrl/devicetree.h
3052 Merging tegra/for-next (2ac6b1e Merge branch 'for-3.5/debug' into for-next)
3053 $ git merge tegra/for-next
3054 Auto-merging drivers/usb/host/ehci-tegra.c
3055 Removing arch/arm/mach-tegra/pinmux.c
3056 Removing arch/arm/mach-tegra/pinmux-tegra30-tables.c
3057 Removing arch/arm/mach-tegra/pinmux-tegra20-tables.c
3058 Removing arch/arm/mach-tegra/include/mach/pinmux.h
3059 Removing arch/arm/mach-tegra/include/mach/pinmux-tegra30.h
3060 Removing arch/arm/mach-tegra/include/mach/pinmux-tegra20.h
3061 Auto-merging arch/arm/mach-tegra/devices.c
3062 Auto-merging arch/arm/mach-tegra/board-trimslice.c
3063 Auto-merging arch/arm/mach-tegra/board-seaboard.c
3064 Auto-merging arch/arm/mach-tegra/board-dt-tegra20.c
3065 Merge made by the 'recursive' strategy.
3066  arch/arm/boot/dts/tegra-cardhu.dts                |   44 +
3067  arch/arm/boot/dts/tegra-harmony.dts               |  224 +++++
3068  arch/arm/boot/dts/tegra-paz00.dts                 |  220 +++++
3069  arch/arm/boot/dts/tegra-seaboard.dts              |  243 +++++
3070  arch/arm/boot/dts/tegra-trimslice.dts             |  230 +++++
3071  arch/arm/boot/dts/tegra-ventana.dts               |  230 +++++
3072  arch/arm/mach-tegra/Kconfig                       |   29 +-
3073  arch/arm/mach-tegra/Makefile                      |    3 -
3074  arch/arm/mach-tegra/board-dt-tegra20.c            |   31 -
3075  arch/arm/mach-tegra/board-harmony-pinmux.c        |  266 +++---
3076  arch/arm/mach-tegra/board-paz00-pinmux.c          |  263 +++---
3077  arch/arm/mach-tegra/board-pinmux.c                |  105 +--
3078  arch/arm/mach-tegra/board-pinmux.h                |   38 +-
3079  arch/arm/mach-tegra/board-seaboard-pinmux.c       |  346 ++++----
3080  arch/arm/mach-tegra/board-seaboard.c              |   21 +-
3081  arch/arm/mach-tegra/board-trimslice-pinmux.c      |  264 +++---
3082  arch/arm/mach-tegra/board-trimslice.c             |   15 +-
3083  arch/arm/mach-tegra/devices.c                     |    3 +
3084  arch/arm/mach-tegra/include/mach/gpio-tegra.h     |    9 -
3085  arch/arm/mach-tegra/include/mach/pinmux-tegra20.h |  184 ----
3086  arch/arm/mach-tegra/include/mach/pinmux-tegra30.h |  320 -------
3087  arch/arm/mach-tegra/include/mach/pinmux.h         |  302 -------
3088  arch/arm/mach-tegra/include/mach/uncompress.h     |  176 ++--
3089  arch/arm/mach-tegra/pinmux-tegra20-tables.c       |  244 -----
3090  arch/arm/mach-tegra/pinmux-tegra30-tables.c       |  376 --------
3091  arch/arm/mach-tegra/pinmux.c                      |  987 ---------------------
3092  arch/arm/mach-tegra/usb_phy.c                     |    1 -
3093  drivers/gpio/gpio-tegra.c                         |   39 +-
3094  drivers/mmc/host/sdhci-tegra.c                    |   24 +-
3095  drivers/pinctrl/pinctrl-tegra.c                   |    6 +-
3096  drivers/usb/host/ehci-tegra.c                     |   13 +-
3097  include/linux/platform_data/tegra_usb.h           |    1 +
3098  32 files changed, 1996 insertions(+), 3261 deletions(-)
3099  delete mode 100644 arch/arm/mach-tegra/include/mach/pinmux-tegra20.h
3100  delete mode 100644 arch/arm/mach-tegra/include/mach/pinmux-tegra30.h
3101  delete mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h
3102  delete mode 100644 arch/arm/mach-tegra/pinmux-tegra20-tables.c
3103  delete mode 100644 arch/arm/mach-tegra/pinmux-tegra30-tables.c
3104  delete mode 100644 arch/arm/mach-tegra/pinmux.c
3105 Merging moduleh/for-sfr (ed93e94 ia64: populate the cmpxchg header with appropriate code)
3106 $ git merge moduleh/for-sfr
3107 Merge made by the 'recursive' strategy.
3108  arch/alpha/include/asm/atomic.h    |   68 +----------------
3109  arch/alpha/include/asm/cmpxchg.h   |   71 +++++++++++++++++
3110  arch/alpha/include/asm/xchg.h      |    4 +-
3111  arch/ia64/include/asm/cmpxchg.h    |  148 +++++++++++++++++++++++++++++++++++-
3112  arch/ia64/include/asm/intrinsics.h |  114 +--------------------------
3113  5 files changed, 222 insertions(+), 183 deletions(-)
3114  create mode 100644 arch/alpha/include/asm/cmpxchg.h
3115 Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions)
3116 $ git merge vhost/linux-next
3117 Merge made by the 'recursive' strategy.
3118 Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
3119 $ git merge kmap_atomic/kmap_atomic
3120 Already up-to-date.
3121 Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
3122 $ git merge modem-shm/for-next
3123 Auto-merging include/linux/Kbuild
3124 Auto-merging drivers/Makefile
3125 Auto-merging drivers/Kconfig
3126 Merge made by the 'recursive' strategy.
3127  drivers/Kconfig                             |    2 +
3128  drivers/Makefile                            |    1 +
3129  drivers/modem_shm/Kconfig                   |   62 ++
3130  drivers/modem_shm/Makefile                  |    5 +
3131  drivers/modem_shm/dummy_c2c_genio.c         |   76 ++
3132  drivers/modem_shm/shm_boot.c                | 1208 ++++++++++++++++++++++++++
3133  drivers/modem_shm/shm_bus.c                 |  113 +++
3134  drivers/modem_shm/shm_chr.c                 | 1242 +++++++++++++++++++++++++++
3135  drivers/modem_shm/shm_dev.c                 |  527 ++++++++++++
3136  drivers/modem_shm/shm_ipctoc.h              |  154 ++++
3137  drivers/net/caif/Kconfig                    |   12 +-
3138  drivers/net/caif/Makefile                   |    3 +-
3139  drivers/net/caif/caif_shm.c                 |  900 +++++++++++++++++++
3140  include/linux/Kbuild                        |    1 +
3141  include/linux/c2c_genio.h                   |  195 +++++
3142  include/linux/modem_shm/Kbuild              |    1 +
3143  include/linux/modem_shm/modem_shm_netlink.h |   95 ++
3144  include/linux/modem_shm/shm_dev.h           |  245 ++++++
3145  18 files changed, 4840 insertions(+), 2 deletions(-)
3146  create mode 100644 drivers/modem_shm/Kconfig
3147  create mode 100644 drivers/modem_shm/Makefile
3148  create mode 100644 drivers/modem_shm/dummy_c2c_genio.c
3149  create mode 100644 drivers/modem_shm/shm_boot.c
3150  create mode 100644 drivers/modem_shm/shm_bus.c
3151  create mode 100644 drivers/modem_shm/shm_chr.c
3152  create mode 100644 drivers/modem_shm/shm_dev.c
3153  create mode 100644 drivers/modem_shm/shm_ipctoc.h
3154  create mode 100644 drivers/net/caif/caif_shm.c
3155  create mode 100644 include/linux/c2c_genio.h
3156  create mode 100644 include/linux/modem_shm/Kbuild
3157  create mode 100644 include/linux/modem_shm/modem_shm_netlink.h
3158  create mode 100644 include/linux/modem_shm/shm_dev.h
3159 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
3160 $ git merge memblock/memblock-kill-early_node_map
3161 Already up-to-date.
3162 Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
3163 $ git merge remoteproc/for-next
3164 Already up-to-date.
3165 Merging irqdomain/irqdomain/next (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
3166 $ git merge irqdomain/irqdomain/next
3167 Resolved 'arch/arm/Kconfig' using previous resolution.
3168 Auto-merging include/linux/irq.h
3169 Auto-merging drivers/gpio/gpio-pl061.c
3170 Auto-merging arch/arm/common/Kconfig
3171 Auto-merging arch/arm/Kconfig
3172 CONFLICT (content): Merge conflict in arch/arm/Kconfig
3173 Automatic merge failed; fix conflicts and then commit the result.
3174 $ git commit -v -a
3175 [master b86bd81] Merge remote-tracking branch 'irqdomain/irqdomain/next'
3176 $ git diff -M --stat --summary HEAD^..
3177  .../devicetree/bindings/gpio/pl061-gpio.txt        |   15 ++
3178  arch/arm/Kconfig                                   |    2 +-
3179  arch/arm/common/Kconfig                            |    2 -
3180  drivers/gpio/gpio-pl061.c                          |   48 ++++---
3181  include/linux/irq.h                                |   15 ++
3182  kernel/irq/generic-chip.c                          |  152 +++++++++++++++++---
3183  6 files changed, 186 insertions(+), 48 deletions(-)
3184 Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
3185 $ git merge gpio/gpio/next
3186 Auto-merging drivers/of/Makefile
3187 Auto-merging drivers/of/Kconfig
3188 Auto-merging drivers/gpio/gpio-sodaville.c
3189 Auto-merging drivers/gpio/Kconfig
3190 Merge made by the 'recursive' strategy.
3191  Documentation/gpio.txt                   |    3 ++
3192  drivers/gpio/Kconfig                     |   13 +++++---
3193  drivers/gpio/Makefile                    |    1 +
3194  drivers/gpio/gpio-bt8xx.c                |   12 +------
3195  drivers/gpio/gpio-langwell.c             |   51 +++++++++++++++++++++++-------
3196  drivers/gpio/gpio-ml-ioh.c               |   12 +------
3197  drivers/gpio/gpio-pch.c                  |   12 +------
3198  drivers/gpio/gpio-sodaville.c            |   12 +------
3199  drivers/{of/gpio.c => gpio/gpiolib-of.c} |    0
3200  drivers/gpio/gpiolib.c                   |   12 ++++++-
3201  drivers/of/Kconfig                       |    6 ----
3202  drivers/of/Makefile                      |    1 -
3203  include/linux/gpio.h                     |   19 +++++++++++
3204  13 files changed, 86 insertions(+), 68 deletions(-)
3205  rename drivers/{of/gpio.c => gpio/gpiolib-of.c} (100%)
3206 Merging arm-soc/for-next (ce9f68e Merge branch 'fixes' into for-next)
3207 $ git merge arm-soc/for-next
3208 Auto-merging drivers/mmc/host/atmel-mci.c
3209 Auto-merging drivers/input/touchscreen/Kconfig
3210 Auto-merging arch/arm/Kconfig
3211 Merge made by the 'recursive' strategy.
3212  arch/arm/Kconfig                       |    4 +-
3213  arch/arm/arm-soc-for-next-contents.txt |  169 ++++++++++++++++++++++++++++++++
3214  arch/arm/boot/dts/omap3-beagle.dts     |   49 +++++++++
3215  arch/arm/boot/dts/omap3.dtsi           |  102 +++++++++++++++++++
3216  arch/arm/boot/dts/omap4-panda.dts      |   56 +++++++++++
3217  arch/arm/boot/dts/omap4-sdp.dts        |   97 ++++++++++++++++++
3218  arch/arm/boot/dts/omap4.dtsi           |  117 ++++++++++++++++++++++
3219  arch/arm/boot/dts/twl4030.dtsi         |   39 ++++++++
3220  arch/arm/boot/dts/twl6030.dtsi         |   86 ++++++++++++++++
3221  arch/arm/mach-at91/Kconfig             |   21 +++-
3222  arch/arm/mach-omap2/board-generic.c    |   37 +------
3223  arch/arm/mach-omap2/devices.c          |    4 +-
3224  arch/arm/mach-omap2/gpio.c             |    8 +-
3225  drivers/char/hw_random/Kconfig         |    2 +-
3226  drivers/dma/Kconfig                    |    5 +-
3227  drivers/input/touchscreen/Kconfig      |    4 +-
3228  drivers/mmc/host/Kconfig               |   23 +----
3229  drivers/mmc/host/atmel-mci.c           |    2 -
3230  drivers/rtc/Kconfig                    |    2 +-
3231  19 files changed, 752 insertions(+), 75 deletions(-)
3232  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
3233  create mode 100644 arch/arm/boot/dts/twl4030.dtsi
3234  create mode 100644 arch/arm/boot/dts/twl6030.dtsi
3235 Merging kvmtool/master (63091b3 kvm tools: Drop unnecessary headers in barrier.h)
3236 $ git merge kvmtool/master
3237 Removing tools/kvm/virtio/trans.c
3238 Removing tools/kvm/include/kvm/virtio-trans.h
3239 Merge made by the 'recursive' strategy.
3240  tools/kvm/Makefile                     |    2 +-
3241  tools/kvm/builtin-run.c                |    2 +
3242  tools/kvm/include/kvm/ioeventfd.h      |    3 +-
3243  tools/kvm/include/kvm/pci.h            |    2 +-
3244  tools/kvm/include/kvm/virtio-9p.h      |   13 +-
3245  tools/kvm/include/kvm/virtio-mmio.h    |   58 ++++++++
3246  tools/kvm/include/kvm/virtio-net.h     |    7 +-
3247  tools/kvm/include/kvm/virtio-pci-dev.h |    4 +-
3248  tools/kvm/include/kvm/virtio-pci.h     |   15 +-
3249  tools/kvm/include/kvm/virtio-trans.h   |   44 ------
3250  tools/kvm/include/kvm/virtio.h         |   38 ++++-
3251  tools/kvm/ioeventfd.c                  |   19 ++-
3252  tools/kvm/virtio/9p.c                  |   36 +++--
3253  tools/kvm/virtio/balloon.c             |   17 +--
3254  tools/kvm/virtio/blk.c                 |   21 ++-
3255  tools/kvm/virtio/console.c             |   13 +-
3256  tools/kvm/virtio/core.c                |   46 +++++-
3257  tools/kvm/virtio/mmio.c                |  256 ++++++++++++++++++++++++++++++++
3258  tools/kvm/virtio/net.c                 |   32 ++--
3259  tools/kvm/virtio/pci.c                 |  101 ++++++-------
3260  tools/kvm/virtio/rng.c                 |   14 +-
3261  tools/kvm/virtio/trans.c               |   24 ---
3262  tools/kvm/x86/include/kvm/barrier.h    |    5 +-
3263  tools/kvm/x86/include/kvm/kvm-arch.h   |    1 +
3264  24 files changed, 544 insertions(+), 229 deletions(-)
3265  create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
3266  delete mode 100644 tools/kvm/include/kvm/virtio-trans.h
3267  create mode 100644 tools/kvm/virtio/mmio.c
3268  delete mode 100644 tools/kvm/virtio/trans.c
3269 Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2)
3270 $ git merge dma-mapping/dma-mapping-next
3271 Already up-to-date.
3272 Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
3273 $ git merge dma-buf/for-next
3274 Resolved 'include/linux/dma-buf.h' using previous resolution.
3275 Auto-merging include/linux/dma-buf.h
3276 CONFLICT (content): Merge conflict in include/linux/dma-buf.h
3277 Auto-merging drivers/base/Kconfig
3278 Automatic merge failed; fix conflicts and then commit the result.
3279 $ git commit -v -a
3280 [master 78c897e] Merge remote-tracking branch 'dma-buf/for-next'
3281 $ git diff -M --stat --summary HEAD^..
3282  drivers/base/Kconfig |    2 +-
3283  1 file changed, 1 insertion(+), 1 deletion(-)
3284 Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
3285 $ git merge ktest/for-next
3286 Already up-to-date.
3287 Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
3288 $ git merge cpuidle-cons/cpuidle_consol_pull
3289 Resolved 'arch/arm/mach-at91/cpuidle.c' using previous resolution.
3290 Resolved 'arch/arm/mach-davinci/cpuidle.c' using previous resolution.
3291 Resolved 'arch/arm/mach-shmobile/cpuidle.c' using previous resolution.
3292 Resolved 'drivers/cpuidle/cpuidle.c' using previous resolution.
3293 Resolved 'include/linux/cpuidle.h' using previous resolution.
3294 Auto-merging include/linux/cpuidle.h
3295 CONFLICT (content): Merge conflict in include/linux/cpuidle.h
3296 Auto-merging drivers/cpuidle/cpuidle.c
3297 CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
3298 Auto-merging arch/arm/mach-shmobile/cpuidle.c
3299 CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
3300 Auto-merging arch/arm/mach-davinci/cpuidle.c
3301 CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
3302 Auto-merging arch/arm/mach-at91/cpuidle.c
3303 CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
3304 Auto-merging arch/arm/include/asm/cpuidle.h
3305 CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
3306 Automatic merge failed; fix conflicts and then commit the result.
3307 $ git commit -v -a
3308 Recorded resolution for 'arch/arm/include/asm/cpuidle.h'.
3309 [master 58fc946] Merge remote-tracking branch 'cpuidle-cons/cpuidle_consol_pull'
3310 $ git diff -M --stat --summary HEAD^..
3311 Merging scsi-post-merge/merge-base:master ()
3312 $ git clone -s -l -n -q . ../rebase-tmp
3313 $ cd ../rebase-tmp
3314 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
3315 From ../next
3316  * [new branch]      quilt/akpm -> akpm
3317 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
3318 From ../next
3319  * [new branch]      quilt/akpm-base -> akpm-base
3320 $ git checkout akpm
3321 Switched to branch 'akpm'
3322 $ git rebase --onto master akpm-base
3323 First, rewinding head to replay your work on top of it...
3324 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
3325 Applying: acerhdf: add support for new hardware
3326 Applying: acerhdf: lowered default temp fanon/fanoff values
3327 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
3328 Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
3329 Applying: drivers/xen/Kconfig: fix Kconfig layout
3330 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
3331 Applying: avr32: don't mask signals in the error path
3332 Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
3333 Applying: avr32: use block_sigmask()
3334 Applying: m32r: use set_current_blocked() and block_sigmask()
3335 Applying: m68k: use set_current_blocked() and block_sigmask()
3336 Applying: mn10300: use set_current_blocked() and block_sigmask()
3337 Applying: cris: use set_current_blocked() and block_sigmask()
3338 Applying: cris: select GENERIC_ATOMIC64
3339 Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
3340 Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
3341 Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
3342 Applying: net: use this_cpu_xxx replace percpu_xxx funcs
3343 Applying: percpu: remove percpu_xxx() functions
3344 Applying: percpu-remove-percpu_xxx-functions-fix
3345 Applying: ia64: use set_current_blocked() and block_sigmask()
3346 Applying: microblaze: don't reimplement force_sigsegv()
3347 Applying: microblaze: no need to reset handler if SA_ONESHOT
3348 Applying: microblaze: fix signal masking
3349 Applying: microblaze: use set_current_blocked() and block_sigmask()
3350 Applying: MIPS: use set_current_blocked() and block_sigmask()
3351 Applying: score: don't mask signals if we fail to setup signal stack
3352 Applying: score: use set_current_blocked() and block_sigmask()
3353 Applying: h8300: use set_current_blocked() and block_sigmask()
3354 Applying: unicore32: use block_sigmask()
3355 Applying: blackfin: use set_current_blocked() and block_sigmask()
3356 Applying: ocfs2: use find_last_bit()
3357 Applying: ocfs2: use bitmap_weight()
3358 Applying: parisc: use set_current_blocked() and block_sigmask()
3359 Applying: vfs: increment iversion when a file is truncated
3360 Applying: fs: symlink restrictions on sticky directories
3361 Applying: fs: hardlink creation restrictions
3362 Applying: brlocks/lglocks: cleanups
3363 Applying: mm/memory_failure: let the compiler add the function name
3364 Applying: mm: fix page-faults detection in swap-token logic
3365 Applying: mm: add extra free kbytes tunable
3366 Applying: mm-add-extra-free-kbytes-tunable-update
3367 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
3368 Applying: memcg: fix/change behavior of shared anon at moving task
3369 Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
3370 Applying: memcg swap: use mem_cgroup_uncharge_swap()
3371 Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
3372 Applying: mm/memcg: move reclaim_stat into lruvec
3373 Applying: mm: push lru index into shrink_[in]active_list()
3374 Applying: mm-push-lru-index-into-shrink_active_list-fix
3375 Applying: mm: mark mm-inline functions as __always_inline
3376 Applying: mm: remove lru type checks from __isolate_lru_page()
3377 Applying: mm/memcg: kill mem_cgroup_lru_del()
3378 Applying: mm/memcg: use vm_swappiness from target memory cgroup
3379 Applying: security/keys/keyctl.c: suppress memory allocation failure warning
3380 Applying: frv: use set_current_blocked() and block_sigmask()
3381 Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
3382 Applying: block: use lockdep_assert_held() for queue locking
3383 Applying: sgi-xp: use lockdep_assert_held()
3384 Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
3385 Applying: XFS: fix lock ASSERT on UP
3386 Applying: mm/huge_memory.c: use lockdep_assert_held()
3387 Applying: futex: use lockdep_assert_held() for lock checking
3388 Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
3389 Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
3390 Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
3391 Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
3392 Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
3393 Applying: checkpatch: check for spin_is_locked()
3394 Applying: vsprintf: further optimize decimal conversion
3395 Applying: vsprintf-further-optimize-decimal-conversion-v2
3396 Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
3397 Applying: leds: add LED driver for lm3556 chip
3398 Applying: leds-add-led-driver-for-lm3556-chip-fix-2
3399 Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
3400 Applying: leds-add-led-driver-for-lm3556-chip-fix
3401 Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
3402 Applying: rtc/spear: add Device Tree probing capability
3403 Applying: kmod: unexport call_usermodehelper_freeinfo()
3404 Applying: kmod: convert two call sites to call_usermodehelper_fns()
3405 Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
3406 Applying: kmod: avoid deadlock from recursive kmod call
3407 Applying: ipc/sem.c: alternatives to preempt_disable()
3408 Applying: rapidio: add DMA engine support for RIO data transfers
3409 Applying: rapidio/tsi721: add DMA engine support
3410 Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
3411 Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
3412 Applying: syscalls, x86: add __NR_kcmp syscall
3413 Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
3414 Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
3415 Applying: c/r: prctl: add ability to set new mm_struct::exe_file
3416 Applying: c-r-prctl-add-ability-to-set-new-mm_struct-exe_file-v2
3417 Applying: c/r: prctl: add ability to get clear_tid_address
3418 Applying: c-r-prctl-add-ability-to-get-clear_tid_address-fix
3419 Applying: ramoops: use pstore interface
3420 Applying: ramoops: fix printk format warnings
3421 Applying: notify_change(): check that i_mutex is held
3422 $ cd ../next
3423 $ git fetch -f ../rebase-tmp akpm:akpm
3424 From ../rebase-tmp
3425  + 949e4ed...5175be8 akpm       -> akpm  (forced update)
3426 $ rm -rf ../rebase-tmp
3427 Merging akpm (5175be8 notify_change(): check that i_mutex is held)
3428 $ git merge --no-ff akpm
3429 Merge made by the 'recursive' strategy.
3430  Documentation/cgroups/memory.txt                   |    9 +-
3431  .../devicetree/bindings/rtc/spear-rtc.txt          |   18 +
3432  Documentation/filesystems/proc.txt                 |   23 +
3433  Documentation/ramoops.txt                          |    8 +-
3434  Documentation/spinlocks.txt                        |   43 +
3435  Documentation/sysctl/fs.txt                        |   42 +
3436  Documentation/sysctl/vm.txt                        |   16 +
3437  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
3438  arch/avr32/kernel/signal.c                         |   26 +-
3439  arch/blackfin/kernel/signal.c                      |   17 +-
3440  arch/cris/Kconfig                                  |    1 +
3441  arch/cris/arch-v10/kernel/signal.c                 |   34 +-
3442  arch/cris/arch-v32/kernel/signal.c                 |   37 +-
3443  arch/frv/kernel/signal.c                           |   32 +-
3444  arch/h8300/kernel/signal.c                         |   33 +-
3445  arch/ia64/kernel/signal.c                          |   15 +-
3446  arch/m32r/kernel/signal.c                          |   12 +-
3447  arch/m68k/kernel/signal.c                          |   22 +-
3448  arch/microblaze/kernel/signal.c                    |   42 +-
3449  arch/mips/kernel/signal.c                          |   27 +-
3450  arch/mips/kernel/signal32.c                        |   20 +-
3451  arch/mips/kernel/signal_n32.c                      |   10 +-
3452  arch/mn10300/kernel/signal.c                       |   32 +-
3453  arch/parisc/kernel/signal.c                        |   12 +-
3454  arch/score/kernel/signal.c                         |   13 +-
3455  arch/um/kernel/trap.c                              |   24 +-
3456  arch/unicore32/kernel/signal.c                     |    5 +-
3457  arch/x86/include/asm/compat.h                      |    2 +-
3458  arch/x86/include/asm/current.h                     |    2 +-
3459  arch/x86/include/asm/desc.h                        |    1 +
3460  arch/x86/include/asm/fpu-internal.h                |    6 +-
3461  arch/x86/include/asm/hardirq.h                     |    9 +-
3462  arch/x86/include/asm/irq_regs.h                    |    4 +-
3463  arch/x86/include/asm/mmu_context.h                 |   12 +-
3464  arch/x86/include/asm/percpu.h                      |   24 +-
3465  arch/x86/include/asm/smp.h                         |    4 +-
3466  arch/x86/include/asm/stackprotector.h              |    4 +-
3467  arch/x86/include/asm/thread_info.h                 |    2 +-
3468  arch/x86/include/asm/tlbflush.h                    |    4 +-
3469  arch/x86/kernel/cpu/common.c                       |    2 +-
3470  arch/x86/kernel/cpu/mcheck/mce.c                   |    4 +-
3471  arch/x86/kernel/i387.c                             |    2 +-
3472  arch/x86/kernel/nmi_selftest.c                     |    1 +
3473  arch/x86/kernel/paravirt.c                         |   12 +-
3474  arch/x86/kernel/process.c                          |    2 +-
3475  arch/x86/kernel/process_32.c                       |    2 +-
3476  arch/x86/kernel/process_64.c                       |   10 +-
3477  arch/x86/mm/tlb.c                                  |   10 +-
3478  arch/x86/platform/iris/iris.c                      |   67 +-
3479  arch/x86/syscalls/syscall_32.tbl                   |    1 +
3480  arch/x86/syscalls/syscall_64.tbl                   |    1 +
3481  block/blk-throttle.c                               |    2 +-
3482  drivers/char/Kconfig                               |    1 +
3483  drivers/char/ramoops.c                             |  204 +++--
3484  drivers/leds/Kconfig                               |    9 +
3485  drivers/leds/Makefile                              |    2 +-
3486  drivers/leds/leds-lm3556.c                         |  468 +++++++++++
3487  drivers/misc/sgi-xp/xpc_channel.c                  |    6 +-
3488  drivers/misc/sgi-xp/xpc_sn2.c                      |    2 +-
3489  drivers/misc/sgi-xp/xpc_uv.c                       |    2 +-
3490  drivers/net/ethernet/smsc/smsc911x.h               |    2 +-
3491  drivers/net/irda/sir_dev.c                         |    5 -
3492  drivers/platform/x86/acerhdf.c                     |   67 +-
3493  drivers/platform/x86/intel_mid_powerbtn.c          |    2 +-
3494  drivers/rapidio/Kconfig                            |   14 +
3495  drivers/rapidio/devices/Makefile                   |    3 +
3496  drivers/rapidio/devices/tsi721.c                   |  211 +++--
3497  drivers/rapidio/devices/tsi721.h                   |  105 ++-
3498  drivers/rapidio/devices/tsi721_dma.c               |  823 ++++++++++++++++++++
3499  drivers/rapidio/rio.c                              |   81 ++
3500  drivers/rtc/rtc-spear.c                            |   10 +
3501  drivers/scsi/aha152x.c                             |    3 -
3502  drivers/xen/Kconfig                                |   22 +-
3503  fs/Kconfig                                         |   60 ++
3504  fs/attr.c                                          |    8 +-
3505  fs/dcache.c                                        |    4 +-
3506  fs/file_table.c                                    |   17 +-
3507  fs/internal.h                                      |    3 +-
3508  fs/namei.c                                         |  193 ++++-
3509  fs/namespace.c                                     |  139 ++--
3510  fs/ocfs2/cluster/heartbeat.c                       |   40 +-
3511  fs/pnode.c                                         |    4 +-
3512  fs/proc/array.c                                    |  143 +++-
3513  fs/proc/base.c                                     |    3 +
3514  fs/proc/internal.h                                 |    1 +
3515  fs/proc_namespace.c                                |    4 +-
3516  fs/xfs/xfs_iget.c                                  |    4 +-
3517  include/asm-generic/bitsperlong.h                  |    4 +
3518  include/linux/blkdev.h                             |   18 +-
3519  include/linux/dmaengine.h                          |   12 +
3520  include/linux/fs.h                                 |    2 +
3521  include/linux/kcmp.h                               |   17 +
3522  include/linux/kmod.h                               |   34 +-
3523  include/linux/leds-lm3556.h                        |  242 ++++++
3524  include/linux/lglock.h                             |  187 +----
3525  include/linux/memcontrol.h                         |   14 -
3526  include/linux/mm_inline.h                          |    8 +-
3527  include/linux/mm_types.h                           |    1 +
3528  include/linux/mmzone.h                             |   41 +-
3529  include/linux/percpu.h                             |   54 --
3530  include/linux/prctl.h                              |    8 +
3531  include/linux/rio.h                                |   47 ++
3532  include/linux/rio_drv.h                            |    9 +
3533  include/linux/spinlock.h                           |    9 +
3534  include/linux/swap.h                               |   47 +-
3535  include/linux/syscalls.h                           |    2 +
3536  include/linux/topology.h                           |    4 +-
3537  ipc/sem.c                                          |  250 ++++--
3538  kernel/Makefile                                    |    5 +-
3539  kernel/fork.c                                      |    1 +
3540  kernel/futex.c                                     |    5 +-
3541  kernel/kcmp.c                                      |  187 +++++
3542  kernel/kmod.c                                      |   59 +-
3543  kernel/lglock.c                                    |  136 ++++
3544  kernel/pid_namespace.c                             |    6 +-
3545  kernel/sys.c                                       |  201 +++--
3546  kernel/sys_ni.c                                    |    3 +
3547  kernel/sysctl.c                                    |   31 +-
3548  lib/vsprintf.c                                     |  281 ++++---
3549  mm/compaction.c                                    |    4 +-
3550  mm/huge_memory.c                                   |    4 +-
3551  mm/memcontrol.c                                    |   92 +--
3552  mm/memory-failure.c                                |    8 +-
3553  mm/memory.c                                        |   13 +
3554  mm/page_alloc.c                                    |   45 +-
3555  mm/rmap.c                                          |    3 +-
3556  mm/swap.c                                          |   16 +-
3557  mm/swapfile.c                                      |   31 -
3558  mm/vmscan.c                                        |  105 +--
3559  net/netfilter/xt_TEE.c                             |   12 +-
3560  net/socket.c                                       |    4 +-
3561  scripts/checkpatch.pl                              |   27 +
3562  security/keys/keyctl.c                             |    2 +-
3563  security/keys/request_key.c                        |   13 +-
3564  tools/testing/selftests/Makefile                   |    2 +-
3565  tools/testing/selftests/kcmp/Makefile              |   29 +
3566  tools/testing/selftests/kcmp/kcmp_test.c           |   94 +++
3567  137 files changed, 4416 insertions(+), 1443 deletions(-)
3568  create mode 100644 Documentation/devicetree/bindings/rtc/spear-rtc.txt
3569  create mode 100644 drivers/leds/leds-lm3556.c
3570  create mode 100644 drivers/rapidio/devices/tsi721_dma.c
3571  create mode 100644 include/linux/kcmp.h
3572  create mode 100644 include/linux/leds-lm3556.h
3573  create mode 100644 kernel/kcmp.c
3574  create mode 100644 kernel/lglock.c
3575  create mode 100644 tools/testing/selftests/kcmp/Makefile
3576  create mode 100644 tools/testing/selftests/kcmp/kcmp_test.c
3577 $ git revert e46c11b94787
3578 [master 57942ad] Revert "of/irq: add empty irq_of_parse_and_map() for non-dt builds"
3579  1 file changed, 2 insertions(+), 8 deletions(-)