Next/merge.log

   1 $ date
   2 Fri Dec 16 10:27:06 EST 2011
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 373da0a Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
   7 Merging origin/master (6f12d2e Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft)
   8 $ git merge origin/master
   9 Updating 373da0a..6f12d2e
  10 Fast-forward
  11  arch/arm/kernel/unwind.c                         |    4 +-
  12  arch/x86/xen/setup.c                             |   18 ++++++-
  13  drivers/firmware/iscsi_ibft.c                    |   42 ++++++++++++++++-
  14  drivers/firmware/iscsi_ibft_find.c               |   26 +----------
  15  drivers/staging/rtl8712/usb_intf.c               |    1 +
  16  drivers/staging/tidspbridge/core/dsp-clock.c     |   15 +++++-
  17  drivers/staging/tidspbridge/rmgr/drv_interface.c |    4 --
  18  drivers/usb/class/cdc-acm.c                      |   10 ++++
  19  drivers/usb/gadget/f_mass_storage.c              |    1 +
  20  drivers/usb/renesas_usbhs/mod.c                  |    2 +-
  21  drivers/usb/renesas_usbhs/mod_host.c             |    1 +
  22  drivers/usb/serial/option.c                      |    7 ++-
  23  drivers/xen/swiotlb-xen.c                        |    4 +-
  24  fs/configfs/inode.c                              |    2 +-
  25  fs/configfs/mount.c                              |   36 +++++++--------
  26  fs/ext4/extents.c                                |    3 +-
  27  fs/ext4/inode.c                                  |   54 ++++------------------
  28  fs/ext4/page-io.c                                |   12 +++++
  29  fs/ext4/super.c                                  |   17 +++----
  30  fs/fuse/dev.c                                    |    3 +-
  31  fs/fuse/file.c                                   |    6 ++-
  32  fs/fuse/inode.c                                  |   24 +++++-----
  33  fs/ncpfs/inode.c                                 |    8 ++--
  34  fs/proc/root.c                                   |    8 +--
  35  fs/ubifs/super.c                                 |   18 +++----
  36  include/drm/drm_pciids.h                         |   10 ++++
  37  ipc/mqueue.c                                     |    8 +--
  38  ipc/msgutil.c                                    |    5 --
  39  28 files changed, 189 insertions(+), 160 deletions(-)
  40 Merging fixes/master (aaa0b4f iio: iio_event_getfd -- fix ev_int build failure)
  41 $ git merge fixes/master
  42 Already up-to-date.
  43 Merging kbuild-current/rc-fixes (44656fa kbuild: Fix missing system calls check on mips.)
  44 $ git merge kbuild-current/rc-fixes
  45 Already up-to-date.
  46 Merging arm-current/fixes (9811ccd ARM: 7204/1: arch/arm/kernel/setup.c: initialize arm_dma_zone_size earlier)
  47 $ git merge arm-current/fixes
  48 Already up-to-date.
  49 Merging m68k-current/for-linus (5bf1e97 m68k: Wire up process_vm_{read,write}v)
  50 $ git merge m68k-current/for-linus
  51 Already up-to-date.
  52 Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig)
  53 $ git merge powerpc-merge/merge
  54 Already up-to-date.
  55 Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries)
  56 $ git merge 52xx-and-virtex-current/powerpc/merge
  57 Already up-to-date.
  58 Merging sparc/master (b1f44e1 sparc32: Be less strict in matching %lo part of relocation.)
  59 $ git merge sparc/master
  60 Merge made by the 'recursive' strategy.
  61  arch/sparc/kernel/ds.c          |    6 ++----
  62  arch/sparc/kernel/prom_common.c |    4 +---
  63  arch/sparc/mm/btfixup.c         |    3 +--
  64  drivers/sbus/char/bbc_i2c.c     |   27 +++++----------------------
  65  drivers/sbus/char/display7seg.c |   13 +------------
  66  drivers/sbus/char/envctrl.c     |   12 +-----------
  67  drivers/sbus/char/flash.c       |   12 +-----------
  68  drivers/sbus/char/uctrl.c       |   12 +-----------
  69  8 files changed, 13 insertions(+), 76 deletions(-)
  70 Merging scsi-rc-fixes/master (6f6c2aa [SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority)
  71 $ git merge scsi-rc-fixes/master
  72 Merge made by the 'recursive' strategy.
  73  drivers/s390/scsi/zfcp_scsi.c        |    4 +
  74  drivers/scsi/bnx2i/bnx2i_hwi.c       |    5 +-
  75  drivers/scsi/fcoe/fcoe.c             |  116 ++++
  76  drivers/scsi/fcoe/fcoe_ctlr.c        |    4 +
  77  drivers/scsi/mpt2sas/mpt2sas_scsih.c |    2 +-
  78  drivers/scsi/qla2xxx/qla_attr.c      |   27 +-
  79  drivers/scsi/qla2xxx/qla_dbg.c       |    8 +-
  80  drivers/scsi/qla2xxx/qla_gbl.h       |    1 +
  81  drivers/scsi/qla2xxx/qla_init.c      |    3 +-
  82  drivers/scsi/qla2xxx/qla_iocb.c      |   14 +-
  83  drivers/scsi/qla2xxx/qla_isr.c       |    2 +-
  84  drivers/scsi/qla2xxx/qla_mbx.c       |   25 +-
  85  drivers/scsi/qla2xxx/qla_nx.c        |   42 +-
  86  drivers/scsi/qla2xxx/qla_nx.h        |    4 +
  87  drivers/scsi/qla2xxx/qla_os.c        |   86 +---
  88  drivers/scsi/qla2xxx/qla_version.h   |    2 +-
  89  drivers/scsi/qla4xxx/ql4_def.h       |   55 ++-
  90  drivers/scsi/qla4xxx/ql4_fw.h        |    8 +
  91  drivers/scsi/qla4xxx/ql4_glbl.h      |   16 +-
  92  drivers/scsi/qla4xxx/ql4_init.c      |  243 +++++++--
  93  drivers/scsi/qla4xxx/ql4_mbx.c       |   11 +
  94  drivers/scsi/qla4xxx/ql4_os.c        | 1084 ++++++++++++++++++++++++++++++++--
  95  drivers/scsi/qla4xxx/ql4_version.h   |    2 +-
  96  include/scsi/libfcoe.h               |    3 +
  97  24 files changed, 1554 insertions(+), 213 deletions(-)
  98 Merging net/master (bb3c368 ipv6: Check dest prefix length on original route not copied one in rt6_alloc_cow().)
  99 $ git merge net/master
 100 Merge made by the 'recursive' strategy.
 101  drivers/bluetooth/Kconfig                    |    6 +-
 102  drivers/bluetooth/btmrvl_sdio.c              |   15 ++++-
 103  drivers/bluetooth/btusb.c                    |    3 +-
 104  drivers/net/ethernet/freescale/fec.c         |   11 ++-
 105  drivers/net/ethernet/freescale/fsl_pq_mdio.c |   53 +++-------------
 106  drivers/net/ppp/pptp.c                       |    4 +-
 107  drivers/net/wireless/ath/ath9k/main.c        |    2 +-
 108  drivers/net/wireless/rtlwifi/rtl8192ce/phy.c |    2 +-
 109  drivers/net/wireless/rtlwifi/rtl8192cu/phy.c |    2 +-
 110  drivers/net/wireless/rtlwifi/rtl8192de/phy.c |    2 +-
 111  drivers/net/wireless/rtlwifi/rtl8192se/phy.c |    2 +-
 112  drivers/ssb/driver_pcicore.c                 |    8 ++-
 113  net/batman-adv/translation-table.c           |   27 +++++++--
 114  net/bluetooth/bnep/core.c                    |    8 +--
 115  net/bluetooth/cmtp/core.c                    |    5 +-
 116  net/bluetooth/hci_event.c                    |    2 +-
 117  net/ipv4/ipip.c                              |    7 ++-
 118  net/ipv6/addrconf.c                          |    3 +-
 119  net/ipv6/route.c                             |    2 +-
 120  net/ipv6/sit.c                               |    7 ++-
 121  net/mac80211/agg-tx.c                        |   86 ++++++++++++-------------
 122  net/sched/sch_gred.c                         |    2 +-
 123  22 files changed, 130 insertions(+), 129 deletions(-)
 124 Merging sound-current/for-linus (844ec31 Merge branch 'fix/asoc' into for-linus)
 125 $ git merge sound-current/for-linus
 126 Merge made by the 'recursive' strategy.
 127  sound/pci/hda/hda_intel.c           |    4 +++-
 128  sound/pci/hda/patch_sigmatel.c      |    6 ++++++
 129  sound/soc/codecs/Kconfig            |    2 +-
 130  sound/soc/codecs/jz4740.c           |    1 +
 131  sound/soc/codecs/wm8958-dsp2.c      |    2 ++
 132  sound/soc/codecs/wm8996.c           |    1 +
 133  sound/soc/mxs/mxs-pcm.c             |    3 +++
 134  sound/soc/mxs/mxs-sgtl5000.c        |    1 +
 135  sound/soc/pxa/hx4700.c              |    5 +++--
 136  sound/soc/samsung/jive_wm8750.c     |    3 +--
 137  sound/soc/samsung/smdk2443_wm9710.c |    1 +
 138  11 files changed, 23 insertions(+), 6 deletions(-)
 139 Merging pci-current/for-linus (b51306c PCI: Set device power state to PCI_D0 for device without native PM support)
 140 $ git merge pci-current/for-linus
 141 Merge made by the 'recursive' strategy.
 142  drivers/pci/ats.c                  |    1 +
 143  drivers/pci/hotplug/acpiphp_glue.c |   30 ++++++++++++------------------
 144  drivers/pci/iov.c                  |    7 +++++++
 145  drivers/pci/pci.c                  |    5 ++++-
 146  4 files changed, 24 insertions(+), 19 deletions(-)
 147 Merging wireless/master (78feb35 iwlwifi: allow to switch to HT40 if not associated)
 148 $ git merge wireless/master
 149 Auto-merging net/nfc/nci/core.c
 150 Auto-merging drivers/net/wireless/ath/ath9k/rc.c
 151 Merge made by the 'recursive' strategy.
 152  drivers/net/wireless/ath/ath9k/rc.c         |    4 +++-
 153  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    4 ++--
 154  drivers/net/wireless/iwlwifi/iwl-agn-tx.c   |    5 ++++-
 155  drivers/net/wireless/iwlwifi/iwl-agn.c      |    6 ++++++
 156  drivers/net/wireless/mwifiex/cmdevt.c       |    9 ++-------
 157  net/nfc/nci/core.c                          |    2 +-
 158  6 files changed, 18 insertions(+), 12 deletions(-)
 159 Merging driver-core.current/driver-core-linus (dc47ce9 Linux 3.2-rc5)
 160 $ git merge driver-core.current/driver-core-linus
 161 Already up-to-date.
 162 Merging tty.current/tty-linus (caca6a0 Linux 3.2-rc3)
 163 $ git merge tty.current/tty-linus
 164 Already up-to-date.
 165 Merging usb.current/usb-linus (02a551c USB: option: Removing one bogus and adding some new Huawei combinations)
 166 $ git merge usb.current/usb-linus
 167 Already up-to-date.
 168 Merging staging.current/staging-linus (c7caf4d staging: r8712u: Add new USB ID)
 169 $ git merge staging.current/staging-linus
 170 Already up-to-date.
 171 Merging char-misc.current/char-misc-linus (dc47ce9 Linux 3.2-rc5)
 172 $ git merge char-misc.current/char-misc-linus
 173 Already up-to-date.
 174 Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
 175 $ git merge cpufreq-current/fixes
 176 Already up-to-date.
 177 Merging input-current/for-linus (8521478 Input: synaptics - fix touchpad not working after S2R on Vostro V13)
 178 $ git merge input-current/for-linus
 179 Auto-merging drivers/input/misc/cma3000_d0x.c
 180 Merge made by the 'recursive' strategy.
 181  drivers/input/misc/cma3000_d0x.c |    4 ++--
 182  drivers/input/mouse/synaptics.c  |   11 +++++++++++
 183  drivers/input/tablet/wacom_wac.c |    4 ++++
 184  3 files changed, 17 insertions(+), 2 deletions(-)
 185 Merging md-current/for-linus (5d8c71f md: raid5 crash during degradation)
 186 $ git merge md-current/for-linus
 187 Already up-to-date.
 188 Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path)
 189 $ git merge audit-current/for-linus
 190 Already up-to-date.
 191 Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes)
 192 $ git merge crypto-current/master
 193 Already up-to-date.
 194 Merging ide/master (0ab3d8b cy82c693: fix PCI device selection)
 195 $ git merge ide/master
 196 Already up-to-date.
 197 Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
 198 $ git merge dwmw2/master
 199 Already up-to-date.
 200 Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c)
 201 $ git merge sh-current/sh-fixes-for-linus
 202 Already up-to-date.
 203 Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support)
 204 $ git merge rmobile-current/rmobile-fixes-for-linus
 205 Already up-to-date.
 206 Merging devicetree-current/devicetree/merge (f88e1ae dt/device: Fix auxdata matching to handle entries without a name override)
 207 $ git merge devicetree-current/devicetree/merge
 208 Merge made by the 'recursive' strategy.
 209  drivers/of/platform.c |    2 +-
 210  1 files changed, 1 insertions(+), 1 deletions(-)
 211 Merging spi-current/spi/merge (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
 212 $ git merge spi-current/spi/merge
 213 Already up-to-date.
 214 Merging arm/for-next (738b2fa Merge branch 'restart' into for-next)
 215 $ git merge arm/for-next
 216 Auto-merging mm/vmalloc.c
 217 Removing arch/arm/plat-tcc/include/mach/vmalloc.h
 218 Removing arch/arm/plat-spear/include/plat/vmalloc.h
 219 Removing arch/arm/plat-omap/io.c
 220 Removing arch/arm/plat-mxc/include/mach/vmalloc.h
 221 Removing arch/arm/plat-mxc/gic.c
 222 Removing arch/arm/plat-iop/io.c
 223 Removing arch/arm/mach-zynq/include/mach/vmalloc.h
 224 Removing arch/arm/mach-w90x900/include/mach/vmalloc.h
 225 Removing arch/arm/mach-vt8500/include/mach/vmalloc.h
 226 Removing arch/arm/mach-vexpress/include/mach/vmalloc.h
 227 Removing arch/arm/mach-versatile/include/mach/vmalloc.h
 228 Removing arch/arm/mach-ux500/include/mach/vmalloc.h
 229 Removing arch/arm/mach-u300/include/mach/vmalloc.h
 230 Removing arch/arm/mach-tegra/include/mach/vmalloc.h
 231 Removing arch/arm/mach-spear6xx/include/mach/vmalloc.h
 232 Removing arch/arm/mach-spear3xx/include/mach/vmalloc.h
 233 Removing arch/arm/mach-shmobile/include/mach/vmalloc.h
 234 Removing arch/arm/mach-shmobile/entry-gic.S
 235 Removing arch/arm/mach-shark/include/mach/vmalloc.h
 236 Removing arch/arm/mach-sa1100/include/mach/vmalloc.h
 237 Removing arch/arm/mach-s5pv210/include/mach/vmalloc.h
 238 Removing arch/arm/mach-s5pc100/include/mach/vmalloc.h
 239 Removing arch/arm/mach-s5p64x0/include/mach/vmalloc.h
 240 Removing arch/arm/mach-s3c64xx/include/mach/vmalloc.h
 241 Removing arch/arm/mach-s3c2410/include/mach/vmalloc.h
 242 Removing arch/arm/mach-rpc/include/mach/vmalloc.h
 243 Removing arch/arm/mach-realview/include/mach/vmalloc.h
 244 Removing arch/arm/mach-pxa/include/mach/vmalloc.h
 245 Auto-merging arch/arm/mach-prima2/prima2.c
 246 Removing arch/arm/mach-prima2/include/mach/vmalloc.h
 247 Removing arch/arm/mach-pnx4008/include/mach/vmalloc.h
 248 Removing arch/arm/mach-picoxcell/include/mach/vmalloc.h
 249 Removing arch/arm/mach-orion5x/include/mach/vmalloc.h
 250 Removing arch/arm/mach-omap2/include/mach/vmalloc.h
 251 Removing arch/arm/mach-omap2/include/mach/omap4-common.h
 252 Removing arch/arm/mach-omap1/include/mach/vmalloc.h
 253 Removing arch/arm/mach-nomadik/include/mach/vmalloc.h
 254 Removing arch/arm/mach-netx/include/mach/vmalloc.h
 255 Auto-merging arch/arm/mach-mxs/mach-stmp378x_devb.c
 256 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-stmp378x_devb.c
 257 Auto-merging arch/arm/mach-mxs/mach-m28evk.c
 258 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-m28evk.c
 259 Removing arch/arm/mach-mxs/include/mach/vmalloc.h
 260 Auto-merging arch/arm/mach-mx5/imx53-dt.c
 261 Auto-merging arch/arm/mach-mx5/imx51-dt.c
 262 Removing arch/arm/mach-mv78xx0/include/mach/vmalloc.h
 263 Removing arch/arm/mach-msm/include/mach/vmalloc.h
 264 Removing arch/arm/mach-msm/include/mach/entry-macro-vic.S
 265 Removing arch/arm/mach-msm/include/mach/entry-macro-qgic.S
 266 Removing arch/arm/mach-mmp/include/mach/vmalloc.h
 267 Removing arch/arm/mach-lpc32xx/include/mach/vmalloc.h
 268 Removing arch/arm/mach-ks8695/include/mach/vmalloc.h
 269 Removing arch/arm/mach-kirkwood/include/mach/vmalloc.h
 270 Removing arch/arm/mach-ixp4xx/include/mach/vmalloc.h
 271 Removing arch/arm/mach-ixp23xx/include/mach/vmalloc.h
 272 Removing arch/arm/mach-ixp2000/include/mach/vmalloc.h
 273 Removing arch/arm/mach-iop33x/include/mach/vmalloc.h
 274 Removing arch/arm/mach-iop32x/include/mach/vmalloc.h
 275 Removing arch/arm/mach-iop13xx/include/mach/vmalloc.h
 276 Removing arch/arm/mach-integrator/include/mach/vmalloc.h
 277 Auto-merging arch/arm/mach-imx/mach-imx6q.c
 278 Removing arch/arm/mach-highbank/include/mach/vmalloc.h
 279 Removing arch/arm/mach-h720x/include/mach/vmalloc.h
 280 Removing arch/arm/mach-gemini/include/mach/vmalloc.h
 281 Removing arch/arm/mach-footbridge/include/mach/vmalloc.h
 282 Removing arch/arm/mach-exynos/include/mach/vmalloc.h
 283 Removing arch/arm/mach-ep93xx/include/mach/vmalloc.h
 284 Removing arch/arm/mach-ebsa110/include/mach/vmalloc.h
 285 Removing arch/arm/mach-dove/include/mach/vmalloc.h
 286 Removing arch/arm/mach-davinci/io.c
 287 Removing arch/arm/mach-davinci/include/mach/vmalloc.h
 288 Auto-merging arch/arm/mach-davinci/dm646x.c
 289 Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
 290 Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
 291 Auto-merging arch/arm/mach-davinci/board-da850-evm.c
 292 Removing arch/arm/mach-cns3xxx/include/mach/vmalloc.h
 293 Removing arch/arm/mach-clps711x/time.c
 294 Removing arch/arm/mach-clps711x/mm.c
 295 Removing arch/arm/mach-clps711x/include/mach/vResolved 'arch/arm/mach-mxs/mach-m28evk.c' using previous resolution.
 296 Resolved 'arch/arm/mach-mxs/mach-stmp378x_devb.c' using previous resolution.
 297 malloc.h
 298 Auto-merging arch/arm/mach-clps711x/common.c
 299 Removing arch/arm/mach-bcmring/include/mach/vmalloc.h
 300 Removing arch/arm/mach-at91/include/mach/vmalloc.h
 301 Auto-merging arch/arm/mach-at91/at91sam9260.c
 302 Removing arch/arm/include/asm/hardware/entry-macro-gic.S
 303 Removing arch/arm/include/asm/entry-macro-vic2.S
 304 Automatic merge failed; fix conflicts and then commit the result.
 305 $ git commit -v -a
 306 [master 947de06] Merge remote-tracking branch 'arm/for-next'
 307 $ git diff -M --stat --summary HEAD^..
 308  Documentation/arm/memory.txt                       |   11 +-
 309  Documentation/devicetree/bindings/arm/gic.txt      |    4 +
 310  Documentation/devicetree/bindings/arm/vic.txt      |   29 +
 311  arch/arm/Kconfig                                   |   10 +-
 312  arch/arm/boot/compressed/head.S                    |    1 +
 313  arch/arm/common/Kconfig                            |    6 +
 314  arch/arm/common/gic.c                              |  165 ++++-
 315  arch/arm/common/vic.c                              |  148 ++++-
 316  arch/arm/include/asm/assembler.h                   |   11 +
 317  arch/arm/include/asm/cti.h                         |  179 +++++
 318  arch/arm/include/asm/edac.h                        |   48 ++
 319  arch/arm/include/asm/entry-macro-vic2.S            |   57 --
 320  arch/arm/include/asm/hardirq.h                     |   17 -
 321  arch/arm/include/asm/hardware/entry-macro-gic.S    |   60 --
 322  arch/arm/include/asm/hardware/gic.h                |   26 +-
 323  arch/arm/include/asm/hardware/iop3xx.h             |    1 +
 324  arch/arm/include/asm/hardware/vic.h                |   10 +-
 325  arch/arm/include/asm/idmap.h                       |   14 +
 326  arch/arm/include/asm/mach/arch.h                   |    9 +-
 327  arch/arm/include/asm/opcodes.h                     |   20 +
 328  arch/arm/include/asm/page.h                        |    4 +
 329  arch/arm/include/asm/perf_event.h                  |    3 -
 330  arch/arm/include/asm/pgalloc.h                     |   26 +-
 331  arch/arm/include/asm/pgtable-2level.h              |   41 ++
 332  arch/arm/include/asm/pgtable-3level-hwdef.h        |   77 +++
 333  arch/arm/include/asm/pgtable-3level-types.h        |   70 ++
 334  arch/arm/include/asm/pgtable-3level.h              |  155 +++++
 335  arch/arm/include/asm/pgtable-hwdef.h               |    4 +
 336  arch/arm/include/asm/pgtable.h                     |   60 +--
 337  arch/arm/include/asm/pmu.h                         |   15 +-
 338  arch/arm/include/asm/proc-fns.h                    |   21 +
 339  arch/arm/include/asm/processor.h                   |    2 +
 340  arch/arm/include/asm/setup.h                       |    6 +-
 341  arch/arm/include/asm/swab.h                        |    5 +-
 342  arch/arm/include/asm/system.h                      |   10 +-
 343  arch/arm/include/asm/tlb.h                         |   12 +-
 344  arch/arm/kernel/Makefile                           |    2 +-
 345  arch/arm/kernel/entry-armv.S                       |    7 +-
 346  arch/arm/kernel/head.S                             |   65 ++-
 347  arch/arm/kernel/hw_breakpoint.c                    |    8 +-
 348  arch/arm/kernel/kprobes-test.c                     |   66 +--
 349  arch/arm/kernel/machine_kexec.c                    |   15 +-
 350  arch/arm/kernel/opcodes.c                          |   72 ++
 351  arch/arm/kernel/perf_event.c                       |   19 +-
 352  arch/arm/kernel/perf_event_v6.c                    |   32 +-
 353  arch/arm/kernel/perf_event_v7.c                    |  401 +++++-------
 354  arch/arm/kernel/perf_event_xscale.c                |   16 +-
 355  arch/arm/kernel/process.c                          |   77 ++-
 356  arch/arm/kernel/setup.c                            |   15 +-
 357  arch/arm/kernel/sleep.S                            |    4 +
 358  arch/arm/kernel/smp.c                              |   36 +-
 359  arch/arm/kernel/suspend.c                          |   18 +-
 360  arch/arm/kernel/swp_emulate.c                      |   16 +
 361  arch/arm/kernel/tcm.c                              |   22 +-
 362  arch/arm/kernel/vmlinux.lds.S                      |    7 +
 363  arch/arm/lib/Makefile                              |    3 +-
 364  arch/arm/lib/call_with_stack.S                     |   44 ++
 365  arch/arm/mach-at91/at91cap9.c                      |    4 +-
 366  arch/arm/mach-at91/at91rm9200.c                    |    4 +-
 367  arch/arm/mach-at91/at91sam9260.c                   |    2 +-
 368  arch/arm/mach-at91/at91sam9261.c                   |    2 +-
 369  arch/arm/mach-at91/at91sam9263.c                   |    2 +-
 370  arch/arm/mach-at91/at91sam9_alt_reset.S            |    9 +-
 371  arch/arm/mach-at91/at91sam9g45.c                   |    4 +-
 372  arch/arm/mach-at91/at91sam9rl.c                    |    2 +-
 373  arch/arm/mach-at91/generic.h                       |    3 +-
 374  arch/arm/mach-at91/include/mach/io.h               |    8 -
 375  arch/arm/mach-at91/include/mach/system.h           |    9 -
 376  arch/arm/mach-at91/include/mach/vmalloc.h          |   28 -
 377  arch/arm/mach-at91/setup.c                         |   18 -
 378  arch/arm/mach-bcmring/arch.c                       |   25 +-
 379  arch/arm/mach-bcmring/dma.c                        |    2 +-
 380  arch/arm/mach-bcmring/include/mach/system.h        |   26 -
 381  arch/arm/mach-bcmring/include/mach/vmalloc.h       |   25 -
 382  arch/arm/mach-clps711x/Makefile                    |    2 +-
 383  arch/arm/mach-clps711x/autcpu12.c                  |    1 +
 384  arch/arm/mach-clps711x/cdb89712.c                  |    1 +
 385  arch/arm/mach-clps711x/ceiva.c                     |    1 +
 386  arch/arm/mach-clps711x/clep7312.c                  |    1 +
 387  arch/arm/mach-clps711x/{irq.c => common.c}         |  100 +++-
 388  arch/arm/mach-clps711x/edb7211-arch.c              |    1 +
 389  arch/arm/mach-clps711x/fortunet.c                  |    1 +
 390  arch/arm/mach-clps711x/include/mach/system.h       |    5 -
 391  arch/arm/mach-clps711x/include/mach/vmalloc.h      |   20 -
 392  arch/arm/mach-clps711x/mm.c                        |   48 --
 393  arch/arm/mach-clps711x/p720t.c                     |    1 +
 394  arch/arm/mach-clps711x/time.c                      |   84 ---
 395  arch/arm/mach-cns3xxx/cns3420vb.c                  |    3 +
 396  arch/arm/mach-cns3xxx/core.h                       |    1 +
 397  arch/arm/mach-cns3xxx/include/mach/entry-macro.S   |    2 -
 398  arch/arm/mach-cns3xxx/include/mach/system.h        |    3 -
 399  arch/arm/mach-cns3xxx/include/mach/vmalloc.h       |   11 -
 400  arch/arm/mach-cns3xxx/pm.c                         |    4 +-
 401  arch/arm/mach-davinci/Makefile                     |    2 +-
 402  arch/arm/mach-davinci/board-da830-evm.c            |    1 +
 403  arch/arm/mach-davinci/board-da850-evm.c            |    1 +
 404  arch/arm/mach-davinci/board-dm355-evm.c            |    1 +
 405  arch/arm/mach-davinci/board-dm355-leopard.c        |    1 +
 406  arch/arm/mach-davinci/board-dm365-evm.c            |    1 +
 407  arch/arm/mach-davinci/board-dm644x-evm.c           |    1 +
 408  arch/arm/mach-davinci/board-dm646x-evm.c           |    2 +
 409  arch/arm/mach-davinci/board-mityomapl138.c         |    1 +
 410  arch/arm/mach-davinci/board-neuros-osd2.c          |    1 +
 411  arch/arm/mach-davinci/board-omapl138-hawk.c        |    1 +
 412  arch/arm/mach-davinci/board-sffsdr.c               |    1 +
 413  arch/arm/mach-davinci/board-tnetv107x-evm.c        |    1 +
 414  arch/arm/mach-davinci/common.c                     |    3 -
 415  arch/arm/mach-davinci/da830.c                      |    1 -
 416  arch/arm/mach-davinci/da850.c                      |    1 -
 417  arch/arm/mach-davinci/devices-da8xx.c              |    5 +
 418  arch/arm/mach-davinci/devices.c                    |    5 +
 419  arch/arm/mach-davinci/dm355.c                      |    1 -
 420  arch/arm/mach-davinci/dm365.c                      |    1 -
 421  arch/arm/mach-davinci/dm644x.c                     |    1 -
 422  arch/arm/mach-davinci/dm646x.c                     |    1 -
 423  arch/arm/mach-davinci/include/mach/common.h        |    3 +-
 424  arch/arm/mach-davinci/include/mach/da8xx.h         |    1 +
 425  arch/arm/mach-davinci/include/mach/io.h            |    8 -
 426  arch/arm/mach-davinci/include/mach/system.h        |    6 -
 427  arch/arm/mach-davinci/include/mach/tnetv107x.h     |    1 +
 428  arch/arm/mach-davinci/include/mach/vmalloc.h       |   14 -
 429  arch/arm/mach-davinci/io.c                         |   48 --
 430  arch/arm/mach-davinci/tnetv107x.c                  |    7 +-
 431  arch/arm/mach-dove/cm-a510.c                       |    1 +
 432  arch/arm/mach-dove/common.c                        |   16 +
 433  arch/arm/mach-dove/common.h                        |    1 +
 434  arch/arm/mach-dove/dove-db-setup.c                 |    1 +
 435  arch/arm/mach-dove/include/mach/dove.h             |    2 -
 436  arch/arm/mach-dove/include/mach/system.h           |   19 -
 437  arch/arm/mach-dove/include/mach/vmalloc.h          |    5 -
 438  arch/arm/mach-ebsa110/core.c                       |    8 +-
 439  arch/arm/mach-ebsa110/include/mach/system.h        |    2 -
 440  arch/arm/mach-ebsa110/include/mach/vmalloc.h       |   10 -
 441  arch/arm/mach-ep93xx/adssphere.c                   |    3 +
 442  arch/arm/mach-ep93xx/core.c                        |   12 +
 443  arch/arm/mach-ep93xx/edb93xx.c                     |   17 +
 444  arch/arm/mach-ep93xx/gesbc9312.c                   |    3 +
 445  arch/arm/mach-ep93xx/include/mach/entry-macro.S    |   42 --
 446  arch/arm/mach-ep93xx/include/mach/platform.h       |    2 +
 447  arch/arm/mach-ep93xx/include/mach/system.h         |   17 -
 448  arch/arm/mach-ep93xx/include/mach/vmalloc.h        |    5 -
 449  arch/arm/mach-ep93xx/micro9.c                      |    9 +
 450  arch/arm/mach-ep93xx/simone.c                      |    3 +
 451  arch/arm/mach-ep93xx/snappercl15.c                 |    3 +
 452  arch/arm/mach-ep93xx/ts72xx.c                      |    3 +
 453  arch/arm/mach-ep93xx/vision_ep9307.c               |    1 +
 454  arch/arm/mach-exynos/cpu.c                         |   20 +-
 455  arch/arm/mach-exynos/include/mach/entry-macro.S    |   75 --
 456  arch/arm/mach-exynos/include/mach/vmalloc.h        |   22 -
 457  arch/arm/mach-exynos/mach-armlex4210.c             |    2 +
 458  arch/arm/mach-exynos/mach-nuri.c                   |    2 +
 459  arch/arm/mach-exynos/mach-origen.c                 |    2 +
 460  arch/arm/mach-exynos/mach-smdk4x12.c               |    3 +
 461  arch/arm/mach-exynos/mach-smdkv310.c               |    3 +
 462  arch/arm/mach-exynos/mach-universal_c210.c         |    2 +
 463  arch/arm/mach-exynos/platsmp.c                     |   28 +-
 464  arch/arm/mach-footbridge/cats-hw.c                 |    3 +-
 465  arch/arm/mach-footbridge/common.c                  |   27 +
 466  arch/arm/mach-footbridge/common.h                  |    1 +
 467  arch/arm/mach-footbridge/ebsa285.c                 |    1 +
 468  arch/arm/mach-footbridge/include/mach/system.h     |   56 --
 469  arch/arm/mach-footbridge/include/mach/vmalloc.h    |   10 -
 470  arch/arm/mach-footbridge/netwinder-hw.c            |   27 +
 471  arch/arm/mach-footbridge/personal.c                |    1 +
 472  arch/arm/mach-gemini/include/mach/system.h         |    1 +
 473  arch/arm/mach-gemini/include/mach/vmalloc.h        |   10 -
 474  arch/arm/mach-h720x/common.c                       |    5 +
 475  arch/arm/mach-h720x/common.h                       |    1 +
 476  arch/arm/mach-h720x/h7201-eval.c                   |    1 +
 477  arch/arm/mach-h720x/h7202-eval.c                   |    1 +
 478  arch/arm/mach-h720x/include/mach/system.h          |    6 -
 479  arch/arm/mach-h720x/include/mach/vmalloc.h         |   10 -
 480  arch/arm/mach-highbank/core.h                      |    1 +
 481  arch/arm/mach-highbank/highbank.c                  |    2 +
 482  arch/arm/mach-highbank/include/mach/entry-macro.S  |    2 -
 483  arch/arm/mach-highbank/include/mach/system.h       |    2 -
 484  arch/arm/mach-highbank/include/mach/vmalloc.h      |    1 -
 485  arch/arm/mach-highbank/system.c                    |    2 +-
 486  arch/arm/mach-imx/clock-imx6q.c                    |    2 -
 487  arch/arm/mach-imx/mach-apf9328.c                   |    1 +
 488  arch/arm/mach-imx/mach-armadillo5x0.c              |    1 +
 489  arch/arm/mach-imx/mach-bug.c                       |    1 +
 490  arch/arm/mach-imx/mach-cpuimx27.c                  |    1 +
 491  arch/arm/mach-imx/mach-cpuimx35.c                  |    1 +
 492  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    1 +
 493  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |    1 +
 494  arch/arm/mach-imx/mach-imx27ipcam.c                |    1 +
 495  arch/arm/mach-imx/mach-imx27lite.c                 |    1 +
 496  arch/arm/mach-imx/mach-imx6q.c                     |   34 +
 497  arch/arm/mach-imx/mach-kzm_arm11_01.c              |    1 +
 498  arch/arm/mach-imx/mach-mx1ads.c                    |    2 +
 499  arch/arm/mach-imx/mach-mx21ads.c                   |    1 +
 500  arch/arm/mach-imx/mach-mx25_3ds.c                  |    1 +
 501  arch/arm/mach-imx/mach-mx27_3ds.c                  |    1 +
 502  arch/arm/mach-imx/mach-mx27ads.c                   |    1 +
 503  arch/arm/mach-imx/mach-mx31_3ds.c                  |    1 +
 504  arch/arm/mach-imx/mach-mx31ads.c                   |    1 +
 505  arch/arm/mach-imx/mach-mx31lilly.c                 |    1 +
 506  arch/arm/mach-imx/mach-mx31lite.c                  |    1 +
 507  arch/arm/mach-imx/mach-mx31moboard.c               |    1 +
 508  arch/arm/mach-imx/mach-mx35_3ds.c                  |    1 +
 509  arch/arm/mach-imx/mach-mxt_td60.c                  |    1 +
 510  arch/arm/mach-imx/mach-pca100.c                    |    1 +
 511  arch/arm/mach-imx/mach-pcm037.c                    |    1 +
 512  arch/arm/mach-imx/mach-pcm038.c                    |    1 +
 513  arch/arm/mach-imx/mach-pcm043.c                    |    1 +
 514  arch/arm/mach-imx/mach-qong.c                      |    1 +
 515  arch/arm/mach-imx/mach-scb9328.c                   |    1 +
 516  arch/arm/mach-imx/mach-vpr200.c                    |    1 +
 517  arch/arm/mach-imx/src.c                            |   23 +
 518  arch/arm/mach-integrator/common.h                  |    1 +
 519  arch/arm/mach-integrator/core.c                    |    8 +
 520  arch/arm/mach-integrator/include/mach/system.h     |   11 -
 521  arch/arm/mach-integrator/include/mach/vmalloc.h    |   20 -
 522  arch/arm/mach-integrator/integrator_ap.c           |    1 +
 523  arch/arm/mach-integrator/integrator_cp.c           |    1 +
 524  arch/arm/mach-iop13xx/include/mach/iop13xx.h       |    1 +
 525  arch/arm/mach-iop13xx/include/mach/system.h        |   14 -
 526  arch/arm/mach-iop13xx/include/mach/vmalloc.h       |    4 -
 527  arch/arm/mach-iop13xx/iq81340mc.c                  |    1 +
 528  arch/arm/mach-iop13xx/iq81340sc.c                  |    1 +
 529  arch/arm/mach-iop13xx/setup.c                      |   11 +
 530  arch/arm/mach-iop32x/em7210.c                      |    1 +
 531  arch/arm/mach-iop32x/glantank.c                    |    1 +
 532  arch/arm/mach-iop32x/include/mach/io.h             |    7 -
 533  arch/arm/mach-iop32x/include/mach/system.h         |   21 -
 534  arch/arm/mach-iop32x/include/mach/vmalloc.h        |    5 -
 535  arch/arm/mach-iop32x/iq31244.c                     |    2 +
 536  arch/arm/mach-iop32x/iq80321.c                     |    1 +
 537  arch/arm/mach-iop32x/n2100.c                       |    9 +
 538  arch/arm/mach-iop33x/include/mach/io.h             |    7 -
 539  arch/arm/mach-iop33x/include/mach/system.h         |   10 -
 540  arch/arm/mach-iop33x/include/mach/vmalloc.h        |    5 -
 541  arch/arm/mach-iop33x/iq80331.c                     |    1 +
 542  arch/arm/mach-iop33x/iq80332.c                     |    1 +
 543  arch/arm/mach-ixp2000/core.c                       |    4 +
 544  arch/arm/mach-ixp2000/enp2611.c                    |    1 +
 545  arch/arm/mach-ixp2000/include/mach/platform.h      |    1 +
 546  arch/arm/mach-ixp2000/include/mach/system.h        |   35 -
 547  arch/arm/mach-ixp2000/include/mach/vmalloc.h       |   20 -
 548  arch/arm/mach-ixp2000/ixdp2400.c                   |    1 +
 549  arch/arm/mach-ixp2000/ixdp2800.c                   |    1 +
 550  arch/arm/mach-ixp2000/ixdp2x01.c                   |   32 +
 551  arch/arm/mach-ixp23xx/core.c                       |    6 +
 552  arch/arm/mach-ixp23xx/espresso.c                   |    1 +
 553  arch/arm/mach-ixp23xx/include/mach/io.h            |   29 -
 554  arch/arm/mach-ixp23xx/include/mach/platform.h      |    1 +
 555  arch/arm/mach-ixp23xx/include/mach/system.h        |   17 -
 556  arch/arm/mach-ixp23xx/include/mach/vmalloc.h       |   10 -
 557  arch/arm/mach-ixp23xx/ixdp2351.c                   |   12 +
 558  arch/arm/mach-ixp23xx/roadrunner.c                 |    1 +
 559  arch/arm/mach-ixp4xx/avila-setup.c                 |    2 +
 560  arch/arm/mach-ixp4xx/common.c                      |   20 +
 561  arch/arm/mach-ixp4xx/coyote-setup.c                |    2 +
 562  arch/arm/mach-ixp4xx/dsmg600-setup.c               |    1 +
 563  arch/arm/mach-ixp4xx/fsg-setup.c                   |    1 +
 564  arch/arm/mach-ixp4xx/gateway7001-setup.c           |    1 +
 565  arch/arm/mach-ixp4xx/goramo_mlr.c                  |    1 +
 566  arch/arm/mach-ixp4xx/gtwx5715-setup.c              |    1 +
 567  arch/arm/mach-ixp4xx/include/mach/platform.h       |    1 +
 568  arch/arm/mach-ixp4xx/include/mach/system.h         |   25 -
 569  arch/arm/mach-ixp4xx/include/mach/vmalloc.h        |    5 -
 570  arch/arm/mach-ixp4xx/ixdp425-setup.c               |    1 +
 571  arch/arm/mach-ixp4xx/nas100d-setup.c               |    1 +
 572  arch/arm/mach-ixp4xx/nslu2-setup.c                 |    1 +
 573  arch/arm/mach-ixp4xx/omixp-setup.c                 |    3 +
 574  arch/arm/mach-ixp4xx/vulcan-setup.c                |    1 +
 575  arch/arm/mach-ixp4xx/wg302v2-setup.c               |    1 +
 576  arch/arm/mach-kirkwood/common.c                    |   16 +
 577  arch/arm/mach-kirkwood/common.h                    |    1 +
 578  arch/arm/mach-kirkwood/d2net_v2-setup.c            |    1 +
 579  arch/arm/mach-kirkwood/db88f6281-bp-setup.c        |    1 +
 580  arch/arm/mach-kirkwood/dockstar-setup.c            |    1 +
 581  arch/arm/mach-kirkwood/guruplug-setup.c            |    1 +
 582  arch/arm/mach-kirkwood/include/mach/io.h           |   25 -
 583  arch/arm/mach-kirkwood/include/mach/system.h       |   19 -
 584  arch/arm/mach-kirkwood/include/mach/vmalloc.h      |    5 -
 585  arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c     |    1 +
 586  arch/arm/mach-kirkwood/netspace_v2-setup.c         |    3 +
 587  arch/arm/mach-kirkwood/netxbig_v2-setup.c          |    2 +
 588  arch/arm/mach-kirkwood/openrd-setup.c              |    3 +
 589  arch/arm/mach-kirkwood/rd88f6192-nas-setup.c       |    1 +
 590  arch/arm/mach-kirkwood/rd88f6281-setup.c           |    1 +
 591  arch/arm/mach-kirkwood/sheevaplug-setup.c          |    8 +-
 592  arch/arm/mach-kirkwood/t5325-setup.c               |    1 +
 593  arch/arm/mach-kirkwood/ts219-setup.c               |    1 +
 594  arch/arm/mach-kirkwood/ts41x-setup.c               |    1 +
 595  arch/arm/mach-ks8695/board-acs5k.c                 |    1 +
 596  arch/arm/mach-ks8695/board-dsm320.c                |    1 +
 597  arch/arm/mach-ks8695/board-micrel.c                |    1 +
 598  arch/arm/mach-ks8695/generic.h                     |    1 +
 599  arch/arm/mach-ks8695/include/mach/system.h         |   21 -
 600  arch/arm/mach-ks8695/include/mach/vmalloc.h        |   19 -
 601  arch/arm/mach-ks8695/time.c                        |   18 +
 602  arch/arm/mach-lpc32xx/common.c                     |   20 +-
 603  arch/arm/mach-lpc32xx/common.h                     |    2 +
 604  arch/arm/mach-lpc32xx/include/mach/system.h        |   25 -
 605  arch/arm/mach-lpc32xx/include/mach/vmalloc.h       |   24 -
 606  arch/arm/mach-lpc32xx/phy3250.c                    |    1 +
 607  arch/arm/mach-mmp/aspenite.c                       |    2 +
 608  arch/arm/mach-mmp/avengers_lite.c                  |    1 +
 609  arch/arm/mach-mmp/brownstone.c                     |    1 +
 610  arch/arm/mach-mmp/common.c                         |    5 +
 611  arch/arm/mach-mmp/common.h                         |    1 +
 612  arch/arm/mach-mmp/flint.c                          |    1 +
 613  arch/arm/mach-mmp/gplugd.c                         |    1 +
 614  arch/arm/mach-mmp/include/mach/pxa168.h            |    1 +
 615  arch/arm/mach-mmp/include/mach/system.h            |   10 -
 616  arch/arm/mach-mmp/include/mach/vmalloc.h           |    5 -
 617  arch/arm/mach-mmp/jasper.c                         |    1 +
 618  arch/arm/mach-mmp/pxa168.c                         |    5 +
 619  arch/arm/mach-mmp/tavorevb.c                       |    1 +
 620  arch/arm/mach-mmp/teton_bga.c                      |    1 +
 621  arch/arm/mach-mmp/ttc_dkb.c                        |    1 +
 622  arch/arm/mach-msm/board-msm8960.c                  |    2 +
 623  arch/arm/mach-msm/board-msm8x60.c                  |    4 +
 624  arch/arm/mach-msm/include/mach/entry-macro-qgic.S  |   17 -
 625  arch/arm/mach-msm/include/mach/entry-macro-vic.S   |   37 -
 626  arch/arm/mach-msm/include/mach/entry-macro.S       |   27 +-
 627  arch/arm/mach-msm/include/mach/system.h            |    8 -
 628  arch/arm/mach-msm/include/mach/vmalloc.h           |   22 -
 629  arch/arm/mach-mv78xx0/buffalo-wxl-setup.c          |    1 +
 630  arch/arm/mach-mv78xx0/common.c                     |   16 +
 631  arch/arm/mach-mv78xx0/common.h                     |    1 +
 632  arch/arm/mach-mv78xx0/db78x00-bp-setup.c           |    1 +
 633  arch/arm/mach-mv78xx0/include/mach/system.h        |   19 -
 634  arch/arm/mach-mv78xx0/include/mach/vmalloc.h       |    5 -
 635  arch/arm/mach-mv78xx0/rd78x00-masa-setup.c         |    1 +
 636  arch/arm/mach-mx5/board-cpuimx51.c                 |    1 +
 637  arch/arm/mach-mx5/board-cpuimx51sd.c               |    1 +
 638  arch/arm/mach-mx5/board-mx50_rdp.c                 |    1 +
 639  arch/arm/mach-mx5/board-mx51_3ds.c                 |    1 +
 640  arch/arm/mach-mx5/board-mx51_babbage.c             |    1 +
 641  arch/arm/mach-mx5/board-mx51_efikamx.c             |    3 +-
 642  arch/arm/mach-mx5/board-mx51_efikasb.c             |    1 +
 643  arch/arm/mach-mx5/board-mx53_ard.c                 |    1 +
 644  arch/arm/mach-mx5/board-mx53_evk.c                 |    1 +
 645  arch/arm/mach-mx5/board-mx53_loco.c                |    1 +
 646  arch/arm/mach-mx5/board-mx53_smd.c                 |    1 +
 647  arch/arm/mach-mx5/imx51-dt.c                       |    1 +
 648  arch/arm/mach-mx5/imx53-dt.c                       |    1 +
 649  arch/arm/mach-mxs/include/mach/common.h            |    1 +
 650  arch/arm/mach-mxs/include/mach/system.h            |    2 -
 651  arch/arm/mach-mxs/include/mach/vmalloc.h           |   22 -
 652  arch/arm/mach-mxs/mach-m28evk.c                    |    1 +
 653  arch/arm/mach-mxs/mach-mx23evk.c                   |    1 +
 654  arch/arm/mach-mxs/mach-mx28evk.c                   |    1 +
 655  arch/arm/mach-mxs/mach-stmp378x_devb.c             |    1 +
 656  arch/arm/mach-mxs/mach-tx28.c                      |    1 +
 657  arch/arm/mach-mxs/system.c                         |    4 +-
 658  arch/arm/mach-netx/generic.c                       |    5 +
 659  arch/arm/mach-netx/generic.h                       |    1 +
 660  arch/arm/mach-netx/include/mach/entry-macro.S      |   13 -
 661  arch/arm/mach-netx/include/mach/system.h           |   10 -
 662  arch/arm/mach-netx/include/mach/vmalloc.h          |   19 -
 663  arch/arm/mach-netx/nxdb500.c                       |    3 +
 664  arch/arm/mach-netx/nxdkn.c                         |    3 +
 665  arch/arm/mach-netx/nxeb500hmi.c                    |    3 +
 666  arch/arm/mach-nomadik/board-nhk8815.c              |    5 +
 667  arch/arm/mach-nomadik/cpu-8815.c                   |   12 +
 668  arch/arm/mach-nomadik/cpu-8815.h                   |    4 +
 669  arch/arm/mach-nomadik/include/mach/entry-macro.S   |   30 -
 670  arch/arm/mach-nomadik/include/mach/setup.h         |    3 -
 671  arch/arm/mach-nomadik/include/mach/system.h        |   13 -
 672  arch/arm/mach-nomadik/include/mach/vmalloc.h       |    2 -
 673  arch/arm/mach-omap1/board-ams-delta.c              |    3 +-
 674  arch/arm/mach-omap1/board-fsample.c                |    3 +-
 675  arch/arm/mach-omap1/board-generic.c                |    3 +-
 676  arch/arm/mach-omap1/board-h2.c                     |    3 +-
 677  arch/arm/mach-omap1/board-h3.c                     |    3 +-
 678  arch/arm/mach-omap1/board-htcherald.c              |    3 +-
 679  arch/arm/mach-omap1/board-innovator.c              |    3 +-
 680  arch/arm/mach-omap1/board-nokia770.c               |    3 +-
 681  arch/arm/mach-omap1/board-osk.c                    |    3 +-
 682  arch/arm/mach-omap1/board-palmte.c                 |    3 +-
 683  arch/arm/mach-omap1/board-palmtt.c                 |    3 +-
 684  arch/arm/mach-omap1/board-palmz71.c                |    3 +-
 685  arch/arm/mach-omap1/board-perseus2.c               |    3 +-
 686  arch/arm/mach-omap1/board-sx1.c                    |    3 +-
 687  arch/arm/mach-omap1/board-voiceblue.c              |    8 +-
 688  arch/arm/mach-omap1/common.h                       |   62 ++
 689  arch/arm/mach-omap1/devices.c                      |    2 +-
 690  arch/arm/mach-omap1/include/mach/vmalloc.h         |   20 -
 691  arch/arm/mach-omap1/io.c                           |    1 -
 692  arch/arm/mach-omap1/reset.c                        |    5 +-
 693  arch/arm/mach-omap1/time.c                         |    2 +-
 694  arch/arm/mach-omap1/timer32k.c                     |    2 +-
 695  arch/arm/mach-omap2/Kconfig                        |    2 +
 696  arch/arm/mach-omap2/board-2430sdp.c                |    4 +-
 697  arch/arm/mach-omap2/board-3430sdp.c                |    4 +-
 698  arch/arm/mach-omap2/board-3630sdp.c                |    4 +-
 699  arch/arm/mach-omap2/board-4430sdp.c                |    6 +-
 700  arch/arm/mach-omap2/board-am3517crane.c            |    4 +-
 701  arch/arm/mach-omap2/board-am3517evm.c              |    4 +-
 702  arch/arm/mach-omap2/board-apollon.c                |    4 +-
 703  arch/arm/mach-omap2/board-cm-t35.c                 |    6 +-
 704  arch/arm/mach-omap2/board-cm-t3517.c               |    4 +-
 705  arch/arm/mach-omap2/board-devkit8000.c             |    4 +-
 706  arch/arm/mach-omap2/board-generic.c                |    8 +-
 707  arch/arm/mach-omap2/board-h4.c                     |    4 +-
 708  arch/arm/mach-omap2/board-igep0020.c               |    6 +-
 709  arch/arm/mach-omap2/board-ldp.c                    |    4 +-
 710  arch/arm/mach-omap2/board-n8x0.c                   |    8 +-
 711  arch/arm/mach-omap2/board-omap3beagle.c            |    4 +-
 712  arch/arm/mach-omap2/board-omap3evm.c               |    4 +-
 713  arch/arm/mach-omap2/board-omap3logic.c             |    6 +-
 714  arch/arm/mach-omap2/board-omap3pandora.c           |    4 +-
 715  arch/arm/mach-omap2/board-omap3stalker.c           |    4 +-
 716  arch/arm/mach-omap2/board-omap3touchbook.c         |    4 +-
 717  arch/arm/mach-omap2/board-omap4panda.c             |    6 +-
 718  arch/arm/mach-omap2/board-overo.c                  |    4 +-
 719  arch/arm/mach-omap2/board-rm680.c                  |    4 +-
 720  arch/arm/mach-omap2/board-rx51-peripherals.c       |    2 +-
 721  arch/arm/mach-omap2/board-rx51.c                   |    4 +-
 722  arch/arm/mach-omap2/board-ti8168evm.c              |    3 +-
 723  arch/arm/mach-omap2/board-zoom-peripherals.c       |    2 +-
 724  arch/arm/mach-omap2/board-zoom.c                   |    6 +-
 725  arch/arm/mach-omap2/cm2xxx_3xxx.c                  |    2 +-
 726  arch/arm/mach-omap2/cm44xx.c                       |    2 +-
 727  arch/arm/mach-omap2/cminst44xx.c                   |    2 +-
 728  arch/arm/mach-omap2/common.c                       |    2 +-
 729  arch/arm/mach-omap2/common.h                       |  186 +++++
 730  arch/arm/mach-omap2/control.c                      |    2 +-
 731  arch/arm/mach-omap2/cpuidle34xx.c                  |    1 +
 732  arch/arm/mach-omap2/display.c                      |    3 +-
 733  arch/arm/mach-omap2/i2c.c                          |    2 +-
 734  arch/arm/mach-omap2/id.c                           |    2 +-
 735  arch/arm/mach-omap2/include/mach/entry-macro.S     |  137 ----
 736  arch/arm/mach-omap2/include/mach/omap4-common.h    |   43 --
 737  arch/arm/mach-omap2/include/mach/vmalloc.h         |   20 -
 738  arch/arm/mach-omap2/io.c                           |    8 +-
 739  arch/arm/mach-omap2/irq.c                          |   51 ++
 740  arch/arm/mach-omap2/omap-hotplug.c                 |    3 +-
 741  arch/arm/mach-omap2/omap-smp.c                     |    3 +-
 742  arch/arm/mach-omap2/omap4-common.c                 |    9 +-
 743  arch/arm/mach-omap2/omap_hwmod.c                   |    2 +-
 744  arch/arm/mach-omap2/pm.c                           |    2 +-
 745  arch/arm/mach-omap2/pm24xx.c                       |    1 +
 746  arch/arm/mach-omap2/pm34xx.c                       |    1 +
 747  arch/arm/mach-omap2/pm44xx.c                       |    2 +-
 748  arch/arm/mach-omap2/prcm.c                         |    7 +-
 749  arch/arm/mach-omap2/prcm_mpu44xx.c                 |    2 +-
 750  arch/arm/mach-omap2/prm2xxx_3xxx.c                 |    2 +-
 751  arch/arm/mach-omap2/prm44xx.c                      |    2 +-
 752  arch/arm/mach-omap2/prminst44xx.c                  |    2 +-
 753  arch/arm/mach-omap2/sdram-nokia.c                  |    2 +-
 754  arch/arm/mach-omap2/sdrc.c                         |    2 +-
 755  arch/arm/mach-omap2/sdrc2xxx.c                     |    2 +-
 756  arch/arm/mach-omap2/serial.c                       |    2 +-
 757  arch/arm/mach-omap2/smartreflex.c                  |    2 +-
 758  arch/arm/mach-omap2/timer.c                        |    2 +-
 759  arch/arm/mach-omap2/vc3xxx_data.c                  |    2 +-
 760  arch/arm/mach-omap2/vc44xx_data.c                  |    2 +-
 761  arch/arm/mach-omap2/voltage.c                      |    2 +-
 762  arch/arm/mach-omap2/voltagedomains3xxx_data.c      |    2 +-
 763  arch/arm/mach-omap2/voltagedomains44xx_data.c      |    2 +-
 764  arch/arm/mach-omap2/vp.c                           |    2 +-
 765  arch/arm/mach-omap2/vp3xxx_data.c                  |    2 +-
 766  arch/arm/mach-omap2/vp44xx_data.c                  |    2 +-
 767  arch/arm/mach-orion5x/common.c                     |   12 +
 768  arch/arm/mach-orion5x/common.h                     |    1 +
 769  arch/arm/mach-orion5x/d2net-setup.c                |    2 +
 770  arch/arm/mach-orion5x/db88f5281-setup.c            |    1 +
 771  arch/arm/mach-orion5x/dns323-setup.c               |    1 +
 772  arch/arm/mach-orion5x/edmini_v2-setup.c            |    1 +
 773  arch/arm/mach-orion5x/include/mach/io.h            |   25 -
 774  arch/arm/mach-orion5x/include/mach/system.h        |   14 -
 775  arch/arm/mach-orion5x/include/mach/vmalloc.h       |    5 -
 776  arch/arm/mach-orion5x/kurobox_pro-setup.c          |    2 +
 777  arch/arm/mach-orion5x/ls-chl-setup.c               |    3 +-
 778  arch/arm/mach-orion5x/ls_hgl-setup.c               |    3 +-
 779  arch/arm/mach-orion5x/lsmini-setup.c               |    3 +-
 780  arch/arm/mach-orion5x/mss2-setup.c                 |    3 +-
 781  arch/arm/mach-orion5x/mv2120-setup.c               |    3 +-
 782  arch/arm/mach-orion5x/net2big-setup.c              |    1 +
 783  arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |    1 +
 784  arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |    1 +
 785  arch/arm/mach-orion5x/rd88f5182-setup.c            |    1 +
 786  arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |    1 +
 787  arch/arm/mach-orion5x/terastation_pro2-setup.c     |    1 +
 788  arch/arm/mach-orion5x/ts209-setup.c                |    3 +-
 789  arch/arm/mach-orion5x/ts409-setup.c                |    1 +
 790  arch/arm/mach-orion5x/ts78xx-setup.c               |    1 +
 791  arch/arm/mach-orion5x/wnr854t-setup.c              |    1 +
 792  arch/arm/mach-orion5x/wrt350n-v2-setup.c           |    1 +
 793  arch/arm/mach-picoxcell/common.c                   |    9 +-
 794  arch/arm/mach-picoxcell/include/mach/entry-macro.S |   11 +-
 795  arch/arm/mach-picoxcell/include/mach/system.h      |    5 -
 796  arch/arm/mach-picoxcell/include/mach/vmalloc.h     |   14 -
 797  arch/arm/mach-pnx4008/core.c                       |    6 +
 798  arch/arm/mach-pnx4008/include/mach/system.h        |    9 -
 799  arch/arm/mach-pnx4008/include/mach/vmalloc.h       |   20 -
 800  arch/arm/mach-prima2/common.h                      |    1 +
 801  arch/arm/mach-prima2/include/mach/map.h            |    6 +-
 802  arch/arm/mach-prima2/include/mach/system.h         |   12 -
 803  arch/arm/mach-prima2/include/mach/vmalloc.h        |   16 -
 804  arch/arm/mach-prima2/prima2.c                      |    1 +
 805  arch/arm/mach-prima2/rstc.c                        |    7 +
 806  arch/arm/mach-pxa/balloon3.c                       |    1 +
 807  arch/arm/mach-pxa/capc7117.c                       |    3 +-
 808  arch/arm/mach-pxa/cm-x2xx.c                        |    1 +
 809  arch/arm/mach-pxa/cm-x300.c                        |    1 +
 810  arch/arm/mach-pxa/colibri-pxa270.c                 |    2 +
 811  arch/arm/mach-pxa/colibri-pxa300.c                 |    1 +
 812  arch/arm/mach-pxa/colibri-pxa320.c                 |    1 +
 813  arch/arm/mach-pxa/corgi.c                          |    8 +-
 814  arch/arm/mach-pxa/csb726.c                         |    1 +
 815  arch/arm/mach-pxa/em-x270.c                        |    2 +
 816  arch/arm/mach-pxa/eseries.c                        |    6 +
 817  arch/arm/mach-pxa/ezx.c                            |    6 +
 818  arch/arm/mach-pxa/generic.h                        |    2 +
 819  arch/arm/mach-pxa/gumstix.c                        |    1 +
 820  arch/arm/mach-pxa/h5000.c                          |    1 +
 821  arch/arm/mach-pxa/himalaya.c                       |    1 +
 822  arch/arm/mach-pxa/hx4700.c                         |    1 +
 823  arch/arm/mach-pxa/icontrol.c                       |    3 +-
 824  arch/arm/mach-pxa/idp.c                            |    1 +
 825  arch/arm/mach-pxa/include/mach/entry-macro.S       |   36 -
 826  arch/arm/mach-pxa/include/mach/system.h            |    8 -
 827  arch/arm/mach-pxa/include/mach/vmalloc.h           |   11 -
 828  arch/arm/mach-pxa/littleton.c                      |    1 +
 829  arch/arm/mach-pxa/lpd270.c                         |    1 +
 830  arch/arm/mach-pxa/lubbock.c                        |    1 +
 831  arch/arm/mach-pxa/magician.c                       |    1 +
 832  arch/arm/mach-pxa/mainstone.c                      |    1 +
 833  arch/arm/mach-pxa/mioa701.c                        |    7 +-
 834  arch/arm/mach-pxa/mp900.c                          |    1 +
 835  arch/arm/mach-pxa/palmld.c                         |    3 +-
 836  arch/arm/mach-pxa/palmt5.c                         |    3 +-
 837  arch/arm/mach-pxa/palmtc.c                         |    3 +-
 838  arch/arm/mach-pxa/palmte2.c                        |    3 +-
 839  arch/arm/mach-pxa/palmtreo.c                       |    2 +
 840  arch/arm/mach-pxa/palmtx.c                         |    3 +-
 841  arch/arm/mach-pxa/palmz72.c                        |    3 +-
 842  arch/arm/mach-pxa/pcm027.c                         |    1 +
 843  arch/arm/mach-pxa/poodle.c                         |    9 +-
 844  arch/arm/mach-pxa/raumfeld.c                       |    3 +
 845  arch/arm/mach-pxa/reset.c                          |    7 +-
 846  arch/arm/mach-pxa/saar.c                           |    1 +
 847  arch/arm/mach-pxa/saarb.c                          |    1 +
 848  arch/arm/mach-pxa/spitz.c                          |    9 +-
 849  arch/arm/mach-pxa/stargate2.c                      |    2 +
 850  arch/arm/mach-pxa/tavorevb.c                       |    1 +
 851  arch/arm/mach-pxa/tavorevb3.c                      |    1 +
 852  arch/arm/mach-pxa/tosa.c                           |    5 +-
 853  arch/arm/mach-pxa/trizeps4.c                       |    2 +
 854  arch/arm/mach-pxa/viper.c                          |    1 +
 855  arch/arm/mach-pxa/vpac270.c                        |    3 +-
 856  arch/arm/mach-pxa/xcep.c                           |    1 +
 857  arch/arm/mach-pxa/z2.c                             |    1 +
 858  arch/arm/mach-pxa/zeus.c                           |    1 +
 859  arch/arm/mach-pxa/zylonite.c                       |    1 +
 860  arch/arm/mach-realview/core.h                      |    1 -
 861  arch/arm/mach-realview/include/mach/entry-macro.S  |    2 -
 862  arch/arm/mach-realview/include/mach/system.h       |   17 -
 863  arch/arm/mach-realview/include/mach/vmalloc.h      |   21 -
 864  arch/arm/mach-realview/realview_eb.c               |   10 +-
 865  arch/arm/mach-realview/realview_pb1176.c           |    6 +-
 866  arch/arm/mach-realview/realview_pb11mp.c           |    6 +-
 867  arch/arm/mach-realview/realview_pba8.c             |    6 +-
 868  arch/arm/mach-realview/realview_pbx.c              |   10 +-
 869  arch/arm/mach-rpc/include/mach/system.h            |   14 -
 870  arch/arm/mach-rpc/include/mach/vmalloc.h           |   10 -
 871  arch/arm/mach-rpc/riscpc.c                         |   12 +
 872  arch/arm/mach-s3c2410/include/mach/system-reset.h  |    5 +-
 873  arch/arm/mach-s3c2410/include/mach/vmalloc.h       |   20 -
 874  arch/arm/mach-s3c64xx/include/mach/entry-macro.S   |    7 +-
 875  arch/arm/mach-s3c64xx/include/mach/system.h        |    3 +-
 876  arch/arm/mach-s3c64xx/include/mach/vmalloc.h       |   20 -
 877  arch/arm/mach-s3c64xx/mach-anw6410.c               |    2 +
 878  arch/arm/mach-s3c64xx/mach-crag6410.c              |    2 +
 879  arch/arm/mach-s3c64xx/mach-hmt.c                   |    2 +
 880  arch/arm/mach-s3c64xx/mach-mini6410.c              |    2 +
 881  arch/arm/mach-s3c64xx/mach-ncp.c                   |    2 +
 882  arch/arm/mach-s3c64xx/mach-real6410.c              |    2 +
 883  arch/arm/mach-s3c64xx/mach-smartq5.c               |    2 +
 884  arch/arm/mach-s3c64xx/mach-smartq7.c               |    2 +
 885  arch/arm/mach-s3c64xx/mach-smdk6400.c              |    2 +
 886  arch/arm/mach-s3c64xx/mach-smdk6410.c              |    2 +
 887  arch/arm/mach-s5p64x0/include/mach/entry-macro.S   |    7 +-
 888  arch/arm/mach-s5p64x0/include/mach/vmalloc.h       |   20 -
 889  arch/arm/mach-s5p64x0/mach-smdk6440.c              |    2 +
 890  arch/arm/mach-s5p64x0/mach-smdk6450.c              |    2 +
 891  arch/arm/mach-s5pc100/include/mach/entry-macro.S   |   25 -
 892  arch/arm/mach-s5pc100/include/mach/vmalloc.h       |   17 -
 893  arch/arm/mach-s5pc100/mach-smdkc100.c              |    2 +
 894  arch/arm/mach-s5pv210/include/mach/entry-macro.S   |   37 -
 895  arch/arm/mach-s5pv210/include/mach/vmalloc.h       |   22 -
 896  arch/arm/mach-s5pv210/mach-aquila.c                |    2 +
 897  arch/arm/mach-s5pv210/mach-goni.c                  |    2 +
 898  arch/arm/mach-s5pv210/mach-smdkc110.c              |    2 +
 899  arch/arm/mach-s5pv210/mach-smdkv210.c              |    2 +
 900  arch/arm/mach-s5pv210/mach-torbreck.c              |    2 +
 901  arch/arm/mach-sa1100/assabet.c                     |    1 +
 902  arch/arm/mach-sa1100/badge4.c                      |    1 +
 903  arch/arm/mach-sa1100/cerf.c                        |    1 +
 904  arch/arm/mach-sa1100/collie.c                      |    1 +
 905  arch/arm/mach-sa1100/generic.c                     |   11 +
 906  arch/arm/mach-sa1100/generic.h                     |    1 +
 907  arch/arm/mach-sa1100/h3100.c                       |    1 +
 908  arch/arm/mach-sa1100/h3600.c                       |    1 +
 909  arch/arm/mach-sa1100/hackkit.c                     |    1 +
 910  arch/arm/mach-sa1100/include/mach/system.h         |   13 -
 911  arch/arm/mach-sa1100/include/mach/vmalloc.h        |    4 -
 912  arch/arm/mach-sa1100/jornada720.c                  |    1 +
 913  arch/arm/mach-sa1100/lart.c                        |    1 +
 914  arch/arm/mach-sa1100/nanoengine.c                  |    1 +
 915  arch/arm/mach-sa1100/pleb.c                        |    1 +
 916  arch/arm/mach-sa1100/shannon.c                     |    1 +
 917  arch/arm/mach-sa1100/simpad.c                      |    1 +
 918  arch/arm/mach-shark/core.c                         |    4 +-
 919  arch/arm/mach-shark/include/mach/system.h          |    3 -
 920  arch/arm/mach-shark/include/mach/vmalloc.h         |    4 -
 921  arch/arm/mach-shmobile/Makefile                    |    1 -
 922  arch/arm/mach-shmobile/board-ag5evm.c              |    2 +-
 923  arch/arm/mach-shmobile/board-kota2.c               |    2 +-
 924  arch/arm/mach-shmobile/entry-gic.S                 |   18 -
 925  arch/arm/mach-shmobile/include/mach/common.h       |    1 -
 926  arch/arm/mach-shmobile/include/mach/entry-macro.S  |    9 -
 927  arch/arm/mach-shmobile/include/mach/system.h       |    3 +-
 928  arch/arm/mach-shmobile/include/mach/vmalloc.h      |    7 -
 929  arch/arm/mach-spear3xx/include/mach/entry-macro.S  |   27 -
 930  arch/arm/mach-spear3xx/include/mach/generic.h      |    2 +
 931  arch/arm/mach-spear3xx/include/mach/vmalloc.h      |   19 -
 932  arch/arm/mach-spear3xx/spear300_evb.c              |    3 +
 933  arch/arm/mach-spear3xx/spear310_evb.c              |    3 +
 934  arch/arm/mach-spear3xx/spear320_evb.c              |    3 +
 935  arch/arm/mach-spear6xx/include/mach/entry-macro.S  |   36 -
 936  arch/arm/mach-spear6xx/include/mach/generic.h      |    2 +
 937  arch/arm/mach-spear6xx/include/mach/vmalloc.h      |   19 -
 938  arch/arm/mach-spear6xx/spear600_evb.c              |    3 +
 939  arch/arm/mach-tegra/board-dt.c                     |    3 +
 940  arch/arm/mach-tegra/board-harmony.c                |    3 +
 941  arch/arm/mach-tegra/board-paz00.c                  |    3 +
 942  arch/arm/mach-tegra/board-seaboard.c               |    7 +
 943  arch/arm/mach-tegra/board-trimslice.c              |    3 +
 944  arch/arm/mach-tegra/common.c                       |    2 -
 945  arch/arm/mach-tegra/include/mach/entry-macro.S     |   22 +-
 946  arch/arm/mach-tegra/include/mach/io.h              |    6 -
 947  arch/arm/mach-tegra/include/mach/system.h          |    4 -
 948  arch/arm/mach-tegra/include/mach/vmalloc.h         |   28 -
 949  arch/arm/mach-tegra/io.c                           |   21 -
 950  arch/arm/mach-u300/core.c                          |   20 +
 951  arch/arm/mach-u300/include/mach/entry-macro.S      |   24 -
 952  arch/arm/mach-u300/include/mach/platform.h         |    1 +
 953  arch/arm/mach-u300/include/mach/system.h           |   28 -
 954  arch/arm/mach-u300/include/mach/vmalloc.h          |   12 -
 955  arch/arm/mach-u300/u300.c                          |    3 +
 956  arch/arm/mach-ux500/board-mop500.c                 |    4 +
 957  arch/arm/mach-ux500/board-u5500.c                  |    2 +
 958  arch/arm/mach-ux500/include/mach/entry-macro.S     |    2 -
 959  arch/arm/mach-ux500/include/mach/system.h          |    5 -
 960  arch/arm/mach-ux500/include/mach/vmalloc.h         |   18 -
 961  arch/arm/mach-versatile/core.c                     |   18 +-
 962  arch/arm/mach-versatile/core.h                     |    1 +
 963  arch/arm/mach-versatile/include/mach/entry-macro.S |   30 -
 964  arch/arm/mach-versatile/include/mach/system.h      |   16 -
 965  arch/arm/mach-versatile/include/mach/vmalloc.h     |   21 -
 966  arch/arm/mach-versatile/versatile_ab.c             |    3 +
 967  arch/arm/mach-versatile/versatile_dt.c             |    3 +
 968  arch/arm/mach-versatile/versatile_pb.c             |    3 +
 969  arch/arm/mach-vexpress/include/mach/entry-macro.S  |    2 -
 970  arch/arm/mach-vexpress/include/mach/system.h       |    4 -
 971  arch/arm/mach-vexpress/include/mach/vmalloc.h      |   21 -
 972  arch/arm/mach-vexpress/v2m.c                       |    4 +-
 973  arch/arm/mach-vt8500/include/mach/system.h         |    1 +
 974  arch/arm/mach-vt8500/include/mach/vmalloc.h        |   20 -
 975  arch/arm/mach-w90x900/cpu.c                        |   16 +
 976  arch/arm/mach-w90x900/include/mach/system.h        |   22 -
 977  arch/arm/mach-w90x900/include/mach/vmalloc.h       |   23 -
 978  arch/arm/mach-w90x900/irq.c                        |    2 +
 979  arch/arm/mach-w90x900/mach-nuc910evb.c             |    1 +
 980  arch/arm/mach-w90x900/mach-nuc950evb.c             |    1 +
 981  arch/arm/mach-w90x900/mach-nuc960evb.c             |    1 +
 982  arch/arm/mach-w90x900/nuc910.h                     |    9 +-
 983  arch/arm/mach-w90x900/nuc950.h                     |    9 +-
 984  arch/arm/mach-w90x900/nuc960.h                     |    9 +-
 985  arch/arm/mach-w90x900/nuc9xx.h                     |   24 +
 986  arch/arm/mach-w90x900/time.c                       |    2 +
 987  arch/arm/mach-zynq/common.c                        |    1 +
 988  arch/arm/mach-zynq/include/mach/entry-macro.S      |    3 -
 989  arch/arm/mach-zynq/include/mach/system.h           |    5 -
 990  arch/arm/mach-zynq/include/mach/vmalloc.h          |   20 -
 991  arch/arm/mm/Kconfig                                |   17 +
 992  arch/arm/mm/alignment.c                            |    2 +-
 993  arch/arm/mm/context.c                              |   19 +-
 994  arch/arm/mm/fault.c                                |  169 ++---
 995  arch/arm/mm/fault.h                                |   27 +-
 996  arch/arm/mm/fsr-2level.c                           |   78 +++
 997  arch/arm/mm/fsr-3level.c                           |   68 ++
 998  arch/arm/mm/idmap.c                                |   93 ++-
 999  arch/arm/mm/init.c                                 |   40 +-
1000  arch/arm/mm/ioremap.c                              |  119 ++--
1001  arch/arm/mm/mm.h                                   |   14 +
1002  arch/arm/mm/mmap.c                                 |  173 +++++-
1003  arch/arm/mm/mmu.c                                  |   97 +++-
1004  arch/arm/mm/nommu.c                                |    4 +-
1005  arch/arm/mm/pgd.c                                  |   51 ++-
1006  arch/arm/mm/proc-arm1020.S                         |    3 +
1007  arch/arm/mm/proc-arm1020e.S                        |    3 +
1008  arch/arm/mm/proc-arm1022.S                         |    3 +
1009  arch/arm/mm/proc-arm1026.S                         |    3 +
1010  arch/arm/mm/proc-arm6_7.S                          |    4 +
1011  arch/arm/mm/proc-arm720.S                          |    3 +
1012  arch/arm/mm/proc-arm740.S                          |    3 +
1013  arch/arm/mm/proc-arm7tdmi.S                        |    3 +
1014  arch/arm/mm/proc-arm920.S                          |    3 +
1015  arch/arm/mm/proc-arm922.S                          |    3 +
1016  arch/arm/mm/proc-arm925.S                          |    3 +
1017  arch/arm/mm/proc-arm926.S                          |    3 +
1018  arch/arm/mm/proc-arm940.S                          |    3 +
1019  arch/arm/mm/proc-arm946.S                          |    3 +
1020  arch/arm/mm/proc-arm9tdmi.S                        |    3 +
1021  arch/arm/mm/proc-fa526.S                           |    3 +
1022  arch/arm/mm/proc-feroceon.S                        |    3 +
1023  arch/arm/mm/proc-macros.S                          |    5 +-
1024  arch/arm/mm/proc-mohawk.S                          |    3 +
1025  arch/arm/mm/proc-sa110.S                           |    3 +
1026  arch/arm/mm/proc-sa1100.S                          |    3 +
1027  arch/arm/mm/proc-v6.S                              |    3 +
1028  arch/arm/mm/proc-v7-2level.S                       |  171 +++++
1029  arch/arm/mm/proc-v7-3level.S                       |  150 ++++
1030  arch/arm/mm/proc-v7.S                              |  190 +-----
1031  arch/arm/mm/proc-xsc3.S                            |    3 +
1032  arch/arm/mm/proc-xscale.S                          |    3 +
1033  arch/arm/nwfpe/entry.S                             |    8 +-
1034  arch/arm/nwfpe/fpopcode.c                          |   26 -
1035  arch/arm/nwfpe/fpopcode.h                          |    3 -
1036  arch/arm/plat-iop/Makefile                         |    4 +-
1037  arch/arm/plat-iop/io.c                             |   59 --
1038  arch/arm/plat-iop/restart.c                        |   19 +
1039  arch/arm/plat-mxc/Makefile                         |    1 -
1040  arch/arm/plat-mxc/gic.c                            |   41 --
1041  arch/arm/plat-mxc/include/mach/common.h            |    4 +-
1042  arch/arm/plat-mxc/include/mach/entry-macro.S       |   11 -
1043  arch/arm/plat-mxc/include/mach/mx1.h               |    2 -
1044  arch/arm/plat-mxc/include/mach/system.h            |    2 -
1045  arch/arm/plat-mxc/include/mach/vmalloc.h           |   22 -
1046  arch/arm/plat-mxc/system.c                         |   11 +-
1047  arch/arm/plat-omap/Makefile                        |    2 +-
1048  arch/arm/plat-omap/common.c                        |    8 +
1049  arch/arm/plat-omap/include/plat/common.h           |   82 ---
1050  arch/arm/plat-omap/include/plat/io.h               |   76 ---
1051  arch/arm/plat-omap/include/plat/irqs.h             |   14 -
1052  arch/arm/plat-omap/include/plat/system.h           |    2 -
1053  arch/arm/plat-omap/io.c                            |  159 -----
1054  arch/arm/plat-s3c24xx/cpu.c                        |   23 -
1055  arch/arm/plat-s5p/Kconfig                          |    1 +
1056  arch/arm/plat-samsung/include/plat/system-reset.h  |    1 +
1057  arch/arm/plat-spear/Makefile                       |    2 +-
1058  arch/arm/plat-spear/include/plat/system.h          |   15 -
1059  arch/arm/plat-spear/include/plat/vmalloc.h         |   19 -
1060  arch/arm/plat-spear/restart.c                      |   27 +
1061  arch/arm/plat-tcc/include/mach/system.h            |    1 +
1062  arch/arm/plat-tcc/include/mach/vmalloc.h           |   10 -
1063  arch/arm/tools/mach-types                          |  713 +++++++++++---------
1064  include/linux/vmalloc.h                            |    1 +
1065  mm/vmalloc.c                                       |   29 +-
1066  758 files changed, 4878 insertions(+), 4791 deletions(-)
1067  create mode 100644 Documentation/devicetree/bindings/arm/vic.txt
1068  create mode 100644 arch/arm/include/asm/cti.h
1069  create mode 100644 arch/arm/include/asm/edac.h
1070  delete mode 100644 arch/arm/include/asm/entry-macro-vic2.S
1071  delete mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S
1072  create mode 100644 arch/arm/include/asm/idmap.h
1073  create mode 100644 arch/arm/include/asm/opcodes.h
1074  create mode 100644 arch/arm/include/asm/pgtable-3level-hwdef.h
1075  create mode 100644 arch/arm/include/asm/pgtable-3level-types.h
1076  create mode 100644 arch/arm/include/asm/pgtable-3level.h
1077  create mode 100644 arch/arm/kernel/opcodes.c
1078  create mode 100644 arch/arm/lib/call_with_stack.S
1079  delete mode 100644 arch/arm/mach-at91/include/mach/vmalloc.h
1080  delete mode 100644 arch/arm/mach-bcmring/include/mach/vmalloc.h
1081  rename arch/arm/mach-clps711x/{irq.c => common.c} (58%)
1082  delete mode 100644 arch/arm/mach-clps711x/include/mach/vmalloc.h
1083  delete mode 100644 arch/arm/mach-clps711x/mm.c
1084  delete mode 100644 arch/arm/mach-clps711x/time.c
1085  delete mode 100644 arch/arm/mach-cns3xxx/include/mach/vmalloc.h
1086  delete mode 100644 arch/arm/mach-davinci/include/mach/vmalloc.h
1087  delete mode 100644 arch/arm/mach-davinci/io.c
1088  delete mode 100644 arch/arm/mach-dove/include/mach/vmalloc.h
1089  delete mode 100644 arch/arm/mach-ebsa110/include/mach/vmalloc.h
1090  delete mode 100644 arch/arm/mach-ep93xx/include/mach/vmalloc.h
1091  delete mode 100644 arch/arm/mach-exynos/include/mach/vmalloc.h
1092  delete mode 100644 arch/arm/mach-footbridge/include/mach/vmalloc.h
1093  delete mode 100644 arch/arm/mach-gemini/include/mach/vmalloc.h
1094  delete mode 100644 arch/arm/mach-h720x/include/mach/vmalloc.h
1095  delete mode 100644 arch/arm/mach-highbank/include/mach/vmalloc.h
1096  delete mode 100644 arch/arm/mach-integrator/include/mach/vmalloc.h
1097  delete mode 100644 arch/arm/mach-iop13xx/include/mach/vmalloc.h
1098  delete mode 100644 arch/arm/mach-iop32x/include/mach/vmalloc.h
1099  delete mode 100644 arch/arm/mach-iop33x/include/mach/vmalloc.h
1100  delete mode 100644 arch/arm/mach-ixp2000/include/mach/vmalloc.h
1101  delete mode 100644 arch/arm/mach-ixp23xx/include/mach/vmalloc.h
1102  delete mode 100644 arch/arm/mach-ixp4xx/include/mach/vmalloc.h
1103  delete mode 100644 arch/arm/mach-kirkwood/include/mach/vmalloc.h
1104  delete mode 100644 arch/arm/mach-ks8695/include/mach/vmalloc.h
1105  delete mode 100644 arch/arm/mach-lpc32xx/include/mach/vmalloc.h
1106  delete mode 100644 arch/arm/mach-mmp/include/mach/vmalloc.h
1107  delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-qgic.S
1108  delete mode 100644 arch/arm/mach-msm/include/mach/entry-macro-vic.S
1109  delete mode 100644 arch/arm/mach-msm/include/mach/vmalloc.h
1110  delete mode 100644 arch/arm/mach-mv78xx0/include/mach/vmalloc.h
1111  delete mode 100644 arch/arm/mach-mxs/include/mach/vmalloc.h
1112  delete mode 100644 arch/arm/mach-netx/include/mach/vmalloc.h
1113  create mode 100644 arch/arm/mach-nomadik/cpu-8815.h
1114  delete mode 100644 arch/arm/mach-nomadik/include/mach/vmalloc.h
1115  create mode 100644 arch/arm/mach-omap1/common.h
1116  delete mode 100644 arch/arm/mach-omap1/include/mach/vmalloc.h
1117  create mode 100644 arch/arm/mach-omap2/common.h
1118  delete mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h
1119  delete mode 100644 arch/arm/mach-omap2/include/mach/vmalloc.h
1120  delete mode 100644 arch/arm/mach-orion5x/include/mach/vmalloc.h
1121  delete mode 100644 arch/arm/mach-picoxcell/include/mach/vmalloc.h
1122  delete mode 100644 arch/arm/mach-pnx4008/include/mach/vmalloc.h
1123  delete mode 100644 arch/arm/mach-prima2/include/mach/vmalloc.h
1124  delete mode 100644 arch/arm/mach-pxa/include/mach/vmalloc.h
1125  delete mode 100644 arch/arm/mach-realview/include/mach/vmalloc.h
1126  delete mode 100644 arch/arm/mach-rpc/include/mach/vmalloc.h
1127  delete mode 100644 arch/arm/mach-s3c2410/include/mach/vmalloc.h
1128  delete mode 100644 arch/arm/mach-s3c64xx/include/mach/vmalloc.h
1129  delete mode 100644 arch/arm/mach-s5p64x0/include/mach/vmalloc.h
1130  delete mode 100644 arch/arm/mach-s5pc100/include/mach/vmalloc.h
1131  delete mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h
1132  delete mode 100644 arch/arm/mach-sa1100/include/mach/vmalloc.h
1133  delete mode 100644 arch/arm/mach-shark/include/mach/vmalloc.h
1134  delete mode 100644 arch/arm/mach-shmobile/entry-gic.S
1135  delete mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h
1136  delete mode 100644 arch/arm/mach-spear3xx/include/mach/vmalloc.h
1137  delete mode 100644 arch/arm/mach-spear6xx/include/mach/vmalloc.h
1138  delete mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h
1139  delete mode 100644 arch/arm/mach-u300/include/mach/vmalloc.h
1140  delete mode 100644 arch/arm/mach-ux500/include/mach/vmalloc.h
1141  delete mode 100644 arch/arm/mach-versatile/include/mach/vmalloc.h
1142  delete mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h
1143  delete mode 100644 arch/arm/mach-vt8500/include/mach/vmalloc.h
1144  delete mode 100644 arch/arm/mach-w90x900/include/mach/vmalloc.h
1145  create mode 100644 arch/arm/mach-w90x900/nuc9xx.h
1146  delete mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
1147  create mode 100644 arch/arm/mm/fsr-2level.c
1148  create mode 100644 arch/arm/mm/fsr-3level.c
1149  create mode 100644 arch/arm/mm/proc-v7-2level.S
1150  create mode 100644 arch/arm/mm/proc-v7-3level.S
1151  delete mode 100644 arch/arm/plat-iop/io.c
1152  create mode 100644 arch/arm/plat-iop/restart.c
1153  delete mode 100644 arch/arm/plat-mxc/gic.c
1154  delete mode 100644 arch/arm/plat-mxc/include/mach/vmalloc.h
1155  delete mode 100644 arch/arm/plat-omap/io.c
1156  delete mode 100644 arch/arm/plat-spear/include/plat/vmalloc.h
1157  create mode 100644 arch/arm/plat-spear/restart.c
1158  delete mode 100644 arch/arm/plat-tcc/include/mach/vmalloc.h
1159 Merging arm-soc/for-next (f83ef75 Merge branch 'next/devel' into for-next)
1160 $ git merge arm-soc/for-next
1161 Resolved 'arch/arm/mach-at91/at91cap9.c' using previous resolution.
1162 Resolved 'arch/arm/mach-at91/at91sam9260.c' using previous resolution.
1163 Resolved 'arch/arm/mach-at91/at91sam9261.c' using previous resolution.
1164 Resolved 'arch/arm/mach-at91/at91sam9263.c' using previous resolution.
1165 Resolved 'arch/arm/mach-at91/at91sam9g45.c' using previous resolution.
1166 Resolved 'arch/arm/mach-at91/at91sam9rl.c' using previous resolution.
1167 Resolved 'arch/arm/mach-mxs/include/mach/common.h' using previous resolution.
1168 Auto-merging drivers/mmc/host/omap_hsmmc.c
1169 Removing arch/arm/plat-pxa/include/plat/gpio.h
1170 Removing arch/arm/plat-pxa/include/plat/gpio-pxa.h
1171 Auto-merging arch/arm/mach-pxa/zylonite.c
1172 Auto-merging arch/arm/mach-pxa/zeus.c
1173 Auto-merging arch/arm/mach-pxa/z2.c
1174 Auto-merging arch/arm/mach-pxa/vpac270.c
1175 Auto-merging arch/arm/mach-pxa/viper.c
1176 Auto-merging arch/arm/mach-pxa/tosa.c
1177 Auto-merging arch/arm/mach-pxa/tavorevb3.c
1178 Auto-merging arch/arm/mach-pxa/tavorevb.c
1179 Auto-merging arch/arm/mach-pxa/stargate2.c
1180 Auto-merging arch/arm/mach-pxa/spitz.c
1181 Auto-merging arch/arm/mach-pxa/saarb.c
1182 Auto-merging arch/arm/mach-pxa/saar.c
1183 Auto-merging arch/arm/mach-pxa/raumfeld.c
1184 Auto-merging arch/arm/mach-pxa/poodle.c
1185 Auto-merging arch/arm/mach-pxa/mioa701.c
1186 Auto-merging arch/arm/mach-pxa/mainstone.c
1187 Auto-merging arch/arm/mach-pxa/magician.c
1188 Auto-merging arch/arm/mach-pxa/lubbock.c
1189 Auto-merging arch/arm/mach-pxa/lpd270.c
1190 Auto-merging arch/arm/mach-pxa/littleton.c
1191 Removing arch/arm/mach-pxa/include/mach/gpio-pxa.h
1192 Auto-merging arch/arm/mach-pxa/idp.c
1193 Auto-merging arch/arm/mach-pxa/icontrol.c
1194 Auto-merging arch/arm/mach-pxa/hx4700.c
1195 Auto-merging arch/arm/mach-pxa/eseries.c
1196 Auto-merging arch/arm/mach-pxa/em-x270.c
1197 Auto-merging arch/arm/mach-pxa/corgi.c
1198 Auto-merging arch/arm/mach-pxa/colibri-pxa320.c
1199 Auto-merging arch/arm/mach-pxa/colibri-pxa300.c
1200 Auto-merging arch/arm/mach-pxa/colibri-pxa270.c
1201 Auto-merging arch/arm/mach-pxa/cm-x300.c
1202 Auto-merging arch/arm/mach-pxa/cm-x2xx.c
1203 Auto-merging arch/arm/mach-pxa/capc7117.c
1204 Auto-merging arch/arm/mach-pxa/balloon3.c
1205 Auto-merging arch/arm/mach-orion5x/common.h
1206 Auto-merging arch/arm/mach-orion5x/common.c
1207 Auto-merging arch/arm/mach-omap2/omap-smc.S
1208 Auto-merging arch/arm/mach-omap2/common.h
1209 Auto-merging arch/arm/mach-omap2/board-am3517evm.c
1210 Auto-merging arch/arm/mach-omap2/board-4430sdp.c
1211 Auto-merging arch/arm/mach-mxs/mach-mx28evk.c
1212 Auto-merging arch/arm/mach-mxs/include/mach/common.h
1213 CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/common.h
1214 Removing arch/arm/mach-mx5/pm-imx5.c
1215 Removing arch/arm/mach-mx5/Makefile.boot
1216 Removing arch/arm/mach-mx5/Makefile
1217 Removing arch/arm/mach-mx5/Kconfig
1218 Auto-merging arch/arm/mach-mv78xx0/common.h
1219 Auto-merging arch/arm/mach-mv78xx0/common.c
1220 Auto-merging arch/arm/mach-mmp/ttc_dkb.c
1221 Auto-merging arch/arm/mach-mmp/teton_bga.c
1222 Auto-merging arch/arm/mach-mmp/tavorevb.c
1223 Auto-merging arch/arm/mach-mmp/pxa168.c
1224 Auto-merging arch/arm/mach-mmp/include/mach/pxa168.h
1225 Auto-merging arch/arm/mach-mmp/gplugd.c
1226 Auto-merging arch/arm/mach-mmp/flint.c
1227 Auto-merging arch/arm/mach-mmp/brownstone.c
1228 Auto-merging arch/arm/mach-mmp/avengers_lite.c
1229 Auto-merging arch/arm/mach-mmp/aspenite.c
1230 Auto-merging arch/arm/mach-kirkwood/common.h
1231 Auto-merging arch/arm/mach-kirkwood/common.c
1232 Auto-merging arch/arm/mach-imx/pm-imx5.c
1233 Auto-merging arch/arm/mach-imx/mach-mx53_smd.c
1234 Auto-merging arch/arm/mach-imx/mach-mx53_loco.c
1235 Auto-merging arch/arm/mach-imx/mach-mx53_evk.c
1236 Auto-merging arch/arm/mach-imx/mach-mx53_ard.c
1237 Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c
1238 Auto-merging arch/arm/mach-dove/common.h
1239 Auto-merging arch/arm/mach-dove/common.c
1240 Auto-merging arch/arm/mach-at91/generic.h
1241 Auto-merging arch/arm/mach-at91/at91sam9rl.c
1242 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c
1243 Auto-merging arch/arm/mach-at91/at91sam9g45.c
1244 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c
1245 Auto-merging arch/arm/mach-at91/at91sam9263.c
1246 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
1247 Auto-merging arch/arm/mach-at91/at91sam9261.c
1248 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c
1249 Auto-merging arch/arm/mach-at91/at91sam9260.c
1250 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c
1251 Auto-merging arch/arm/mach-at91/at91rm9200.c
1252 Auto-merging arch/arm/mach-at91/at91cap9.c
1253 CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c
1254 Removing arch/arm/configs/mx3_defconfig
1255 Auto-merging arch/arm/configs/imx_v6_v7_defconfig
1256 Auto-merging arch/arm/Kconfig
1257 Automatic merge failed; fix conflicts and then commit the result.
1258 $ git commit -v -a
1259 [master 56ce86d] Merge remote-tracking branch 'arm-soc/for-next'
1260 $ git diff -M --stat --summary HEAD^..
1261  arch/arm/Kconfig                                   |    2 +
1262  arch/arm/Kconfig.debug                             |   45 +++
1263  arch/arm/Makefile                                  |    1 -
1264  arch/arm/arm-soc-for-next-contents.txt             |   19 +
1265  arch/arm/boot/dts/highbank.dts                     |   12 +
1266  .../configs/{mx5_defconfig => imx_v6_v7_defconfig} |   61 ++--
1267  arch/arm/configs/mx3_defconfig                     |  144 -------
1268  arch/arm/configs/omap1_defconfig                   |    1 -
1269  arch/arm/mach-at91/Kconfig                         |   24 ++-
1270  arch/arm/mach-at91/at91cap9.c                      |   40 +-
1271  arch/arm/mach-at91/at91cap9_devices.c              |   49 ++-
1272  arch/arm/mach-at91/at91rm9200.c                    |   24 +-
1273  arch/arm/mach-at91/at91rm9200_devices.c            |   48 ++-
1274  arch/arm/mach-at91/at91rm9200_time.c               |    8 +-
1275  arch/arm/mach-at91/at91sam9260.c                   |   36 +-
1276  arch/arm/mach-at91/at91sam9260_devices.c           |   55 ++--
1277  arch/arm/mach-at91/at91sam9261.c                   |   32 +-
1278  arch/arm/mach-at91/at91sam9261_devices.c           |   33 +-
1279  arch/arm/mach-at91/at91sam9263.c                   |   45 ++-
1280  arch/arm/mach-at91/at91sam9263_devices.c           |   59 ++--
1281  arch/arm/mach-at91/at91sam926x_time.c              |   38 ++-
1282  arch/arm/mach-at91/at91sam9g45.c                   |   44 ++-
1283  arch/arm/mach-at91/at91sam9g45_devices.c           |   69 +++--
1284  arch/arm/mach-at91/at91sam9rl.c                    |   36 +-
1285  arch/arm/mach-at91/at91sam9rl_devices.c            |   43 ++-
1286  arch/arm/mach-at91/board-1arm.c                    |    4 +-
1287  arch/arm/mach-at91/board-afeb-9260v1.c             |   10 +-
1288  arch/arm/mach-at91/board-cam60.c                   |    8 +-
1289  arch/arm/mach-at91/board-cap9adk.c                 |   21 +-
1290  arch/arm/mach-at91/board-carmeva.c                 |    9 +-
1291  arch/arm/mach-at91/board-cpu9krea.c                |   14 +-
1292  arch/arm/mach-at91/board-cpuat91.c                 |    7 +-
1293  arch/arm/mach-at91/board-csb337.c                  |    7 +-
1294  arch/arm/mach-at91/board-csb637.c                  |    4 +-
1295  arch/arm/mach-at91/board-dt.c                      |    3 +-
1296  arch/arm/mach-at91/board-eb9200.c                  |   11 +-
1297  arch/arm/mach-at91/board-ecbat91.c                 |    7 +-
1298  arch/arm/mach-at91/board-eco920.c                  |    7 +-
1299  arch/arm/mach-at91/board-flexibity.c               |    5 +-
1300  arch/arm/mach-at91/board-foxg20.c                  |    9 +-
1301  arch/arm/mach-at91/board-gsia18s.c                 |    7 +-
1302  arch/arm/mach-at91/board-kafa.c                    |    4 +-
1303  arch/arm/mach-at91/board-kb9202.c                  |    8 +-
1304  arch/arm/mach-at91/board-neocore926.c              |    9 +-
1305  arch/arm/mach-at91/board-pcontrol-g20.c            |    8 +-
1306  arch/arm/mach-at91/board-picotux200.c              |    5 +-
1307  arch/arm/mach-at91/board-qil-a9260.c               |   18 +-
1308  arch/arm/mach-at91/board-rm9200dk.c                |   13 +-
1309  arch/arm/mach-at91/board-rm9200ek.c                |    5 +-
1310  arch/arm/mach-at91/board-rsi-ews.c                 |    4 +-
1311  arch/arm/mach-at91/board-sam9-l9260.c              |   12 +-
1312  arch/arm/mach-at91/board-sam9260ek.c               |   16 +-
1313  arch/arm/mach-at91/board-sam9261ek.c               |   13 +-
1314  arch/arm/mach-at91/board-sam9263ek.c               |   12 +-
1315  arch/arm/mach-at91/board-sam9g20ek.c               |   13 +-
1316  arch/arm/mach-at91/board-sam9m10g45ek.c            |    8 +-
1317  arch/arm/mach-at91/board-sam9rlek.c                |    9 +-
1318  arch/arm/mach-at91/board-snapper9260.c             |   10 +-
1319  arch/arm/mach-at91/board-stamp9g20.c               |   16 +-
1320  arch/arm/mach-at91/board-usb-a926x.c               |   14 +-
1321  arch/arm/mach-at91/board-yl-9200.c                 |    9 +-
1322  arch/arm/mach-at91/generic.h                       |    7 +-
1323  arch/arm/mach-at91/gpio.c                          |   85 +++--
1324  arch/arm/mach-at91/include/mach/at91_aic.h         |   48 ++-
1325  arch/arm/mach-at91/include/mach/at91_dbgu.h        |    2 +-
1326  arch/arm/mach-at91/include/mach/at91_pit.h         |    8 +-
1327  arch/arm/mach-at91/include/mach/at91_rtc.h         |   24 +-
1328  arch/arm/mach-at91/include/mach/at91_shdwc.h       |   16 +-
1329  arch/arm/mach-at91/include/mach/at91cap9.h         |   27 +-
1330  arch/arm/mach-at91/include/mach/at91rm9200.h       |   14 +-
1331  arch/arm/mach-at91/include/mach/at91sam9260.h      |   23 +-
1332  arch/arm/mach-at91/include/mach/at91sam9261.h      |   20 +-
1333  arch/arm/mach-at91/include/mach/at91sam9263.h      |   33 +-
1334  arch/arm/mach-at91/include/mach/at91sam9_smc.h     |   17 +-
1335  arch/arm/mach-at91/include/mach/at91sam9g45.h      |   30 +-
1336  arch/arm/mach-at91/include/mach/at91sam9rl.h       |   29 +-
1337  arch/arm/mach-at91/include/mach/at91x40.h          |    1 -
1338  arch/arm/mach-at91/include/mach/board.h            |   42 +--
1339  arch/arm/mach-at91/include/mach/debug-macro.S      |   10 +-
1340  arch/arm/mach-at91/include/mach/entry-macro.S      |   11 +-
1341  arch/arm/mach-at91/include/mach/gpio.h             |  336 ++++++++---------
1342  arch/arm/mach-at91/include/mach/hardware.h         |   12 +
1343  arch/arm/mach-at91/include/mach/irqs.h             |    2 +-
1344  arch/arm/mach-at91/include/mach/timex.h            |   65 +---
1345  arch/arm/mach-at91/include/mach/uncompress.h       |    6 +-
1346  arch/arm/mach-at91/irq.c                           |   38 ++-
1347  arch/arm/mach-at91/pm.c                            |   11 +-
1348  arch/arm/mach-at91/sam9_smc.c                      |   62 ++-
1349  arch/arm/mach-at91/sam9_smc.h                      |    3 +-
1350  arch/arm/mach-at91/setup.c                         |   26 +-
1351  arch/arm/mach-at91/soc.h                           |    1 +
1352  arch/arm/mach-dove/addr-map.c                      |  121 +++----
1353  arch/arm/mach-dove/common.c                        |   16 +-
1354  arch/arm/mach-dove/common.h                        |    1 -
1355  arch/arm/mach-dove/pcie.c                          |    4 +-
1356  arch/arm/mach-imx/Kconfig                          |  239 ++++++++++++
1357  arch/arm/mach-imx/Makefile                         |   21 +
1358  arch/arm/mach-imx/Makefile.boot                    |   12 +
1359  arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c  |    2 +-
1360  arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c}   |    0
1361  arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c      |    0
1362  arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h      |    0
1363  .../crm_regs.h => mach-imx/crm-regs-imx5.h}        |    0
1364  arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h    |    0
1365  arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h    |    0
1366  arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h    |    0
1367  arch/arm/{mach-mx5 => mach-imx}/efika.h            |    0
1368  arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} |    0
1369  .../eukrea_mbimx51-baseboard.c                     |    0
1370  .../eukrea_mbimxsd-baseboard.c                     |    0
1371  arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c         |    0
1372  arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c         |    0
1373  .../board-cpuimx51.c => mach-imx/mach-cpuimx51.c}  |    0
1374  .../mach-cpuimx51sd.c}                             |    0
1375  .../board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c}  |    0
1376  .../board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c}  |    0
1377  .../mach-mx51_babbage.c}                           |    0
1378  .../mach-mx51_efikamx.c}                           |    0
1379  .../mach-mx51_efikasb.c}                           |    0
1380  .../board-mx53_ard.c => mach-imx/mach-mx53_ard.c}  |    1 -
1381  .../board-mx53_evk.c => mach-imx/mach-mx53_evk.c}  |    1 -
1382  .../mach-mx53_loco.c}                              |    1 -
1383  .../board-mx53_smd.c => mach-imx/mach-mx53_smd.c}  |    1 -
1384  arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c}     |    0
1385  arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c       |    0
1386  arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} |   89 ++++-
1387  arch/arm/mach-kirkwood/addr-map.c                  |  137 ++-----
1388  arch/arm/mach-kirkwood/common.c                    |   19 +-
1389  arch/arm/mach-kirkwood/common.h                    |    1 -
1390  arch/arm/mach-kirkwood/include/mach/kirkwood.h     |    1 +
1391  arch/arm/mach-kirkwood/mpp.c                       |    1 -
1392  arch/arm/mach-kirkwood/mpp.h                       |    1 +
1393  arch/arm/mach-kirkwood/pcie.c                      |    4 +-
1394  arch/arm/mach-mmp/aspenite.c                       |    5 +-
1395  arch/arm/mach-mmp/avengers_lite.c                  |    1 +
1396  arch/arm/mach-mmp/brownstone.c                     |    1 +
1397  arch/arm/mach-mmp/flint.c                          |    5 +-
1398  arch/arm/mach-mmp/gplugd.c                         |    1 +
1399  arch/arm/mach-mmp/include/mach/gpio-pxa.h          |    3 +-
1400  arch/arm/mach-mmp/include/mach/gpio.h              |    7 +-
1401  arch/arm/mach-mmp/include/mach/irqs.h              |    6 +-
1402  arch/arm/mach-mmp/include/mach/mmp2.h              |    2 +
1403  arch/arm/mach-mmp/include/mach/pxa168.h            |    2 +
1404  arch/arm/mach-mmp/include/mach/pxa910.h            |    2 +
1405  arch/arm/mach-mmp/mmp2.c                           |   39 +-
1406  arch/arm/mach-mmp/pxa168.c                         |   40 ++-
1407  arch/arm/mach-mmp/pxa910.c                         |   40 ++-
1408  arch/arm/mach-mmp/tavorevb.c                       |    6 +-
1409  arch/arm/mach-mmp/teton_bga.c                      |    3 +-
1410  arch/arm/mach-mmp/ttc_dkb.c                        |    8 +-
1411  arch/arm/mach-msm/Kconfig                          |   35 +--
1412  arch/arm/mach-msm/include/mach/debug-macro.S       |   51 ++-
1413  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h    |   12 -
1414  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h    |   12 -
1415  arch/arm/mach-msm/include/mach/msm_iomap-8960.h    |    5 +
1416  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h    |   12 -
1417  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h    |    5 +
1418  arch/arm/mach-msm/include/mach/msm_iomap.h         |   12 +
1419  arch/arm/mach-msm/include/mach/uncompress.h        |   39 ++-
1420  arch/arm/mach-msm/io.c                             |   15 +-
1421  arch/arm/mach-msm/platsmp.c                        |    2 +-
1422  arch/arm/mach-msm/timer.c                          |  347 ++++++-----------
1423  arch/arm/mach-mv78xx0/addr-map.c                   |  102 +----
1424  arch/arm/mach-mv78xx0/common.c                     |   22 +-
1425  arch/arm/mach-mv78xx0/common.h                     |    1 -
1426  arch/arm/mach-mv78xx0/mpp.c                        |    1 -
1427  arch/arm/mach-mv78xx0/pcie.c                       |    4 +-
1428  arch/arm/mach-mx5/Kconfig                          |  244 ------------
1429  arch/arm/mach-mx5/Makefile                         |   26 --
1430  arch/arm/mach-mx5/Makefile.boot                    |    9 -
1431  arch/arm/mach-mx5/pm-imx5.c                        |   83 ----
1432  arch/arm/mach-mxs/clock-mx28.c                     |   38 ++
1433  arch/arm/mach-mxs/devices-mx28.h                   |    3 +-
1434  arch/arm/mach-mxs/devices/platform-mxs-saif.c      |    5 +-
1435  arch/arm/mach-mxs/include/mach/common.h            |    1 +
1436  arch/arm/mach-mxs/include/mach/devices-common.h    |    4 +-
1437  arch/arm/mach-mxs/include/mach/digctl.h            |   21 +
1438  arch/arm/mach-mxs/mach-mx28evk.c                   |   18 +-
1439  arch/arm/mach-omap1/Kconfig                        |   64 ----
1440  arch/arm/mach-omap1/clock.c                        |   14 +-
1441  arch/arm/mach-omap1/clock.h                        |    3 +
1442  arch/arm/mach-omap1/clock_data.c                   |   19 +-
1443  arch/arm/mach-omap1/opp.h                          |    1 +
1444  arch/arm/mach-omap1/opp_data.c                     |   63 ++--
1445  arch/arm/mach-omap2/Kconfig                        |   21 +
1446  arch/arm/mach-omap2/Makefile                       |   16 +-
1447  arch/arm/mach-omap2/board-4430sdp.c                |    1 +
1448  arch/arm/mach-omap2/board-am3517evm.c              |   22 ++
1449  arch/arm/mach-omap2/common.h                       |   64 +++-
1450  arch/arm/mach-omap2/cpuidle34xx.c                  |   15 +
1451  arch/arm/mach-omap2/cpuidle44xx.c                  |  245 ++++++++++++
1452  arch/arm/mach-omap2/hsmmc.c                        |   59 +++-
1453  arch/arm/mach-omap2/hsmmc.h                        |    1 +
1454  arch/arm/mach-omap2/include/mach/barriers.h        |   31 ++
1455  arch/arm/mach-omap2/include/mach/omap-secure.h     |   57 +++
1456  arch/arm/mach-omap2/include/mach/omap-wakeupgen.h  |   39 ++
1457  arch/arm/mach-omap2/io.c                           |    9 +
1458  arch/arm/mach-omap2/omap-headsmp.S                 |    5 -
1459  arch/arm/mach-omap2/omap-hotplug.c                 |   14 +-
1460  arch/arm/mach-omap2/omap-mpuss-lowpower.c          |  398 ++++++++++++++++++++
1461  arch/arm/mach-omap2/omap-secure.c                  |   81 ++++
1462  arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} |   23 ++
1463  arch/arm/mach-omap2/omap-smp.c                     |   45 +++
1464  arch/arm/mach-omap2/omap-wakeupgen.c               |  389 +++++++++++++++++++
1465  arch/arm/mach-omap2/omap4-common.c                 |   94 +++++-
1466  arch/arm/mach-omap2/omap4-sar-layout.h             |   50 +++
1467  arch/arm/mach-omap2/pm.h                           |    1 +
1468  arch/arm/mach-omap2/pm44xx.c                       |  153 ++++++++-
1469  arch/arm/mach-omap2/sleep44xx.S                    |  379 +++++++++++++++++++
1470  arch/arm/mach-orion5x/addr-map.c                   |  146 +++-----
1471  arch/arm/mach-orion5x/common.c                     |   23 +-
1472  arch/arm/mach-orion5x/common.h                     |    3 +-
1473  arch/arm/mach-orion5x/include/mach/orion5x.h       |    2 +-
1474  arch/arm/mach-orion5x/mpp.c                        |    1 -
1475  arch/arm/mach-orion5x/pci.c                        |    5 +-
1476  arch/arm/mach-pxa/am200epd.c                       |    4 +-
1477  arch/arm/mach-pxa/am300epd.c                       |    4 +-
1478  arch/arm/mach-pxa/balloon3.c                       |    2 +-
1479  arch/arm/mach-pxa/capc7117.c                       |   12 +-
1480  arch/arm/mach-pxa/cm-x270.c                        |    4 +-
1481  arch/arm/mach-pxa/cm-x2xx.c                        |    4 +-
1482  arch/arm/mach-pxa/cm-x300.c                        |    6 +-
1483  arch/arm/mach-pxa/colibri-pxa270.c                 |    6 +-
1484  arch/arm/mach-pxa/colibri-pxa300.c                 |    4 +-
1485  arch/arm/mach-pxa/colibri-pxa320.c                 |    4 +-
1486  arch/arm/mach-pxa/corgi.c                          |    2 +-
1487  arch/arm/mach-pxa/corgi_pm.c                       |   21 +-
1488  arch/arm/mach-pxa/devices.c                        |   30 ++
1489  arch/arm/mach-pxa/devices.h                        |    1 +
1490  arch/arm/mach-pxa/em-x270.c                        |    6 +-
1491  arch/arm/mach-pxa/eseries.c                        |    4 +-
1492  arch/arm/mach-pxa/hx4700.c                         |   18 +-
1493  arch/arm/mach-pxa/icontrol.c                       |    8 +-
1494  arch/arm/mach-pxa/idp.c                            |    4 +-
1495  arch/arm/mach-pxa/include/mach/balloon3.h          |    6 +-
1496  arch/arm/mach-pxa/include/mach/corgi.h             |   26 +-
1497  arch/arm/mach-pxa/include/mach/csb726.h            |    4 +-
1498  arch/arm/mach-pxa/include/mach/gpio-pxa.h          |  133 -------
1499  arch/arm/mach-pxa/include/mach/gpio.h              |   20 +-
1500  arch/arm/mach-pxa/include/mach/gumstix.h           |   20 +-
1501  arch/arm/mach-pxa/include/mach/hx4700.h            |    2 +-
1502  arch/arm/mach-pxa/include/mach/idp.h               |   16 +-
1503  arch/arm/mach-pxa/include/mach/irqs.h              |    8 +-
1504  arch/arm/mach-pxa/include/mach/littleton.h         |    4 +-
1505  arch/arm/mach-pxa/include/mach/magician.h          |    2 +-
1506  arch/arm/mach-pxa/include/mach/palmld.h            |    8 +-
1507  arch/arm/mach-pxa/include/mach/palmt5.h            |    8 +-
1508  arch/arm/mach-pxa/include/mach/palmtc.h            |    4 +-
1509  arch/arm/mach-pxa/include/mach/palmtx.h            |    8 +-
1510  arch/arm/mach-pxa/include/mach/pcm027.h            |    8 +-
1511  arch/arm/mach-pxa/include/mach/pcm990_baseboard.h  |   14 +-
1512  arch/arm/mach-pxa/include/mach/poodle.h            |   26 +-
1513  arch/arm/mach-pxa/include/mach/spitz.h             |   40 +-
1514  arch/arm/mach-pxa/include/mach/tosa.h              |   54 ++--
1515  arch/arm/mach-pxa/include/mach/trizeps4.h          |   16 +-
1516  arch/arm/mach-pxa/irq.c                            |   61 +---
1517  arch/arm/mach-pxa/littleton.c                      |    6 +-
1518  arch/arm/mach-pxa/lpd270.c                         |    4 +-
1519  arch/arm/mach-pxa/lubbock.c                        |    4 +-
1520  arch/arm/mach-pxa/magician.c                       |    8 +-
1521  arch/arm/mach-pxa/mainstone.c                      |    4 +-
1522  arch/arm/mach-pxa/mfp-pxa2xx.c                     |    6 +-
1523  arch/arm/mach-pxa/mioa701.c                        |    8 +-
1524  arch/arm/mach-pxa/mxm8x10.c                        |    4 +-
1525  arch/arm/mach-pxa/pcm990-baseboard.c               |    6 +-
1526  arch/arm/mach-pxa/poodle.c                         |    6 +-
1527  arch/arm/mach-pxa/pxa25x.c                         |    6 +-
1528  arch/arm/mach-pxa/pxa27x.c                         |    6 +-
1529  arch/arm/mach-pxa/pxa3xx.c                         |    8 +-
1530  arch/arm/mach-pxa/pxa95x.c                         |    5 +-
1531  arch/arm/mach-pxa/raumfeld.c                       |    8 +-
1532  arch/arm/mach-pxa/saar.c                           |    6 +-
1533  arch/arm/mach-pxa/saarb.c                          |    2 +-
1534  arch/arm/mach-pxa/sharpsl_pm.c                     |   24 +-
1535  arch/arm/mach-pxa/spitz.c                          |    2 +-
1536  arch/arm/mach-pxa/spitz_pm.c                       |   11 +-
1537  arch/arm/mach-pxa/stargate2.c                      |   26 +-
1538  arch/arm/mach-pxa/tavorevb.c                       |    4 +-
1539  arch/arm/mach-pxa/tavorevb3.c                      |    2 +-
1540  arch/arm/mach-pxa/tosa.c                           |    4 +-
1541  arch/arm/mach-pxa/viper.c                          |   12 +-
1542  arch/arm/mach-pxa/vpac270.c                        |   10 +-
1543  arch/arm/mach-pxa/z2.c                             |    2 +-
1544  arch/arm/mach-pxa/zeus.c                           |   20 +-
1545  arch/arm/mach-pxa/zylonite.c                       |    4 +-
1546  arch/arm/mach-pxa/zylonite_pxa300.c                |    4 +-
1547  arch/arm/mach-ux500/board-mop500-sdi.c             |   38 ++
1548  arch/arm/mach-ux500/board-mop500.c                 |    2 +-
1549  arch/arm/mach-ux500/board-mop500.h                 |   63 +++-
1550  arch/arm/plat-mxc/Kconfig                          |   15 +-
1551  arch/arm/plat-omap/common.c                        |    3 +
1552  arch/arm/plat-omap/dma.c                           |   22 +-
1553  arch/arm/plat-omap/include/plat/clkdev_omap.h      |    1 +
1554  arch/arm/plat-omap/include/plat/mmc.h              |    1 +
1555  arch/arm/plat-omap/include/plat/omap-secure.h      |   13 +
1556  arch/arm/plat-omap/include/plat/omap44xx.h         |    1 +
1557  arch/arm/plat-omap/include/plat/sram.h             |    6 +-
1558  arch/arm/plat-omap/sram.c                          |   17 +-
1559  arch/arm/plat-orion/Makefile                       |    2 +-
1560  arch/arm/plat-orion/addr-map.c                     |  174 +++++++++
1561  arch/arm/plat-orion/common.c                       |   43 +--
1562  arch/arm/plat-orion/include/plat/addr-map.h        |   53 +++
1563  arch/arm/plat-orion/include/plat/audio.h           |    3 -
1564  arch/arm/plat-orion/include/plat/common.h          |   17 +-
1565  arch/arm/plat-orion/include/plat/ehci-orion.h      |    1 -
1566  arch/arm/plat-orion/include/plat/mv_xor.h          |    6 -
1567  arch/arm/plat-orion/include/plat/mvsdio.h          |    1 -
1568  arch/arm/plat-orion/include/plat/pcie.h            |    3 +-
1569  arch/arm/plat-orion/pcie.c                         |    6 +-
1570  arch/arm/plat-pxa/include/plat/gpio-pxa.h          |   44 ---
1571  arch/arm/plat-pxa/include/plat/gpio.h              |   30 --
1572  arch/avr32/boards/atngw100/setup.c                 |    2 +-
1573  arch/avr32/boards/atstk1000/atstk1002.c            |    2 +-
1574  arch/avr32/boards/favr-32/setup.c                  |    2 +-
1575  arch/avr32/boards/hammerhead/setup.c               |    2 +-
1576  arch/avr32/boards/merisc/setup.c                   |    2 +-
1577  arch/avr32/boards/mimc200/setup.c                  |    2 +-
1578  arch/avr32/mach-at32ap/at32ap700x.c                |    8 +-
1579  arch/avr32/mach-at32ap/include/mach/board.h        |    7 +-
1580  drivers/ata/pata_at91.c                            |    6 +-
1581  drivers/ata/sata_mv.c                              |   19 +-
1582  drivers/dma/mv_xor.c                               |   11 +-
1583  drivers/gpio/Kconfig                               |    6 +
1584  drivers/gpio/Makefile                              |    2 +-
1585  drivers/gpio/gpio-pxa.c                            |  377 ++++++++++++++++---
1586  drivers/ide/at91_ide.c                             |    2 +-
1587  drivers/mmc/host/at91_mci.c                        |   30 +-
1588  drivers/mmc/host/mvsdio.c                          |   13 +-
1589  drivers/mmc/host/omap_hsmmc.c                      |   26 +-
1590  drivers/mtd/nand/atmel_nand.c                      |    8 +-
1591  drivers/net/ethernet/Makefile                      |    2 +-
1592  drivers/net/ethernet/cadence/Kconfig               |   16 +-
1593  drivers/net/ethernet/cadence/at91_ether.c          |    3 +-
1594  drivers/net/ethernet/cadence/at91_ether.h          |    4 +-
1595  drivers/net/ethernet/cadence/macb.c                |  344 +++++++++++------
1596  drivers/net/ethernet/cadence/macb.h                |  150 ++++++++-
1597  drivers/net/ethernet/marvell/mv643xx_eth.c         |   10 +-
1598  drivers/pcmcia/pxa2xx_cm_x255.c                    |   16 +-
1599  drivers/pcmcia/pxa2xx_cm_x270.c                    |    9 +-
1600  drivers/rtc/rtc-at91rm9200.c                       |  101 +++--
1601  drivers/usb/gadget/at91_udc.c                      |   14 +-
1602  drivers/usb/host/ehci-orion.c                      |   10 +-
1603  drivers/usb/host/ohci-at91.c                       |   12 +-
1604  drivers/watchdog/at91sam9_wdt.c                    |   22 +-
1605  drivers/watchdog/at91sam9_wdt.h                    |    6 +-
1606  include/linux/ata_platform.h                       |    3 -
1607  include/linux/gpio-pxa.h                           |   16 +
1608  include/linux/mbus.h                               |   13 +-
1609  include/linux/platform_data/macb.h                 |   17 +
1610  include/sound/saif.h                               |    4 +-
1611  sound/soc/kirkwood/kirkwood-dma.c                  |   15 +-
1612  sound/soc/mxs/mxs-saif.c                           |   20 +-
1613  352 files changed, 6170 insertions(+), 3428 deletions(-)
1614  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
1615  rename arch/arm/configs/{mx5_defconfig => imx_v6_v7_defconfig} (80%)
1616  delete mode 100644 arch/arm/configs/mx3_defconfig
1617  rename arch/arm/{mach-mx5 => mach-imx}/clock-mx51-mx53.c (99%)
1618  rename arch/arm/{mach-mx5/cpu.c => mach-imx/cpu-imx5.c} (100%)
1619  rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.c (100%)
1620  rename arch/arm/{mach-mx5 => mach-imx}/cpu_op-mx51.h (100%)
1621  rename arch/arm/{mach-mx5/crm_regs.h => mach-imx/crm-regs-imx5.h} (100%)
1622  rename arch/arm/{mach-mx5 => mach-imx}/devices-imx50.h (100%)
1623  rename arch/arm/{mach-mx5 => mach-imx}/devices-imx51.h (100%)
1624  rename arch/arm/{mach-mx5 => mach-imx}/devices-imx53.h (100%)
1625  rename arch/arm/{mach-mx5 => mach-imx}/efika.h (100%)
1626  rename arch/arm/{mach-mx5/ehci.c => mach-imx/ehci-imx5.c} (100%)
1627  rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimx51-baseboard.c (100%)
1628  rename arch/arm/{mach-mx5 => mach-imx}/eukrea_mbimxsd-baseboard.c (100%)
1629  rename arch/arm/{mach-mx5 => mach-imx}/imx51-dt.c (100%)
1630  rename arch/arm/{mach-mx5 => mach-imx}/imx53-dt.c (100%)
1631  rename arch/arm/{mach-mx5/board-cpuimx51.c => mach-imx/mach-cpuimx51.c} (100%)
1632  rename arch/arm/{mach-mx5/board-cpuimx51sd.c => mach-imx/mach-cpuimx51sd.c} (100%)
1633  rename arch/arm/{mach-mx5/board-mx50_rdp.c => mach-imx/mach-mx50_rdp.c} (100%)
1634  rename arch/arm/{mach-mx5/board-mx51_3ds.c => mach-imx/mach-mx51_3ds.c} (100%)
1635  rename arch/arm/{mach-mx5/board-mx51_babbage.c => mach-imx/mach-mx51_babbage.c} (100%)
1636  rename arch/arm/{mach-mx5/board-mx51_efikamx.c => mach-imx/mach-mx51_efikamx.c} (100%)
1637  rename arch/arm/{mach-mx5/board-mx51_efikasb.c => mach-imx/mach-mx51_efikasb.c} (100%)
1638  rename arch/arm/{mach-mx5/board-mx53_ard.c => mach-imx/mach-mx53_ard.c} (99%)
1639  rename arch/arm/{mach-mx5/board-mx53_evk.c => mach-imx/mach-mx53_evk.c} (99%)
1640  rename arch/arm/{mach-mx5/board-mx53_loco.c => mach-imx/mach-mx53_loco.c} (99%)
1641  rename arch/arm/{mach-mx5/board-mx53_smd.c => mach-imx/mach-mx53_smd.c} (99%)
1642  rename arch/arm/{mach-mx5/mm.c => mach-imx/mm-imx5.c} (100%)
1643  rename arch/arm/{mach-mx5 => mach-imx}/mx51_efika.c (100%)
1644  rename arch/arm/{mach-mx5/system.c => mach-imx/pm-imx5.c} (58%)
1645  delete mode 100644 arch/arm/mach-mx5/Kconfig
1646  delete mode 100644 arch/arm/mach-mx5/Makefile
1647  delete mode 100644 arch/arm/mach-mx5/Makefile.boot
1648  delete mode 100644 arch/arm/mach-mx5/pm-imx5.c
1649  create mode 100644 arch/arm/mach-mxs/include/mach/digctl.h
1650  create mode 100644 arch/arm/mach-omap2/cpuidle44xx.c
1651  create mode 100644 arch/arm/mach-omap2/include/mach/barriers.h
1652  create mode 100644 arch/arm/mach-omap2/include/mach/omap-secure.h
1653  create mode 100644 arch/arm/mach-omap2/include/mach/omap-wakeupgen.h
1654  create mode 100644 arch/arm/mach-omap2/omap-mpuss-lowpower.c
1655  create mode 100644 arch/arm/mach-omap2/omap-secure.c
1656  rename arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} (70%)
1657  create mode 100644 arch/arm/mach-omap2/omap-wakeupgen.c
1658  create mode 100644 arch/arm/mach-omap2/omap4-sar-layout.h
1659  create mode 100644 arch/arm/mach-omap2/sleep44xx.S
1660  delete mode 100644 arch/arm/mach-pxa/include/mach/gpio-pxa.h
1661  create mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h
1662  create mode 100644 arch/arm/plat-orion/addr-map.c
1663  create mode 100644 arch/arm/plat-orion/include/plat/addr-map.h
1664  delete mode 100644 arch/arm/plat-pxa/include/plat/gpio-pxa.h
1665  delete mode 100644 arch/arm/plat-pxa/include/plat/gpio.h
1666  create mode 100644 include/linux/gpio-pxa.h
1667  create mode 100644 include/linux/platform_data/macb.h
1668 Merging arm-perf/for-next/perf (dc47ce9 Linux 3.2-rc5)
1669 $ git merge arm-perf/for-next/perf
1670 Already up-to-date.
1671 Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux)
1672 $ git merge at91/at91-next
1673 Already up-to-date.
1674 Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
1675 $ git merge davinci/davinci-next
1676 Already up-to-date.
1677 Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master)
1678 $ git merge i.MX/for-next
1679 Resolved 'arch/arm/mach-imx/clock-mx51-mx53.c' using previous resolution.
1680 Resolved 'arch/arm/mach-imx/devices-imx53.h' using previous resolution.
1681 Resolved 'arch/arm/mach-imx/mm-imx5.c' using previous resolution.
1682 Resolved 'arch/arm/plat-mxc/include/mach/hardware.h' using previous resolution.
1683 Auto-merging arch/arm/plat-mxc/include/mach/hardware.h
1684 CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h
1685 Auto-merging arch/arm/mach-mxs/clock-mx28.c
1686 CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree.
1687 CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree.
1688 CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree.
1689 Auto-merging arch/arm/mach-imx/mm-imx5.c
1690 CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c
1691 Auto-merging arch/arm/mach-imx/devices-imx53.h
1692 CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h
1693 Auto-merging arch/arm/mach-imx/clock-mx51-mx53.c
1694 CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c
1695 Automatic merge failed; fix conflicts and then commit the result.
1696 $ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig
1697 arch/arm/mach-imx/clock-mx51-mx53.c: needs merge
1698 arch/arm/mach-imx/devices-imx53.h: needs merge
1699 arch/arm/mach-imx/mm-imx5.c: needs merge
1700 arch/arm/mach-mx5/Kconfig: needs merge
1701 arch/arm/mach-mx5/Makefile: needs merge
1702 arch/arm/mach-mx5/pm-imx5.c: needs merge
1703 arch/arm/plat-mxc/include/mach/hardware.h: needs merge
1704 rm 'arch/arm/mach-mx5/Kconfig'
1705 rm 'arch/arm/mach-mx5/Makefile'
1706 rm 'arch/arm/mach-mx5/pm-imx5.c'
1707 $ git commit -v -a
1708 [master d2f0457] Merge remote-tracking branch 'i.MX/for-next'
1709 $ git diff -M --stat --summary HEAD^..
1710  arch/arm/mach-mxs/clock-mx28.c |    4 ++++
1711  1 files changed, 4 insertions(+), 0 deletions(-)
1712 Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux)
1713 $ git merge linux-spec/for-next
1714 Already up-to-date.
1715 Merging omap/for-next (322a8b0 Linux 3.1-rc1)
1716 $ git merge omap/for-next
1717 Already up-to-date.
1718 Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver)
1719 $ git merge pxa/for-next
1720 Already up-to-date.
1721 Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers)
1722 $ git merge samsung/next-samsung
1723 Already up-to-date.
1724 Merging s5p/for-next (57894d3 Merge branch 'next-samsung-devel' into for-next)
1725 $ git merge s5p/for-next
1726 Resolved 'arch/arm/mach-exynos/cpu.c' using previous resolution.
1727 Resolved 'arch/arm/mach-exynos/include/mach/entry-macro.S' using previous resolution.
1728 Resolved 'arch/arm/mach-s3c64xx/mach-crag6410.c' using previous resolution.
1729 Removing drivers/tty/serial/s5pv210.c
1730 Removing drivers/tty/serial/s3c6400.c
1731 Removing drivers/tty/serial/s3c2440.c
1732 Removing drivers/tty/serial/s3c2412.c
1733 Removing drivers/tty/serial/s3c2410.c
1734 Auto-merging drivers/rtc/rtc-s3c.c
1735 Auto-merging drivers/mmc/host/sdhci-s3c.c
1736 Removing arch/arm/mach-s5pv210/setup-sdhci.c
1737 Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
1738 Removing arch/arm/mach-s5pc100/setup-sdhci.c
1739 Removing arch/arm/mach-s3c64xx/setup-sdhci.c
1740 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
1741 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c
1742 Removing arch/arm/mach-s3c2416/setup-sdhci.c
1743 Removing arch/arm/mach-exynos/setup-sdhci.c
1744 Auto-merging arch/arm/mach-exynos/mach-origen.c
1745 Auto-merging arch/arm/mach-exynos/include/mach/entry-macro.S
1746 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S
1747 Auto-merging arch/arm/mach-exynos/cpu.c
1748 CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c
1749 Automatic merge failed; fix conflicts and then commit the result.
1750 $ git commit -v -a
1751 [master f52ff0f] Merge remote-tracking branch 's5p/for-next'
1752 $ git diff -M --stat --summary HEAD^..
1753  .../devicetree/bindings/arm/insignal-boards.txt    |    8 +
1754  .../devicetree/bindings/arm/samsung-boards.txt     |    8 +
1755  .../devicetree/bindings/dma/arm-pl330.txt          |   30 +
1756  .../devicetree/bindings/gpio/gpio-samsung.txt      |   40 ++
1757  .../devicetree/bindings/input/samsung-keypad.txt   |   88 +++
1758  Documentation/devicetree/bindings/rtc/s3c-rtc.txt  |   20 +
1759  .../devicetree/bindings/serial/samsung_uart.txt    |   14 +
1760  arch/arm/boot/dts/exynos4210-origen.dts            |  137 +++++
1761  arch/arm/boot/dts/exynos4210-smdkv310.dts          |  182 ++++++
1762  arch/arm/boot/dts/exynos4210.dtsi                  |  397 ++++++++++++
1763  arch/arm/mach-exynos/Kconfig                       |   24 +
1764  arch/arm/mach-exynos/Makefile                      |    6 +-
1765  arch/arm/mach-exynos/clock.c                       |  237 +++++---
1766  arch/arm/mach-exynos/cpu.c                         |   38 ++-
1767  arch/arm/mach-exynos/dma.c                         |  264 ++++-----
1768  arch/arm/mach-exynos/include/mach/io.h             |    5 +
1769  arch/arm/mach-exynos/include/mach/irqs.h           |   10 +-
1770  arch/arm/mach-exynos/include/mach/map.h            |    3 +-
1771  arch/arm/mach-exynos/init.c                        |   21 +-
1772  arch/arm/mach-exynos/mach-exynos4-dt.c             |   85 +++
1773  arch/arm/mach-exynos/mach-origen.c                 |   34 +
1774  arch/arm/mach-exynos/mct.c                         |   13 +-
1775  arch/arm/mach-exynos/pm.c                          |   24 +-
1776  arch/arm/mach-exynos/setup-sdhci.c                 |   22 -
1777  arch/arm/mach-s3c2410/mach-bast.c                  |   22 -
1778  arch/arm/mach-s3c2410/mach-vr1000.c                |   24 -
1779  arch/arm/mach-s3c2410/s3c2410.c                    |    6 +
1780  arch/arm/mach-s3c2412/clock.c                      |    7 +
1781  arch/arm/mach-s3c2416/Makefile                     |    1 -
1782  arch/arm/mach-s3c2416/clock.c                      |   68 ++-
1783  arch/arm/mach-s3c2416/setup-sdhci.c                |   24 -
1784  arch/arm/mach-s3c2440/clock.c                      |   44 ++
1785  arch/arm/mach-s3c2440/mach-anubis.c                |   22 +-
1786  arch/arm/mach-s3c2440/mach-at2440evb.c             |   22 +-
1787  arch/arm/mach-s3c2440/mach-mini2440.c              |   18 +
1788  arch/arm/mach-s3c2440/mach-osiris.c                |   24 +-
1789  arch/arm/mach-s3c2440/mach-rx1950.c                |   18 +-
1790  arch/arm/mach-s3c2440/mach-rx3715.c                |   19 +-
1791  arch/arm/mach-s3c64xx/Kconfig                      |    6 +-
1792  arch/arm/mach-s3c64xx/Makefile                     |    1 -
1793  arch/arm/mach-s3c64xx/clock.c                      |  263 +++++---
1794  arch/arm/mach-s3c64xx/dev-spi.c                    |    7 -
1795  arch/arm/mach-s3c64xx/include/mach/crag6410.h      |    6 +-
1796  arch/arm/mach-s3c64xx/include/mach/gpio.h          |    2 +-
1797  arch/arm/mach-s3c64xx/include/mach/irqs.h          |    2 +-
1798  arch/arm/mach-s3c64xx/mach-crag6410-module.c       |   56 ++-
1799  arch/arm/mach-s3c64xx/mach-crag6410.c              |   39 ++-
1800  arch/arm/mach-s3c64xx/pm.c                         |   15 +
1801  arch/arm/mach-s3c64xx/setup-sdhci.c                |   24 -
1802  arch/arm/mach-s5p64x0/clock-s5p6440.c              |   93 ++--
1803  arch/arm/mach-s5p64x0/clock-s5p6450.c              |   81 ++-
1804  arch/arm/mach-s5p64x0/dev-spi.c                    |    6 -
1805  arch/arm/mach-s5p64x0/dma.c                        |  227 ++-----
1806  arch/arm/mach-s5p64x0/include/mach/irqs.h          |    2 +
1807  arch/arm/mach-s5p64x0/init.c                       |   31 -
1808  arch/arm/mach-s5pc100/Makefile                     |    1 -
1809  arch/arm/mach-s5pc100/clock.c                      |  287 ++++++----
1810  arch/arm/mach-s5pc100/dev-spi.c                    |    7 -
1811  arch/arm/mach-s5pc100/dma.c                        |  247 +++------
1812  arch/arm/mach-s5pc100/include/mach/irqs.h          |    2 +
1813  arch/arm/mach-s5pc100/setup-sdhci.c                |   23 -
1814  arch/arm/mach-s5pv210/Makefile                     |    1 -
1815  arch/arm/mach-s5pv210/clock.c                      |  324 ++++++----
1816  arch/arm/mach-s5pv210/dev-spi.c                    |    6 -
1817  arch/arm/mach-s5pv210/dma.c                        |  241 +++------
1818  arch/arm/mach-s5pv210/include/mach/irqs.h          |    2 +
1819  arch/arm/mach-s5pv210/init.c                       |   19 -
1820  arch/arm/mach-s5pv210/mach-smdkv210.c              |    1 +
1821  arch/arm/mach-s5pv210/setup-sdhci.c                |   22 -
1822  arch/arm/plat-s3c24xx/dma.c                        |    3 +-
1823  arch/arm/plat-s3c24xx/s3c2443-clock.c              |   39 +-
1824  arch/arm/plat-samsung/Kconfig                      |    8 +
1825  arch/arm/plat-samsung/dev-backlight.c              |    1 -
1826  arch/arm/plat-samsung/dma-ops.c                    |   15 +-
1827  arch/arm/plat-samsung/include/plat/dma-ops.h       |    1 +
1828  arch/arm/plat-samsung/include/plat/dma-pl330.h     |   11 +-
1829  arch/arm/plat-samsung/include/plat/irqs.h          |    3 +-
1830  arch/arm/plat-samsung/include/plat/regs-serial.h   |   45 +-
1831  arch/arm/plat-samsung/include/plat/s3c64xx-spi.h   |    2 -
1832  arch/arm/plat-samsung/include/plat/sdhci.h         |   31 -
1833  drivers/dma/pl330.c                                |   99 ++--
1834  drivers/gpio/gpio-samsung.c                        |   72 +++
1835  drivers/input/keyboard/samsung-keypad.c            |  174 +++++-
1836  drivers/mmc/host/sdhci-s3c.c                       |    7 +-
1837  drivers/rtc/rtc-s3c.c                              |   21 +-
1838  drivers/spi/spi-s3c64xx.c                          |   14 +-
1839  drivers/tty/serial/Kconfig                         |   45 +--
1840  drivers/tty/serial/Makefile                        |    5 -
1841  drivers/tty/serial/s3c2410.c                       |  115 ----
1842  drivers/tty/serial/s3c2412.c                       |  149 -----
1843  drivers/tty/serial/s3c2440.c                       |  178 ------
1844  drivers/tty/serial/s3c6400.c                       |  149 -----
1845  drivers/tty/serial/s5pv210.c                       |  158 -----
1846  drivers/tty/serial/samsung.c                       |  639 ++++++++++++--------
1847  drivers/tty/serial/samsung.h                       |   32 +-
1848  include/linux/amba/pl330.h                         |   15 +-
1849  96 files changed, 3277 insertions(+), 2827 deletions(-)
1850  create mode 100644 Documentation/devicetree/bindings/arm/insignal-boards.txt
1851  create mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt
1852  create mode 100644 Documentation/devicetree/bindings/dma/arm-pl330.txt
1853  create mode 100644 Documentation/devicetree/bindings/gpio/gpio-samsung.txt
1854  create mode 100644 Documentation/devicetree/bindings/input/samsung-keypad.txt
1855  create mode 100644 Documentation/devicetree/bindings/rtc/s3c-rtc.txt
1856  create mode 100644 Documentation/devicetree/bindings/serial/samsung_uart.txt
1857  create mode 100644 arch/arm/boot/dts/exynos4210-origen.dts
1858  create mode 100644 arch/arm/boot/dts/exynos4210-smdkv310.dts
1859  create mode 100644 arch/arm/boot/dts/exynos4210.dtsi
1860  create mode 100644 arch/arm/mach-exynos/mach-exynos4-dt.c
1861  delete mode 100644 arch/arm/mach-exynos/setup-sdhci.c
1862  delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c
1863  delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c
1864  delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c
1865  delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.c
1866  delete mode 100644 drivers/tty/serial/s3c2410.c
1867  delete mode 100644 drivers/tty/serial/s3c2412.c
1868  delete mode 100644 drivers/tty/serial/s3c2440.c
1869  delete mode 100644 drivers/tty/serial/s3c6400.c
1870  delete mode 100644 drivers/tty/serial/s5pv210.c
1871 Merging tegra/for-next (2e35cf8 Merge branch 'for-3.3/cleanup' into for-next)
1872 $ git merge tegra/for-next
1873 Resolved 'arch/arm/mach-tegra/board-dt.c' using previous resolution.
1874 Resolved 'arch/arm/mach-tegra/include/mach/entry-macro.S' using previous resolution.
1875 Auto-merging arch/arm/mach-tegra/include/mach/entry-macro.S
1876 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/include/mach/entry-macro.S
1877 Auto-merging arch/arm/mach-tegra/board-paz00.c
1878 Auto-merging arch/arm/mach-tegra/board-dt.c
1879 CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt.c
1880 Automatic merge failed; fix conflicts and then commit the result.
1881 $ git commit -v -a
1882 [master b73ec30] Merge remote-tracking branch 'tegra/for-next'
1883 $ git diff -M --stat --summary HEAD^..
1884  .../devicetree/bindings/usb/tegra-usb.txt          |   13 ++++
1885  arch/arm/boot/dts/tegra-harmony.dts                |   29 ++++++--
1886  arch/arm/boot/dts/tegra-paz00.dts                  |   77 ++++++++++++++++++++
1887  arch/arm/boot/dts/tegra-seaboard.dts               |   49 +++++++++++--
1888  arch/arm/boot/dts/tegra-trimslice.dts              |   65 +++++++++++++++++
1889  arch/arm/boot/dts/tegra-ventana.dts                |   45 ++++++++++--
1890  arch/arm/boot/dts/tegra20.dtsi                     |   69 ++++++++++++------
1891  arch/arm/mach-tegra/Makefile                       |   28 ++++----
1892  arch/arm/mach-tegra/Makefile.boot                  |    2 +
1893  arch/arm/mach-tegra/board-dt.c                     |   47 +++++++++----
1894  arch/arm/mach-tegra/board-paz00-pinmux.c           |    2 +-
1895  arch/arm/mach-tegra/board-paz00.c                  |   27 +++++++
1896  arch/arm/mach-tegra/board-paz00.h                  |    3 +
1897  arch/arm/mach-tegra/include/mach/entry-macro.S     |   20 +-----
1898  arch/arm/mach-tegra/irq.c                          |   14 ++--
1899  arch/arm/mach-tegra/timer.c                        |   12 ++-
1900  drivers/usb/host/ehci-tegra.c                      |   71 ++++++++++++++++++
1901  17 files changed, 478 insertions(+), 95 deletions(-)
1902  create mode 100644 Documentation/devicetree/bindings/usb/tegra-usb.txt
1903  create mode 100644 arch/arm/boot/dts/tegra-paz00.dts
1904  create mode 100644 arch/arm/boot/dts/tegra-trimslice.dts
1905 Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
1906 $ git merge xilinx/arm-next
1907 Already up-to-date.
1908 Merging blackfin/for-linus (13fc35b blackfin: mac: dsa: add vlan mask in board file)
1909 $ git merge blackfin/for-linus
1910 Merge made by the 'recursive' strategy.
1911  arch/blackfin/configs/BF518F-EZBRD_defconfig      |    2 +-
1912  arch/blackfin/configs/BF526-EZBRD_defconfig       |    2 +-
1913  arch/blackfin/configs/BF527-AD7160-EVAL_defconfig |    2 +-
1914  arch/blackfin/configs/BF527-EZKIT-V2_defconfig    |    2 +-
1915  arch/blackfin/configs/BF527-EZKIT_defconfig       |    2 +-
1916  arch/blackfin/configs/BF533-EZKIT_defconfig       |    2 +-
1917  arch/blackfin/configs/BF533-STAMP_defconfig       |    2 +-
1918  arch/blackfin/configs/BF537-STAMP_defconfig       |    2 +-
1919  arch/blackfin/configs/BF538-EZKIT_defconfig       |    2 +-
1920  arch/blackfin/configs/BF548-EZKIT_defconfig       |    2 +-
1921  arch/blackfin/configs/BF561-ACVILON_defconfig     |    2 +-
1922  arch/blackfin/configs/BF561-EZKIT-SMP_defconfig   |    2 +-
1923  arch/blackfin/configs/BF561-EZKIT_defconfig       |    2 +-
1924  arch/blackfin/configs/BlackStamp_defconfig        |    2 +-
1925  arch/blackfin/configs/CM-BF527_defconfig          |    2 +-
1926  arch/blackfin/configs/CM-BF533_defconfig          |    2 +-
1927  arch/blackfin/configs/CM-BF537E_defconfig         |    2 +-
1928  arch/blackfin/configs/CM-BF537U_defconfig         |    2 +-
1929  arch/blackfin/configs/CM-BF548_defconfig          |    2 +-
1930  arch/blackfin/configs/CM-BF561_defconfig          |    2 +-
1931  arch/blackfin/configs/DNP5370_defconfig           |    2 +-
1932  arch/blackfin/configs/H8606_defconfig             |    2 +-
1933  arch/blackfin/configs/IP0X_defconfig              |    2 +-
1934  arch/blackfin/configs/PNAV-10_defconfig           |    2 +-
1935  arch/blackfin/configs/SRV1_defconfig              |    2 +-
1936  arch/blackfin/configs/TCM-BF518_defconfig         |    2 +-
1937  arch/blackfin/configs/TCM-BF537_defconfig         |    2 +-
1938  arch/blackfin/include/asm/bfin_serial.h           |    3 -
1939  arch/blackfin/include/asm/cpu.h                   |    3 +
1940  arch/blackfin/include/asm/smp.h                   |    5 +-
1941  arch/blackfin/kernel/setup.c                      |   16 ++-
1942  arch/blackfin/kernel/time-ts.c                    |   26 +++-
1943  arch/blackfin/mach-bf518/boards/ezbrd.c           |   10 +-
1944  arch/blackfin/mach-bf518/boards/tcm-bf518.c       |    4 +-
1945  arch/blackfin/mach-bf527/boards/ad7160eval.c      |    4 +-
1946  arch/blackfin/mach-bf527/boards/cm_bf527.c        |    4 +-
1947  arch/blackfin/mach-bf527/boards/ezbrd.c           |    4 +-
1948  arch/blackfin/mach-bf527/boards/ezkit.c           |    4 +-
1949  arch/blackfin/mach-bf527/boards/tll6527m.c        |    4 +-
1950  arch/blackfin/mach-bf533/boards/H8606.c           |    6 +-
1951  arch/blackfin/mach-bf533/boards/blackstamp.c      |    4 +-
1952  arch/blackfin/mach-bf533/boards/cm_bf533.c        |    6 +-
1953  arch/blackfin/mach-bf533/boards/ezkit.c           |    4 +-
1954  arch/blackfin/mach-bf533/boards/ip0x.c            |    4 +-
1955  arch/blackfin/mach-bf533/boards/stamp.c           |  177 +++++++++++++++++++--
1956  arch/blackfin/mach-bf537/boards/cm_bf537e.c       |    6 +-
1957  arch/blackfin/mach-bf537/boards/cm_bf537u.c       |    6 +-
1958  arch/blackfin/mach-bf537/boards/dnp5370.c         |    4 +-
1959  arch/blackfin/mach-bf537/boards/minotaur.c        |    6 +-
1960  arch/blackfin/mach-bf537/boards/pnav10.c          |    6 +-
1961  arch/blackfin/mach-bf537/boards/stamp.c           |    8 +-
1962  arch/blackfin/mach-bf537/boards/tcm_bf537.c       |    6 +-
1963  arch/blackfin/mach-bf538/boards/ezkit.c           |    6 +-
1964  arch/blackfin/mach-bf548/boards/cm_bf548.c        |    6 +-
1965  arch/blackfin/mach-bf548/boards/ezkit.c           |    4 +-
1966  arch/blackfin/mach-bf561/boards/acvilon.c         |    4 +-
1967  arch/blackfin/mach-bf561/boards/cm_bf561.c        |    6 +-
1968  arch/blackfin/mach-bf561/boards/ezkit.c           |    4 +-
1969  arch/blackfin/mach-bf561/include/mach/pll.h       |    4 +-
1970  arch/blackfin/mach-bf561/smp.c                    |    5 +-
1971  arch/blackfin/mach-common/smp.c                   |   61 +++++--
1972  61 files changed, 352 insertions(+), 132 deletions(-)
1973 Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS)
1974 $ git merge c6x/for-linux-next
1975 Auto-merging include/asm-generic/page.h
1976 Auto-merging MAINTAINERS
1977 Merge made by the 'recursive' strategy.
1978  Documentation/devicetree/bindings/c6x/clocks.txt   |   40 +
1979  Documentation/devicetree/bindings/c6x/dscr.txt     |  127 +++
1980  Documentation/devicetree/bindings/c6x/emifa.txt    |   62 ++
1981  .../devicetree/bindings/c6x/interrupt.txt          |  104 +++
1982  Documentation/devicetree/bindings/c6x/soc.txt      |   28 +
1983  Documentation/devicetree/bindings/c6x/timer64.txt  |   26 +
1984  MAINTAINERS                                        |    8 +
1985  arch/c6x/Kconfig                                   |  174 +++++
1986  arch/c6x/Makefile                                  |   60 ++
1987  arch/c6x/boot/Makefile                             |   30 +
1988  arch/c6x/boot/dts/dsk6455.dts                      |   62 ++
1989  arch/c6x/boot/dts/evmc6457.dts                     |   48 ++
1990  arch/c6x/boot/dts/evmc6472.dts                     |   73 ++
1991  arch/c6x/boot/dts/evmc6474.dts                     |   58 ++
1992  arch/c6x/boot/dts/tms320c6455.dtsi                 |   96 +++
1993  arch/c6x/boot/dts/tms320c6457.dtsi                 |   68 ++
1994  arch/c6x/boot/dts/tms320c6472.dtsi                 |  134 ++++
1995  arch/c6x/boot/dts/tms320c6474.dtsi                 |   89 +++
1996  arch/c6x/boot/linked_dtb.S                         |    2 +
1997  arch/c6x/configs/dsk6455_defconfig                 |   44 ++
1998  arch/c6x/configs/evmc6457_defconfig                |   41 +
1999  arch/c6x/configs/evmc6472_defconfig                |   42 +
2000  arch/c6x/configs/evmc6474_defconfig                |   42 +
2001  arch/c6x/include/asm/Kbuild                        |   54 ++
2002  arch/c6x/include/asm/asm-offsets.h                 |    1 +
2003  arch/c6x/include/asm/bitops.h                      |  105 +++
2004  arch/c6x/include/asm/byteorder.h                   |   12 +
2005  arch/c6x/include/asm/cache.h                       |   90 +++
2006  arch/c6x/include/asm/cacheflush.h                  |   65 ++
2007  arch/c6x/include/asm/checksum.h                    |   34 +
2008  arch/c6x/include/asm/clkdev.h                      |   22 +
2009  arch/c6x/include/asm/clock.h                       |  148 ++++
2010  arch/c6x/include/asm/delay.h                       |   67 ++
2011  arch/c6x/include/asm/dma-mapping.h                 |   91 +++
2012  arch/c6x/include/asm/dscr.h                        |   34 +
2013  arch/c6x/include/asm/elf.h                         |  113 +++
2014  arch/c6x/include/asm/ftrace.h                      |    6 +
2015  arch/c6x/include/asm/hardirq.h                     |   20 +
2016  arch/c6x/include/asm/irq.h                         |  302 ++++++++
2017  arch/c6x/include/asm/irqflags.h                    |   72 ++
2018  arch/c6x/include/asm/linkage.h                     |   30 +
2019  arch/c6x/include/asm/megamod-pic.h                 |    9 +
2020  arch/c6x/include/asm/memblock.h                    |    4 +
2021  arch/c6x/include/asm/mmu.h                         |   18 +
2022  arch/c6x/include/asm/module.h                      |   33 +
2023  arch/c6x/include/asm/mutex.h                       |    6 +
2024  arch/c6x/include/asm/page.h                        |   11 +
2025  arch/c6x/include/asm/pgtable.h                     |   81 ++
2026  arch/c6x/include/asm/processor.h                   |  132 ++++
2027  arch/c6x/include/asm/procinfo.h                    |   28 +
2028  arch/c6x/include/asm/prom.h                        |    1 +
2029  arch/c6x/include/asm/ptrace.h                      |  174 +++++
2030  arch/c6x/include/asm/sections.h                    |   12 +
2031  arch/c6x/include/asm/setup.h                       |   32 +
2032  arch/c6x/include/asm/sigcontext.h                  |   80 ++
2033  arch/c6x/include/asm/signal.h                      |   17 +
2034  arch/c6x/include/asm/soc.h                         |   35 +
2035  arch/c6x/include/asm/string.h                      |   21 +
2036  arch/c6x/include/asm/swab.h                        |   54 ++
2037  arch/c6x/include/asm/syscall.h                     |  123 +++
2038  arch/c6x/include/asm/syscalls.h                    |   55 ++
2039  arch/c6x/include/asm/system.h                      |  168 ++++
2040  arch/c6x/include/asm/thread_info.h                 |  121 +++
2041  arch/c6x/include/asm/timer64.h                     |    6 +
2042  arch/c6x/include/asm/timex.h                       |   33 +
2043  arch/c6x/include/asm/tlb.h                         |    8 +
2044  arch/c6x/include/asm/traps.h                       |   36 +
2045  arch/c6x/include/asm/uaccess.h                     |  107 +++
2046  arch/c6x/include/asm/unaligned.h                   |  170 +++++
2047  arch/c6x/include/asm/unistd.h                      |   26 +
2048  arch/c6x/kernel/Makefile                           |   12 +
2049  arch/c6x/kernel/asm-offsets.c                      |  123 +++
2050  arch/c6x/kernel/c6x_ksyms.c                        |   66 ++
2051  arch/c6x/kernel/devicetree.c                       |   53 ++
2052  arch/c6x/kernel/dma.c                              |  153 ++++
2053  arch/c6x/kernel/entry.S                            |  803 ++++++++++++++++++++
2054  arch/c6x/kernel/head.S                             |   84 ++
2055  arch/c6x/kernel/irq.c                              |  728 ++++++++++++++++++
2056  arch/c6x/kernel/module.c                           |  123 +++
2057  arch/c6x/kernel/process.c                          |  263 +++++++
2058  arch/c6x/kernel/ptrace.c                           |  187 +++++
2059  arch/c6x/kernel/setup.c                            |  498 ++++++++++++
2060  arch/c6x/kernel/signal.c                           |  377 +++++++++
2061  arch/c6x/kernel/soc.c                              |   91 +++
2062  arch/c6x/kernel/switch_to.S                        |   74 ++
2063  arch/c6x/kernel/sys_c6x.c                          |   74 ++
2064  arch/c6x/kernel/time.c                             |   65 ++
2065  arch/c6x/kernel/traps.c                            |  423 ++++++++++
2066  arch/c6x/kernel/vectors.S                          |   81 ++
2067  arch/c6x/kernel/vmlinux.lds.S                      |  162 ++++
2068  arch/c6x/lib/Makefile                              |    7 +
2069  arch/c6x/lib/checksum.c                            |   36 +
2070  arch/c6x/lib/csum_64plus.S                         |  419 ++++++++++
2071  arch/c6x/lib/divi.S                                |   53 ++
2072  arch/c6x/lib/divremi.S                             |   46 ++
2073  arch/c6x/lib/divremu.S                             |   87 +++
2074  arch/c6x/lib/divu.S                                |   98 +++
2075  arch/c6x/lib/llshl.S                               |   37 +
2076  arch/c6x/lib/llshr.S                               |   38 +
2077  arch/c6x/lib/llshru.S                              |   38 +
2078  arch/c6x/lib/memcpy_64plus.S                       |   46 ++
2079  arch/c6x/lib/mpyll.S                               |   49 ++
2080  arch/c6x/lib/negll.S                               |   31 +
2081  arch/c6x/lib/pop_rts.S                             |   32 +
2082  arch/c6x/lib/push_rts.S                            |   31 +
2083  arch/c6x/lib/remi.S                                |   64 ++
2084  arch/c6x/lib/remu.S                                |   82 ++
2085  arch/c6x/lib/strasgi.S                             |   89 +++
2086  arch/c6x/lib/strasgi_64plus.S                      |   39 +
2087  arch/c6x/mm/Makefile                               |    5 +
2088  arch/c6x/mm/dma-coherent.c                         |  143 ++++
2089  arch/c6x/mm/init.c                                 |  113 +++
2090  arch/c6x/platforms/Kconfig                         |   16 +
2091  arch/c6x/platforms/Makefile                        |   12 +
2092  arch/c6x/platforms/cache.c                         |  445 +++++++++++
2093  arch/c6x/platforms/dscr.c                          |  598 +++++++++++++++
2094  arch/c6x/platforms/emif.c                          |   88 +++
2095  arch/c6x/platforms/megamod-pic.c                   |  349 +++++++++
2096  arch/c6x/platforms/platform.c                      |   17 +
2097  arch/c6x/platforms/pll.c                           |  444 +++++++++++
2098  arch/c6x/platforms/plldata.c                       |  404 ++++++++++
2099  arch/c6x/platforms/timer64.c                       |  236 ++++++
2100  include/asm-generic/io.h                           |    2 +-
2101  include/asm-generic/page.h                         |   10 +-
2102  include/asm-generic/uaccess.h                      |    7 +-
2103  include/linux/elf-em.h                             |    1 +
2104  126 files changed, 12972 insertions(+), 5 deletions(-)
2105  create mode 100644 Documentation/devicetree/bindings/c6x/clocks.txt
2106  create mode 100644 Documentation/devicetree/bindings/c6x/dscr.txt
2107  create mode 100644 Documentation/devicetree/bindings/c6x/emifa.txt
2108  create mode 100644 Documentation/devicetree/bindings/c6x/interrupt.txt
2109  create mode 100644 Documentation/devicetree/bindings/c6x/soc.txt
2110  create mode 100644 Documentation/devicetree/bindings/c6x/timer64.txt
2111  create mode 100644 arch/c6x/Kconfig
2112  create mode 100644 arch/c6x/Makefile
2113  create mode 100644 arch/c6x/boot/Makefile
2114  create mode 100644 arch/c6x/boot/dts/dsk6455.dts
2115  create mode 100644 arch/c6x/boot/dts/evmc6457.dts
2116  create mode 100644 arch/c6x/boot/dts/evmc6472.dts
2117  create mode 100644 arch/c6x/boot/dts/evmc6474.dts
2118  create mode 100644 arch/c6x/boot/dts/tms320c6455.dtsi
2119  create mode 100644 arch/c6x/boot/dts/tms320c6457.dtsi
2120  create mode 100644 arch/c6x/boot/dts/tms320c6472.dtsi
2121  create mode 100644 arch/c6x/boot/dts/tms320c6474.dtsi
2122  create mode 100644 arch/c6x/boot/linked_dtb.S
2123  create mode 100644 arch/c6x/configs/dsk6455_defconfig
2124  create mode 100644 arch/c6x/configs/evmc6457_defconfig
2125  create mode 100644 arch/c6x/configs/evmc6472_defconfig
2126  create mode 100644 arch/c6x/configs/evmc6474_defconfig
2127  create mode 100644 arch/c6x/include/asm/Kbuild
2128  create mode 100644 arch/c6x/include/asm/asm-offsets.h
2129  create mode 100644 arch/c6x/include/asm/bitops.h
2130  create mode 100644 arch/c6x/include/asm/byteorder.h
2131  create mode 100644 arch/c6x/include/asm/cache.h
2132  create mode 100644 arch/c6x/include/asm/cacheflush.h
2133  create mode 100644 arch/c6x/include/asm/checksum.h
2134  create mode 100644 arch/c6x/include/asm/clkdev.h
2135  create mode 100644 arch/c6x/include/asm/clock.h
2136  create mode 100644 arch/c6x/include/asm/delay.h
2137  create mode 100644 arch/c6x/include/asm/dma-mapping.h
2138  create mode 100644 arch/c6x/include/asm/dscr.h
2139  create mode 100644 arch/c6x/include/asm/elf.h
2140  create mode 100644 arch/c6x/include/asm/ftrace.h
2141  create mode 100644 arch/c6x/include/asm/hardirq.h
2142  create mode 100644 arch/c6x/include/asm/irq.h
2143  create mode 100644 arch/c6x/include/asm/irqflags.h
2144  create mode 100644 arch/c6x/include/asm/linkage.h
2145  create mode 100644 arch/c6x/include/asm/megamod-pic.h
2146  create mode 100644 arch/c6x/include/asm/memblock.h
2147  create mode 100644 arch/c6x/include/asm/mmu.h
2148  create mode 100644 arch/c6x/include/asm/module.h
2149  create mode 100644 arch/c6x/include/asm/mutex.h
2150  create mode 100644 arch/c6x/include/asm/page.h
2151  create mode 100644 arch/c6x/include/asm/pgtable.h
2152  create mode 100644 arch/c6x/include/asm/processor.h
2153  create mode 100644 arch/c6x/include/asm/procinfo.h
2154  create mode 100644 arch/c6x/include/asm/prom.h
2155  create mode 100644 arch/c6x/include/asm/ptrace.h
2156  create mode 100644 arch/c6x/include/asm/sections.h
2157  create mode 100644 arch/c6x/include/asm/setup.h
2158  create mode 100644 arch/c6x/include/asm/sigcontext.h
2159  create mode 100644 arch/c6x/include/asm/signal.h
2160  create mode 100644 arch/c6x/include/asm/soc.h
2161  create mode 100644 arch/c6x/include/asm/string.h
2162  create mode 100644 arch/c6x/include/asm/swab.h
2163  create mode 100644 arch/c6x/include/asm/syscall.h
2164  create mode 100644 arch/c6x/include/asm/syscalls.h
2165  create mode 100644 arch/c6x/include/asm/system.h
2166  create mode 100644 arch/c6x/include/asm/thread_info.h
2167  create mode 100644 arch/c6x/include/asm/timer64.h
2168  create mode 100644 arch/c6x/include/asm/timex.h
2169  create mode 100644 arch/c6x/include/asm/tlb.h
2170  create mode 100644 arch/c6x/include/asm/traps.h
2171  create mode 100644 arch/c6x/include/asm/uaccess.h
2172  create mode 100644 arch/c6x/include/asm/unaligned.h
2173  create mode 100644 arch/c6x/include/asm/unistd.h
2174  create mode 100644 arch/c6x/kernel/Makefile
2175  create mode 100644 arch/c6x/kernel/asm-offsets.c
2176  create mode 100644 arch/c6x/kernel/c6x_ksyms.c
2177  create mode 100644 arch/c6x/kernel/devicetree.c
2178  create mode 100644 arch/c6x/kernel/dma.c
2179  create mode 100644 arch/c6x/kernel/entry.S
2180  create mode 100644 arch/c6x/kernel/head.S
2181  create mode 100644 arch/c6x/kernel/irq.c
2182  create mode 100644 arch/c6x/kernel/module.c
2183  create mode 100644 arch/c6x/kernel/process.c
2184  create mode 100644 arch/c6x/kernel/ptrace.c
2185  create mode 100644 arch/c6x/kernel/setup.c
2186  create mode 100644 arch/c6x/kernel/signal.c
2187  create mode 100644 arch/c6x/kernel/soc.c
2188  create mode 100644 arch/c6x/kernel/switch_to.S
2189  create mode 100644 arch/c6x/kernel/sys_c6x.c
2190  create mode 100644 arch/c6x/kernel/time.c
2191  create mode 100644 arch/c6x/kernel/traps.c
2192  create mode 100644 arch/c6x/kernel/vectors.S
2193  create mode 100644 arch/c6x/kernel/vmlinux.lds.S
2194  create mode 100644 arch/c6x/lib/Makefile
2195  create mode 100644 arch/c6x/lib/checksum.c
2196  create mode 100644 arch/c6x/lib/csum_64plus.S
2197  create mode 100644 arch/c6x/lib/divi.S
2198  create mode 100644 arch/c6x/lib/divremi.S
2199  create mode 100644 arch/c6x/lib/divremu.S
2200  create mode 100644 arch/c6x/lib/divu.S
2201  create mode 100644 arch/c6x/lib/llshl.S
2202  create mode 100644 arch/c6x/lib/llshr.S
2203  create mode 100644 arch/c6x/lib/llshru.S
2204  create mode 100644 arch/c6x/lib/memcpy_64plus.S
2205  create mode 100644 arch/c6x/lib/mpyll.S
2206  create mode 100644 arch/c6x/lib/negll.S
2207  create mode 100644 arch/c6x/lib/pop_rts.S
2208  create mode 100644 arch/c6x/lib/push_rts.S
2209  create mode 100644 arch/c6x/lib/remi.S
2210  create mode 100644 arch/c6x/lib/remu.S
2211  create mode 100644 arch/c6x/lib/strasgi.S
2212  create mode 100644 arch/c6x/lib/strasgi_64plus.S
2213  create mode 100644 arch/c6x/mm/Makefile
2214  create mode 100644 arch/c6x/mm/dma-coherent.c
2215  create mode 100644 arch/c6x/mm/init.c
2216  create mode 100644 arch/c6x/platforms/Kconfig
2217  create mode 100644 arch/c6x/platforms/Makefile
2218  create mode 100644 arch/c6x/platforms/cache.c
2219  create mode 100644 arch/c6x/platforms/dscr.c
2220  create mode 100644 arch/c6x/platforms/emif.c
2221  create mode 100644 arch/c6x/platforms/megamod-pic.c
2222  create mode 100644 arch/c6x/platforms/platform.c
2223  create mode 100644 arch/c6x/platforms/pll.c
2224  create mode 100644 arch/c6x/platforms/plldata.c
2225  create mode 100644 arch/c6x/platforms/timer64.c
2226 Merging cris/for-next (ea78f5b CRIS: Update documentation)
2227 $ git merge cris/for-next
2228 Auto-merging drivers/net/cris/eth_v10.c
2229 Auto-merging arch/cris/arch-v32/drivers/cryptocop.c
2230 Merge made by the 'recursive' strategy.
2231  Documentation/cris/README               |   62 +++++++++++++++---------------
2232  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
2233  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
2234  arch/cris/include/arch-v32/arch/cache.h |    2 +-
2235  drivers/net/cris/eth_v10.c              |    1 -
2236  5 files changed, 34 insertions(+), 39 deletions(-)
2237 Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
2238 $ git merge quilt/hexagon
2239 Merge made by the 'recursive' strategy.
2240  arch/hexagon/Kconfig                      |   23 ++++-------------------
2241  arch/hexagon/Makefile                     |    4 ----
2242  arch/hexagon/include/asm/spinlock_types.h |    2 --
2243  arch/hexagon/kernel/dma.c                 |    1 +
2244  arch/hexagon/kernel/ptrace.c              |    1 +
2245  arch/hexagon/kernel/time.c                |    7 +++----
2246  arch/hexagon/kernel/vdso.c                |    1 +
2247  7 files changed, 10 insertions(+), 29 deletions(-)
2248 Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions)
2249 $ git merge ia64/next
2250 Auto-merging drivers/firmware/efivars.c
2251 Merge made by the 'recursive' strategy.
2252  drivers/acpi/apei/erst.c   |    6 ++++--
2253  drivers/firmware/efivars.c |    8 +++++---
2254  fs/pstore/inode.c          |    3 ++-
2255  fs/pstore/platform.c       |   36 ++++--------------------------------
2256  include/linux/pstore.h     |   12 +++++-------
2257  5 files changed, 20 insertions(+), 45 deletions(-)
2258 Merging m68k/for-next (e71ef31 m68k/net: Remove obsolete IRQ_FLG_* users)
2259 $ git merge m68k/for-next
2260 Merge made by the 'recursive' strategy.
2261  arch/m68k/Kconfig.debug                 |   11 ++
2262  arch/m68k/Kconfig.devices               |    2 +-
2263  arch/m68k/atari/ataints.c               |    2 -
2264  arch/m68k/atari/debug.c                 |    1 -
2265  arch/m68k/configs/multi_defconfig       |    1 -
2266  arch/m68k/configs/mvme16x_defconfig     |    1 -
2267  arch/m68k/emu/nfeth.c                   |    2 +-
2268  arch/m68k/hp300/config.c                |    3 +-
2269  arch/m68k/include/asm/atarihw.h         |    2 +
2270  arch/m68k/include/asm/blinken.h         |    8 +-
2271  arch/m68k/include/asm/mac_baboon.h      |    6 +
2272  arch/m68k/include/asm/mac_iop.h         |    2 +
2273  arch/m68k/include/asm/mac_oss.h         |   23 +---
2274  arch/m68k/include/asm/mac_psc.h         |    4 +
2275  arch/m68k/include/asm/mac_via.h         |    9 +
2276  arch/m68k/include/asm/macintosh.h       |   10 +-
2277  arch/m68k/include/asm/macints.h         |    6 +-
2278  arch/m68k/include/asm/serial.h          |    2 +
2279  arch/m68k/include/asm/unistd.h          |   10 +-
2280  arch/m68k/kernel/head.S                 |  117 +++++++-------
2281  arch/m68k/mac/baboon.c                  |   41 +----
2282  arch/m68k/mac/config.c                  |   93 ++++++++----
2283  arch/m68k/mac/iop.c                     |    8 +-
2284  arch/m68k/mac/macints.c                 |  197 ++++++------------------
2285  arch/m68k/mac/oss.c                     |  157 +++++++-------------
2286  arch/m68k/mac/psc.c                     |   17 --
2287  arch/m68k/mac/via.c                     |  255 +++++++++++++++----------------
2288  arch/m68k/mvme16x/config.c              |  160 +++++++++++++++++++
2289  drivers/block/swim.c                    |    1 -
2290  drivers/net/ethernet/natsemi/macsonic.c |    7 +-
2291  drivers/scsi/mac_esp.c                  |    3 +-
2292  31 files changed, 577 insertions(+), 584 deletions(-)
2293 Merging m68knommu/for-next (4a7c080 m68knommu: remove unused anchor.h include file)
2294 $ git merge m68knommu/for-next
2295 Resolved 'arch/m68k/Kconfig.debug' using previous resolution.
2296 Removing arch/m68k/lib/checksum_no.c
2297 Removing arch/m68k/include/asm/anchor.h
2298 Auto-merging arch/m68k/Kconfig.debug
2299 CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug
2300 Automatic merge failed; fix conflicts and then commit the result.
2301 $ git commit -v -a
2302 [master 97818a7] Merge remote-tracking branch 'm68knommu/for-next'
2303 $ git diff -M --stat --summary HEAD^..
2304  arch/m68k/Kconfig                           |    7 +-
2305  arch/m68k/Kconfig.cpu                       |    8 ++
2306  arch/m68k/Kconfig.debug                     |   16 ++--
2307  arch/m68k/include/asm/anchor.h              |  112 -------------------
2308  arch/m68k/include/asm/checksum.h            |   31 +-----
2309  arch/m68k/include/asm/div64.h               |    8 +-
2310  arch/m68k/include/asm/gpio.h                |    3 +-
2311  arch/m68k/include/asm/processor.h           |    2 -
2312  arch/m68k/include/asm/sigcontext.h          |    4 -
2313  arch/m68k/include/asm/thread_info.h         |   30 -----
2314  arch/m68k/include/asm/traps.h               |    1 +
2315  arch/m68k/include/asm/ucontext.h            |    4 -
2316  arch/m68k/kernel/Makefile                   |    7 +-
2317  arch/m68k/kernel/asm-offsets.c              |    3 +-
2318  arch/m68k/kernel/entry_mm.S                 |   31 ++++--
2319  arch/m68k/kernel/entry_no.S                 |    6 -
2320  arch/m68k/kernel/init_task.c                |    3 +-
2321  arch/m68k/kernel/m68k_ksyms.c               |    2 +-
2322  arch/m68k/kernel/process_mm.c               |   16 ---
2323  arch/m68k/kernel/setup_mm.c                 |    4 +
2324  arch/m68k/kernel/setup_no.c                 |    1 -
2325  arch/m68k/kernel/time_no.c                  |    3 +
2326  arch/m68k/kernel/vmlinux-std.lds            |    2 +
2327  arch/m68k/kernel/vmlinux-sun3.lds           |    2 +
2328  arch/m68k/lib/Makefile                      |   10 +-
2329  arch/m68k/lib/{checksum_mm.c => checksum.c} |    0
2330  arch/m68k/lib/checksum_no.c                 |  156 ---------------------------
2331  arch/m68k/mm/init_mm.c                      |   34 ++++++
2332  arch/m68k/platform/68328/timers.c           |    4 +-
2333  arch/m68k/platform/coldfire/dma_timer.c     |    5 +-
2334  arch/m68k/platform/coldfire/entry.S         |    1 -
2335  arch/m68k/platform/coldfire/head.S          |    6 +-
2336  arch/m68k/platform/coldfire/pit.c           |    4 +-
2337  arch/m68k/platform/coldfire/sltimers.c      |   13 ++-
2338  arch/m68k/platform/coldfire/timers.c        |    4 +-
2339  35 files changed, 125 insertions(+), 418 deletions(-)
2340  delete mode 100644 arch/m68k/include/asm/anchor.h
2341  rename arch/m68k/lib/{checksum_mm.c => checksum.c} (100%)
2342  delete mode 100644 arch/m68k/lib/checksum_no.c
2343 Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh)
2344 $ git merge microblaze/next
2345 Already up-to-date.
2346 Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next)
2347 $ git merge mips/mips-for-linux-next
2348 Auto-merging drivers/tty/serial/Makefile
2349 Auto-merging drivers/tty/serial/Kconfig
2350 Removing drivers/staging/octeon/cvmx-smix-defs.h
2351 Removing drivers/staging/octeon/cvmx-packet.h
2352 Auto-merging drivers/spi/Kconfig
2353 Removing drivers/pcmcia/au1000_pb1x00.c
2354 Removing drivers/pcmcia/au1000_generic.h
2355 Removing drivers/pcmcia/au1000_generic.c
2356 Removing drivers/net/irda/au1000_ircc.h
2357 Auto-merging arch/mips/netlogic/xlr/wakeup.c
2358 Removing arch/mips/netlogic/xlr/irq.c
2359 Auto-merging arch/mips/netlogic/common/time.c
2360 Auto-merging arch/mips/netlogic/common/smp.c
2361 Auto-merging arch/mips/kernel/perf_event_mipsxx.c
2362 CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c
2363 Auto-merging arch/mips/include/asm/octeon/cvmx-helper.h
2364 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-xaui.h
2365 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-spi.h
2366 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-sgmii.h
2367 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-rgmii.h
2368 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-npi.h
2369 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-loop.h
2370 Auto-merging arch/mips/include/asm/octeon/cvmx-helper-board.h
2371 Auto-merging arch/mips/include/asm/octeon/cvmx-config.h
2372 Auto-merging arch/mips/include/asm/netlogic/xlp-hal/xlp.h
2373 Removing arch/mips/include/asm/mach-pb1x00/pb1550.h
2374 Removing arch/mips/include/asm/mach-pb1x00/pb1200.h
2375 Removing arch/mips/include/asm/mach-pb1x00/pb1000.h
2376 Removing arch/mips/include/asm/mach-pb1x00/mc146818rtc.h
2377 Removing arch/mips/include/asm/mach-db1x00/db1x00.h
2378 Removing arch/mips/configs/pb1200_defconfig
2379 Removing arch/mips/configs/db1500_defconfig
2380 Removing arch/mips/configs/db1100_defconfig
2381 Auto-merging arch/mips/cavium-octeon/executive/cvmx-spi.c
2382 Auto-merging arch/mips/cavium-octeon/executive/cvmx-pko.c
2383 Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-rsl.c
2384 Auto-merging arch/mips/cavium-octeon/executive/cvmx-interrupt-decodes.c
2385 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper.c
2386 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c
2387 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c
2388 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-spi.c
2389 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c
2390 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c
2391 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-npi.c
2392 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-loop.c
2393 Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-board.c
2394 Auto-merging arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c
2395 Auto-merging arch/mips/ath79/dev-usb.h
2396 Removing arch/mips/ath79/dev-ar913x-wmac.c
2397 Removing arch/mips/alchemy/xxs1500/platform.c
2398 Removing arch/mips/alchemy/xxs1500/init.c
2399 Removing arch/mips/alchemy/xxs1500/board_setup.c
2400 Removing arch/mips/alchemy/xxs1500/Makefile
2401 Removing arch/mips/alchemy/mtx-1/init.c
2402 Removing arch/mips/alchemy/mtx-1/board_setup.c
2403 Removing arch/mips/alchemy/mtx-1/Makefile
2404 Removing arch/mips/alchemy/gpr/init.c
2405 Removing arch/mips/alchemy/gpr/board_setup.c
2406 Removing arch/mips/alchemy/gpr/Makefile
2407 Removing arch/mips/alchemy/devboards/pb1550/board_setup.c
2408 Removing arch/mips/alchemy/devboards/pb1550/Makefile
2409 Auto-merging arch/mips/alchemy/devboards/pb1550.c
2410 Removing arch/mips/alchemy/devboards/pb1500/platform.c
2411 Removing arch/mips/alchemy/devboards/pb1500/Makefile
2412 Auto-merging arch/mips/alchemy/devboards/pb1500.c
2413 Removing arch/mips/alchemy/devboards/pb1200/platform.c
2414 Removing arch/mips/alchemy/devboards/pb1200/board_setup.c
2415 Removing arch/mips/alchemy/devboards/pb1200/Makefile
2416 Removing arch/mips/alchemy/devboards/pb1100/platform.c
2417 Removing arch/mips/alchemy/devboards/pb1100/Makefile
2418 Auto-merging arch/mips/alchemy/devboards/pb1100.c
2419 Removing arch/mips/alchemy/devboards/pb1000/board_setup.c
2420 Removing arch/mips/alchemy/devboards/pb1000/Makefile
2421 Removing arch/mips/alchemy/devboards/db1x00/platform.c
2422 Removing arch/mips/alchemy/devboards/db1x00/board_setup.c
2423 Removing arch/mips/alchemy/devboards/db1x00/Makefile
2424 Removing arch/mips/alchemy/devboards/db1200/setup.c
2425 Removing arch/mips/alchemy/devboarResolved 'arch/mips/kernel/perf_event_mipsxx.c' using previous resolution.
2426 ds/db1200/Makefile
2427 Auto-merging arch/mips/alchemy/devboards/db1200.c
2428 Auto-merging arch/mips/alchemy/board-mtx1.c
2429 Auto-merging arch/mips/alchemy/board-gpr.c
2430 Automatic merge failed; fix conflicts and then commit the result.
2431 $ git commit -v -a
2432 [master e2ec167] Merge remote-tracking branch 'mips/mips-for-linux-next'
2433 $ git diff -M --stat --summary HEAD^..
2434  arch/mips/Kconfig                                  |   84 +-
2435  arch/mips/Makefile                                 |    1 +
2436  arch/mips/alchemy/Kconfig                          |   60 +-
2437  arch/mips/alchemy/Makefile                         |    3 +
2438  arch/mips/alchemy/Platform                         |   58 +-
2439  arch/mips/alchemy/{gpr/platform.c => board-gpr.c}  |   81 +-
2440  .../alchemy/{mtx-1/platform.c => board-mtx1.c}     |   93 +-
2441  arch/mips/alchemy/board-xxs1500.c                  |  154 ++
2442  arch/mips/alchemy/common/Makefile                  |    4 +-
2443  arch/mips/alchemy/common/dbdma.c                   |   49 +-
2444  arch/mips/alchemy/common/gpiolib.c                 |   42 +
2445  arch/mips/alchemy/common/irq.c                     |  875 ++++++---
2446  arch/mips/alchemy/common/platform.c                |   31 +-
2447  arch/mips/alchemy/common/power.c                   |    3 +
2448  arch/mips/alchemy/common/sleeper.S                 |   73 +
2449  arch/mips/alchemy/common/time.c                    |    3 +-
2450  arch/mips/alchemy/common/vss.c                     |   84 +
2451  arch/mips/alchemy/devboards/Makefile               |   19 +-
2452  arch/mips/alchemy/devboards/bcsr.c                 |   11 +-
2453  arch/mips/alchemy/devboards/db1000.c               |  565 +++++
2454  .../devboards/{db1200/platform.c => db1200.c}      |  401 +++-
2455  arch/mips/alchemy/devboards/db1200/Makefile        |    1 -
2456  arch/mips/alchemy/devboards/db1200/setup.c         |   81 -
2457  arch/mips/alchemy/devboards/db1300.c               |  785 +++++++
2458  arch/mips/alchemy/devboards/db1550.c               |  498 +++++
2459  arch/mips/alchemy/devboards/db1x00/Makefile        |    8 -
2460  arch/mips/alchemy/devboards/db1x00/board_setup.c   |  229 --
2461  arch/mips/alchemy/devboards/db1x00/platform.c      |  316 ---
2462  arch/mips/alchemy/devboards/pb1000/Makefile        |    8 -
2463  arch/mips/alchemy/devboards/pb1000/board_setup.c   |  209 --
2464  .../devboards/{pb1100/board_setup.c => pb1100.c}   |   92 +-
2465  arch/mips/alchemy/devboards/pb1100/Makefile        |    8 -
2466  arch/mips/alchemy/devboards/pb1100/platform.c      |   77 -
2467  arch/mips/alchemy/devboards/pb1200/Makefile        |    5 -
2468  arch/mips/alchemy/devboards/pb1200/board_setup.c   |  174 --
2469  arch/mips/alchemy/devboards/pb1200/platform.c      |  339 ---
2470  .../devboards/{pb1500/board_setup.c => pb1500.c}   |  113 +-
2471  arch/mips/alchemy/devboards/pb1500/Makefile        |    8 -
2472  arch/mips/alchemy/devboards/pb1500/platform.c      |   94 -
2473  .../devboards/{pb1550/platform.c => pb1550.c}      |  112 +-
2474  arch/mips/alchemy/devboards/pb1550/Makefile        |    8 -
2475  arch/mips/alchemy/devboards/pb1550/board_setup.c   |   80 -
2476  arch/mips/alchemy/devboards/platform.c             |   13 +-
2477  arch/mips/alchemy/devboards/prom.c                 |   11 +-
2478  arch/mips/alchemy/gpr/Makefile                     |    8 -
2479  arch/mips/alchemy/gpr/board_setup.c                |   75 -
2480  arch/mips/alchemy/gpr/init.c                       |   63 -
2481  arch/mips/alchemy/mtx-1/Makefile                   |    9 -
2482  arch/mips/alchemy/mtx-1/board_setup.c              |   94 -
2483  arch/mips/alchemy/mtx-1/init.c                     |   66 -
2484  arch/mips/alchemy/xxs1500/Makefile                 |    8 -
2485  arch/mips/alchemy/xxs1500/board_setup.c            |   93 -
2486  arch/mips/alchemy/xxs1500/init.c                   |   63 -
2487  arch/mips/alchemy/xxs1500/platform.c               |   63 -
2488  arch/mips/ar7/gpio.c                               |    2 +-
2489  arch/mips/ar7/platform.c                           |   39 +-
2490  arch/mips/ar7/prom.c                               |    4 +-
2491  arch/mips/ar7/setup.c                              |    2 +-
2492  arch/mips/ath79/Kconfig                            |   38 +-
2493  arch/mips/ath79/Makefile                           |    5 +-
2494  arch/mips/ath79/clock.c                            |   55 +
2495  arch/mips/ath79/common.c                           |    5 +
2496  arch/mips/ath79/dev-ar913x-wmac.c                  |   60 -
2497  arch/mips/ath79/dev-common.c                       |   38 +-
2498  arch/mips/ath79/dev-usb.c                          |  197 ++
2499  arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h}   |   10 +-
2500  arch/mips/ath79/dev-wmac.c                         |  109 +
2501  arch/mips/ath79/dev-wmac.h                         |   17 +
2502  arch/mips/ath79/early_printk.c                     |   76 +-
2503  arch/mips/ath79/gpio.c                             |    2 +
2504  arch/mips/ath79/irq.c                              |   17 +-
2505  arch/mips/ath79/mach-ap121.c                       |   92 +
2506  arch/mips/ath79/mach-ap81.c                        |    6 +-
2507  arch/mips/ath79/mach-pb44.c                        |    2 +
2508  arch/mips/ath79/mach-ubnt-xm.c                     |  119 ++
2509  arch/mips/ath79/machtypes.h                        |    2 +
2510  arch/mips/ath79/setup.c                            |   22 +-
2511  arch/mips/bcm47xx/setup.c                          |    4 +-
2512  arch/mips/bcm63xx/Kconfig                          |    4 +
2513  arch/mips/bcm63xx/boards/board_bcm963xx.c          |   46 +-
2514  arch/mips/bcm63xx/clk.c                            |   70 +-
2515  arch/mips/bcm63xx/cpu.c                            |  261 +--
2516  arch/mips/bcm63xx/dev-uart.c                       |    2 +-
2517  arch/mips/bcm63xx/gpio.c                           |   41 +-
2518  arch/mips/bcm63xx/irq.c                            |  403 +++-
2519  arch/mips/bcm63xx/prom.c                           |    7 +-
2520  arch/mips/bcm63xx/setup.c                          |   32 +-
2521  arch/mips/boot/compressed/uart-alchemy.c           |    5 +-
2522  arch/mips/cavium-octeon/Kconfig                    |    4 -
2523  arch/mips/cavium-octeon/dma-octeon.c               |   23 +-
2524  arch/mips/cavium-octeon/executive/Makefile         |    7 +-
2525  .../mips/cavium-octeon/executive}/cvmx-cmd-queue.c |    8 +-
2526  .../mips/cavium-octeon/executive}/cvmx-fpa.c       |    0
2527  .../cavium-octeon/executive}/cvmx-helper-board.c   |   38 +-
2528  .../cavium-octeon/executive}/cvmx-helper-fpa.c     |    0
2529  .../cavium-octeon/executive}/cvmx-helper-loop.c    |    6 +-
2530  .../cavium-octeon/executive}/cvmx-helper-npi.c     |    6 +-
2531  .../cavium-octeon/executive}/cvmx-helper-rgmii.c   |   17 +-
2532  .../cavium-octeon/executive}/cvmx-helper-sgmii.c   |   18 +-
2533  .../cavium-octeon/executive}/cvmx-helper-spi.c     |   20 +-
2534  .../cavium-octeon/executive}/cvmx-helper-util.c    |   16 +-
2535  .../cavium-octeon/executive}/cvmx-helper-xaui.c    |   32 +-
2536  .../mips/cavium-octeon/executive}/cvmx-helper.c    |  120 +-
2537  .../executive}/cvmx-interrupt-decodes.c            |   10 +-
2538  .../cavium-octeon/executive}/cvmx-interrupt-rsl.c  |    4 +-
2539  .../mips/cavium-octeon/executive}/cvmx-pko.c       |    8 +-
2540  .../mips/cavium-octeon/executive}/cvmx-spi.c       |   12 +-
2541  arch/mips/cavium-octeon/executive/octeon-model.c   |  119 +-
2542  arch/mips/cavium-octeon/setup.c                    |   14 +-
2543  arch/mips/cavium-octeon/smp.c                      |    2 +-
2544  arch/mips/configs/db1000_defconfig                 |  369 +++-
2545  arch/mips/configs/db1100_defconfig                 |  122 --
2546  arch/mips/configs/db1300_defconfig                 |  391 ++++
2547  arch/mips/configs/db1500_defconfig                 |  128 --
2548  arch/mips/configs/db1550_defconfig                 |  288 ++-
2549  arch/mips/configs/nlm_xlp_defconfig                |  570 +++++
2550  arch/mips/configs/nlm_xlr_defconfig                |   16 +-
2551  arch/mips/configs/pb1200_defconfig                 |  170 --
2552  arch/mips/dec/setup.c                              |    1 -
2553  arch/mips/include/asm/bmips.h                      |  110 +
2554  arch/mips/include/asm/bootinfo.h                   |    1 +
2555  arch/mips/include/asm/branch.h                     |    5 +
2556  arch/mips/include/asm/cpu.h                        |    6 +-
2557  arch/mips/include/asm/gio_device.h                 |   56 +
2558  arch/mips/include/asm/hazards.h                    |    7 +-
2559  arch/mips/include/asm/hugetlb.h                    |    2 +-
2560  arch/mips/include/asm/kprobes.h                    |    5 +
2561  arch/mips/include/asm/mach-ath79/ar71xx_regs.h     |   81 +-
2562  arch/mips/include/asm/mach-ath79/ar933x_uart.h     |   67 +
2563  .../include/asm/mach-ath79/ar933x_uart_platform.h  |   18 +
2564  arch/mips/include/asm/mach-ath79/ath79.h           |   11 +-
2565  arch/mips/include/asm/mach-ath79/irq.h             |    8 +-
2566  arch/mips/include/asm/mach-ath79/pci-ath724x.h     |   21 +
2567  arch/mips/include/asm/mach-au1x00/au1000.h         |  273 ++-
2568  arch/mips/include/asm/mach-au1x00/au1100_mmc.h     |    2 +
2569  arch/mips/include/asm/mach-au1x00/au1200fb.h       |   14 +
2570  arch/mips/include/asm/mach-au1x00/au1550nd.h       |   16 +
2571  arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h   |   31 +
2572  .../asm/mach-au1x00/cpu-feature-overrides.h        |    3 +
2573  arch/mips/include/asm/mach-au1x00/gpio-au1300.h    |  241 +++
2574  arch/mips/include/asm/mach-au1x00/gpio.h           |    3 +
2575  arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h   |  597 ++++--
2576  arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h  |    2 +
2577  arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h    |    2 +
2578  arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h   |   12 +-
2579  arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h  |  231 ++-
2580  arch/mips/include/asm/mach-bcm63xx/ioremap.h       |   42 +
2581  arch/mips/include/asm/mach-bcm63xx/irq.h           |    7 +
2582  arch/mips/include/asm/mach-db1x00/bcsr.h           |   36 +-
2583  arch/mips/include/asm/mach-db1x00/db1200.h         |   11 +-
2584  arch/mips/include/asm/mach-db1x00/db1300.h         |   40 +
2585  arch/mips/include/asm/mach-db1x00/db1x00.h         |   79 -
2586  arch/mips/include/asm/mach-db1x00/irq.h            |   23 +
2587  arch/mips/include/asm/mach-generic/floppy.h        |    2 +-
2588  arch/mips/include/asm/mach-jazz/floppy.h           |    2 +-
2589  .../asm/mach-netlogic/cpu-feature-overrides.h      |   23 +-
2590  arch/mips/include/asm/mach-pb1x00/mc146818rtc.h    |   34 -
2591  arch/mips/include/asm/mach-pb1x00/pb1000.h         |   87 -
2592  arch/mips/include/asm/mach-pb1x00/pb1200.h         |  139 --
2593  arch/mips/include/asm/mach-pb1x00/pb1550.h         |   73 -
2594  arch/mips/include/asm/mipsregs.h                   |    9 +-
2595  arch/mips/include/asm/module.h                     |    6 +-
2596  arch/mips/include/asm/netlogic/common.h            |   76 +
2597  arch/mips/include/asm/netlogic/haldefs.h           |  163 ++
2598  arch/mips/include/asm/netlogic/xlp-hal/bridge.h    |  187 ++
2599  .../mips/include/asm/netlogic/xlp-hal/cpucontrol.h |   83 +
2600  arch/mips/include/asm/netlogic/xlp-hal/iomap.h     |  153 ++
2601  arch/mips/include/asm/netlogic/xlp-hal/pic.h       |  411 ++++
2602  arch/mips/include/asm/netlogic/xlp-hal/sys.h       |  129 ++
2603  arch/mips/include/asm/netlogic/xlp-hal/uart.h      |  191 ++
2604  .../asm/netlogic/xlp-hal/xlp.h}                    |   25 +-
2605  arch/mips/include/asm/netlogic/xlr/iomap.h         |   22 -
2606  arch/mips/include/asm/netlogic/xlr/msidef.h        |   84 +
2607  arch/mips/include/asm/netlogic/xlr/pic.h           |   69 +-
2608  arch/mips/include/asm/netlogic/xlr/xlr.h           |   13 +-
2609  .../mips/include/asm}/octeon/cvmx-address.h        |    0
2610  .../mips/include/asm}/octeon/cvmx-asxx-defs.h      |    0
2611  arch/mips/include/asm/octeon/cvmx-bootinfo.h       |   82 +-
2612  .../mips/include/asm}/octeon/cvmx-cmd-queue.h      |    0
2613  .../mips/include/asm}/octeon/cvmx-config.h         |    1 -
2614  .../mips/include/asm}/octeon/cvmx-dbg-defs.h       |    0
2615  arch/mips/include/asm/octeon/cvmx-dpi-defs.h       |  643 ++++++
2616  .../mips/include/asm}/octeon/cvmx-fau.h            |    0
2617  .../mips/include/asm}/octeon/cvmx-fpa-defs.h       |    0
2618  .../mips/include/asm}/octeon/cvmx-fpa.h            |    0
2619  .../mips/include/asm}/octeon/cvmx-gmxx-defs.h      |    0
2620  .../mips/include/asm}/octeon/cvmx-helper-board.h   |    6 +
2621  .../mips/include/asm}/octeon/cvmx-helper-fpa.h     |    0
2622  .../mips/include/asm}/octeon/cvmx-helper-loop.h    |    1 +
2623  .../mips/include/asm}/octeon/cvmx-helper-npi.h     |    1 +
2624  .../mips/include/asm}/octeon/cvmx-helper-rgmii.h   |    1 +
2625  .../mips/include/asm}/octeon/cvmx-helper-sgmii.h   |    1 +
2626  .../mips/include/asm}/octeon/cvmx-helper-spi.h     |    1 +
2627  .../mips/include/asm}/octeon/cvmx-helper-util.h    |    0
2628  .../mips/include/asm}/octeon/cvmx-helper-xaui.h    |    1 +
2629  .../mips/include/asm}/octeon/cvmx-helper.h         |    1 +
2630  .../mips/include/asm}/octeon/cvmx-ipd.h            |    0
2631  .../mips/include/asm}/octeon/cvmx-mdio.h           |    0
2632  arch/mips/include/asm/octeon/cvmx-mio-defs.h       | 1033 +++++++++-
2633  arch/mips/include/asm/octeon/cvmx-npei-defs.h      |    4 +-
2634  arch/mips/include/asm/octeon/cvmx-pciercx-defs.h   |  609 +++++-
2635  .../mips/include/asm}/octeon/cvmx-pcsx-defs.h      |    0
2636  .../mips/include/asm}/octeon/cvmx-pcsxx-defs.h     |    0
2637  arch/mips/include/asm/octeon/cvmx-pemx-defs.h      |  509 +++++
2638  arch/mips/include/asm/octeon/cvmx-pexp-defs.h      |   19 +-
2639  .../mips/include/asm}/octeon/cvmx-pip-defs.h       |    0
2640  .../mips/include/asm}/octeon/cvmx-pip.h            |    0
2641  .../mips/include/asm}/octeon/cvmx-pko-defs.h       |    0
2642  .../mips/include/asm}/octeon/cvmx-pko.h            |    0
2643  .../mips/include/asm}/octeon/cvmx-pow.h            |    0
2644  .../mips/include/asm}/octeon/cvmx-scratch.h        |    0
2645  arch/mips/include/asm/octeon/cvmx-sli-defs.h       | 2172 ++++++++++++++++++++
2646  .../mips/include/asm}/octeon/cvmx-spi.h            |    0
2647  .../mips/include/asm}/octeon/cvmx-spxx-defs.h      |    0
2648  arch/mips/include/asm/octeon/cvmx-sriox-defs.h     | 1036 ++++++++++
2649  .../mips/include/asm}/octeon/cvmx-srxx-defs.h      |    0
2650  .../mips/include/asm}/octeon/cvmx-stxx-defs.h      |    0
2651  .../mips/include/asm}/octeon/cvmx-wqe.h            |    0
2652  arch/mips/include/asm/octeon/cvmx.h                |   42 +-
2653  arch/mips/include/asm/octeon/octeon-feature.h      |  114 +-
2654  arch/mips/include/asm/octeon/octeon-model.h        |  215 +--
2655  arch/mips/include/asm/octeon/pci-octeon.h          |    3 +-
2656  arch/mips/include/asm/pgtable-32.h                 |   18 +-
2657  arch/mips/include/asm/tlbmisc.h                    |   10 +
2658  arch/mips/include/asm/traps.h                      |   13 +
2659  arch/mips/jazz/irq.c                               |    3 +-
2660  arch/mips/jazz/setup.c                             |    1 +
2661  arch/mips/jz4740/board-qi_lb60.c                   |    2 +-
2662  arch/mips/kernel/Makefile                          |    2 +
2663  arch/mips/kernel/bmips_vec.S                       |  255 +++
2664  arch/mips/kernel/branch.c                          |  128 +-
2665  arch/mips/kernel/cevt-bcm1480.c                    |    2 +-
2666  arch/mips/kernel/cevt-ds1287.c                     |    2 +-
2667  arch/mips/kernel/cevt-gt641xx.c                    |    2 +-
2668  arch/mips/kernel/cevt-r4k.c                        |    2 +-
2669  arch/mips/kernel/cevt-sb1250.c                     |    2 +-
2670  arch/mips/kernel/cevt-txx9.c                       |    2 +-
2671  arch/mips/kernel/cpu-probe.c                       |   28 +-
2672  arch/mips/kernel/i8253.c                           |    2 +-
2673  arch/mips/kernel/kprobes.c                         |  177 ++-
2674  arch/mips/kernel/perf_event_mipsxx.c               |   72 +-
2675  arch/mips/kernel/rtlx.c                            |    1 -
2676  arch/mips/kernel/setup.c                           |   43 +-
2677  arch/mips/kernel/smp-bmips.c                       |  458 ++++
2678  arch/mips/kernel/smtc.c                            |    6 +-
2679  arch/mips/kernel/traps.c                           |   16 +-
2680  arch/mips/lantiq/clk.c                             |    4 +-
2681  arch/mips/lantiq/irq.c                             |   13 +-
2682  arch/mips/lantiq/xway/dma.c                        |    6 +-
2683  arch/mips/lantiq/xway/ebu.c                        |    6 +-
2684  arch/mips/lantiq/xway/pmu.c                        |    8 +-
2685  arch/mips/lantiq/xway/reset.c                      |    6 +-
2686  arch/mips/lib/Makefile                             |    1 +
2687  arch/mips/loongson/common/cs5536/cs5536_mfgpt.c    |    2 +-
2688  arch/mips/math-emu/cp1emu.c                        |    2 +-
2689  arch/mips/mm/Makefile                              |    5 +-
2690  arch/mips/mm/c-octeon.c                            |    2 +-
2691  arch/mips/mm/c-r4k.c                               |    3 +
2692  arch/mips/mm/gup.c                                 |  315 +++
2693  arch/mips/mm/init.c                                |    9 +-
2694  arch/mips/mm/tlb-r3k.c                             |    1 +
2695  arch/mips/mm/tlb-r4k.c                             |   68 +-
2696  arch/mips/mti-malta/malta-int.c                    |    4 +-
2697  arch/mips/netlogic/Kconfig                         |    3 -
2698  arch/mips/netlogic/Makefile                        |    3 +
2699  arch/mips/netlogic/Platform                        |   13 +-
2700  arch/mips/netlogic/common/Makefile                 |    3 +
2701  arch/mips/netlogic/common/earlycons.c              |   60 +
2702  arch/mips/netlogic/common/irq.c                    |  238 +++
2703  arch/mips/netlogic/{xlr => common}/smp.c           |  152 +-
2704  arch/mips/netlogic/common/smpboot.S                |  272 +++
2705  arch/mips/netlogic/{xlr => common}/time.c          |    6 +-
2706  arch/mips/netlogic/xlp/Makefile                    |    2 +
2707  arch/mips/netlogic/xlp/nlm_hal.c                   |  111 +
2708  arch/mips/netlogic/xlp/platform.c                  |  108 +
2709  arch/mips/netlogic/xlp/setup.c                     |  105 +
2710  arch/mips/netlogic/xlp/wakeup.c                    |  102 +
2711  arch/mips/netlogic/xlr/Makefile                    |    7 +-
2712  arch/mips/netlogic/xlr/irq.c                       |  300 ---
2713  arch/mips/netlogic/xlr/platform.c                  |   31 +-
2714  arch/mips/netlogic/xlr/setup.c                     |   31 +-
2715  arch/mips/netlogic/xlr/{smpboot.S => wakeup.c}     |   80 +-
2716  arch/mips/pci/Makefile                             |    3 +-
2717  arch/mips/pci/msi-octeon.c                         |    2 +-
2718  arch/mips/pci/ops-pmcmsp.c                         |    2 +-
2719  arch/mips/pci/ops-tx3927.c                         |    2 +-
2720  arch/mips/pci/pci-alchemy.c                        |  138 +-
2721  arch/mips/pci/pci-ath724x.c                        |  174 ++
2722  arch/mips/pci/pci-bcm63xx.c                        |    4 +-
2723  arch/mips/pci/pci-octeon.c                         |   26 +-
2724  arch/mips/pci/pci-tx4927.c                         |    2 +-
2725  arch/mips/pci/pci-tx4938.c                         |    2 +-
2726  arch/mips/pci/pci-tx4939.c                         |    2 +-
2727  arch/mips/pci/pci-xlr.c                            |  128 ++-
2728  arch/mips/pci/pci.c                                |   29 +-
2729  arch/mips/pci/pcie-octeon.c                        | 1349 +++++++++---
2730  arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c        |    2 +-
2731  arch/mips/pmc-sierra/msp71xx/msp_setup.c           |    2 +-
2732  arch/mips/pmc-sierra/msp71xx/msp_smp.c             |    4 +-
2733  arch/mips/pnx8550/common/int.c                     |    4 +-
2734  arch/mips/pnx8550/common/time.c                    |    4 +-
2735  arch/mips/sgi-ip22/Makefile                        |    2 +-
2736  arch/mips/sgi-ip22/ip22-gio.c                      |  428 ++++
2737  arch/mips/sgi-ip22/ip22-int.c                      |   10 +-
2738  arch/mips/sgi-ip22/ip22-mc.c                       |   10 +-
2739  arch/mips/sgi-ip22/ip22-setup.c                    |   21 -
2740  arch/mips/sgi-ip27/ip27-irq.c                      |    6 +-
2741  arch/mips/sgi-ip27/ip27-timer.c                    |    2 +-
2742  arch/mips/sgi-ip32/ip32-irq.c                      |    2 -
2743  arch/mips/sni/irq.c                                |    2 +-
2744  arch/mips/sni/time.c                               |    2 +-
2745  arch/mips/txx9/generic/pci.c                       |    2 +-
2746  drivers/i2c/busses/Kconfig                         |    4 +-
2747  drivers/mmc/host/au1xmmc.c                         |   45 +-
2748  drivers/mtd/nand/au1550nd.c                        |  308 ++--
2749  drivers/net/irda/Kconfig                           |    6 +-
2750  drivers/net/irda/au1000_ircc.h                     |  125 --
2751  drivers/net/irda/au1k_ir.c                         | 1229 ++++++-----
2752  drivers/pcmcia/Kconfig                             |    8 +-
2753  drivers/pcmcia/Makefile                            |    4 -
2754  drivers/pcmcia/au1000_generic.c                    |  545 -----
2755  drivers/pcmcia/au1000_generic.h                    |  135 --
2756  drivers/pcmcia/au1000_pb1x00.c                     |  294 ---
2757  drivers/pcmcia/db1xxx_ss.c                         |   26 +-
2758  drivers/spi/Kconfig                                |    4 +-
2759  drivers/staging/octeon/Makefile                    |    5 -
2760  drivers/staging/octeon/cvmx-packet.h               |   65 -
2761  drivers/staging/octeon/cvmx-smix-defs.h            |  178 --
2762  drivers/staging/octeon/ethernet-defines.h          |    2 +-
2763  drivers/staging/octeon/ethernet-mdio.c             |    4 +-
2764  drivers/staging/octeon/ethernet-mem.c              |    2 +-
2765  drivers/staging/octeon/ethernet-rgmii.c            |    4 +-
2766  drivers/staging/octeon/ethernet-rx.c               |   16 +-
2767  drivers/staging/octeon/ethernet-rx.h               |    2 +-
2768  drivers/staging/octeon/ethernet-sgmii.c            |    4 +-
2769  drivers/staging/octeon/ethernet-spi.c              |    6 +-
2770  drivers/staging/octeon/ethernet-tx.c               |   12 +-
2771  drivers/staging/octeon/ethernet-xaui.c             |    4 +-
2772  drivers/staging/octeon/ethernet.c                  |   16 +-
2773  drivers/tty/serial/Kconfig                         |   23 +
2774  drivers/tty/serial/Makefile                        |    1 +
2775  drivers/tty/serial/ar933x_uart.c                   |  688 +++++++
2776  drivers/usb/host/Kconfig                           |    2 +-
2777  drivers/usb/host/alchemy-common.c                  |  277 +++
2778  drivers/usb/host/ehci-ath79.c                      |    4 +
2779  drivers/usb/host/ohci-au1xxx.c                     |   13 +-
2780  drivers/video/Kconfig                              |    8 +-
2781  drivers/video/au1100fb.c                           |   12 -
2782  drivers/video/au1200fb.c                           |  273 ++--
2783  drivers/video/console/newport_con.c                |   63 +-
2784  include/linux/serial_core.h                        |    4 +
2785  sound/soc/au1x/Kconfig                             |   14 +-
2786  sound/soc/au1x/db1200.c                            |   73 +-
2787  353 files changed, 23184 insertions(+), 8396 deletions(-)
2788  create mode 100644 arch/mips/alchemy/Makefile
2789  rename arch/mips/alchemy/{gpr/platform.c => board-gpr.c} (75%)
2790  rename arch/mips/alchemy/{mtx-1/platform.c => board-mtx1.c} (71%)
2791  create mode 100644 arch/mips/alchemy/board-xxs1500.c
2792  create mode 100644 arch/mips/alchemy/common/vss.c
2793  create mode 100644 arch/mips/alchemy/devboards/db1000.c
2794  rename arch/mips/alchemy/devboards/{db1200/platform.c => db1200.c} (62%)
2795  delete mode 100644 arch/mips/alchemy/devboards/db1200/Makefile
2796  delete mode 100644 arch/mips/alchemy/devboards/db1200/setup.c
2797  create mode 100644 arch/mips/alchemy/devboards/db1300.c
2798  create mode 100644 arch/mips/alchemy/devboards/db1550.c
2799  delete mode 100644 arch/mips/alchemy/devboards/db1x00/Makefile
2800  delete mode 100644 arch/mips/alchemy/devboards/db1x00/board_setup.c
2801  delete mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c
2802  delete mode 100644 arch/mips/alchemy/devboards/pb1000/Makefile
2803  delete mode 100644 arch/mips/alchemy/devboards/pb1000/board_setup.c
2804  rename arch/mips/alchemy/devboards/{pb1100/board_setup.c => pb1100.c} (55%)
2805  delete mode 100644 arch/mips/alchemy/devboards/pb1100/Makefile
2806  delete mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c
2807  delete mode 100644 arch/mips/alchemy/devboards/pb1200/Makefile
2808  delete mode 100644 arch/mips/alchemy/devboards/pb1200/board_setup.c
2809  delete mode 100644 arch/mips/alchemy/devboards/pb1200/platform.c
2810  rename arch/mips/alchemy/devboards/{pb1500/board_setup.c => pb1500.c} (51%)
2811  delete mode 100644 arch/mips/alchemy/devboards/pb1500/Makefile
2812  delete mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c
2813  rename arch/mips/alchemy/devboards/{pb1550/platform.c => pb1550.c} (61%)
2814  delete mode 100644 arch/mips/alchemy/devboards/pb1550/Makefile
2815  delete mode 100644 arch/mips/alchemy/devboards/pb1550/board_setup.c
2816  delete mode 100644 arch/mips/alchemy/gpr/Makefile
2817  delete mode 100644 arch/mips/alchemy/gpr/board_setup.c
2818  delete mode 100644 arch/mips/alchemy/gpr/init.c
2819  delete mode 100644 arch/mips/alchemy/mtx-1/Makefile
2820  delete mode 100644 arch/mips/alchemy/mtx-1/board_setup.c
2821  delete mode 100644 arch/mips/alchemy/mtx-1/init.c
2822  delete mode 100644 arch/mips/alchemy/xxs1500/Makefile
2823  delete mode 100644 arch/mips/alchemy/xxs1500/board_setup.c
2824  delete mode 100644 arch/mips/alchemy/xxs1500/init.c
2825  delete mode 100644 arch/mips/alchemy/xxs1500/platform.c
2826  delete mode 100644 arch/mips/ath79/dev-ar913x-wmac.c
2827  create mode 100644 arch/mips/ath79/dev-usb.c
2828  rename arch/mips/ath79/{dev-ar913x-wmac.h => dev-usb.h} (61%)
2829  create mode 100644 arch/mips/ath79/dev-wmac.c
2830  create mode 100644 arch/mips/ath79/dev-wmac.h
2831  create mode 100644 arch/mips/ath79/mach-ap121.c
2832  create mode 100644 arch/mips/ath79/mach-ubnt-xm.c
2833  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-cmd-queue.c (98%)
2834  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-fpa.c (100%)
2835  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-board.c (96%)
2836  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-fpa.c (100%)
2837  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-loop.c (95%)
2838  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-npi.c (96%)
2839  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-rgmii.c (97%)
2840  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-sgmii.c (98%)
2841  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-spi.c (94%)
2842  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-util.c (97%)
2843  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper-xaui.c (97%)
2844  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-helper.c (93%)
2845  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-decodes.c (98%)
2846  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-interrupt-rsl.c (97%)
2847  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-pko.c (98%)
2848  rename {drivers/staging/octeon => arch/mips/cavium-octeon/executive}/cvmx-spi.c (99%)
2849  delete mode 100644 arch/mips/configs/db1100_defconfig
2850  create mode 100644 arch/mips/configs/db1300_defconfig
2851  delete mode 100644 arch/mips/configs/db1500_defconfig
2852  create mode 100644 arch/mips/configs/nlm_xlp_defconfig
2853  delete mode 100644 arch/mips/configs/pb1200_defconfig
2854  create mode 100644 arch/mips/include/asm/bmips.h
2855  create mode 100644 arch/mips/include/asm/gio_device.h
2856  create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart.h
2857  create mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
2858  create mode 100644 arch/mips/include/asm/mach-ath79/pci-ath724x.h
2859  create mode 100644 arch/mips/include/asm/mach-au1x00/au1200fb.h
2860  create mode 100644 arch/mips/include/asm/mach-au1x00/au1550nd.h
2861  create mode 100644 arch/mips/include/asm/mach-au1x00/gpio-au1300.h
2862  create mode 100644 arch/mips/include/asm/mach-bcm63xx/ioremap.h
2863  create mode 100644 arch/mips/include/asm/mach-bcm63xx/irq.h
2864  create mode 100644 arch/mips/include/asm/mach-db1x00/db1300.h
2865  delete mode 100644 arch/mips/include/asm/mach-db1x00/db1x00.h
2866  create mode 100644 arch/mips/include/asm/mach-db1x00/irq.h
2867  delete mode 100644 arch/mips/include/asm/mach-pb1x00/mc146818rtc.h
2868  delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1000.h
2869  delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1200.h
2870  delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1550.h
2871  create mode 100644 arch/mips/include/asm/netlogic/common.h
2872  create mode 100644 arch/mips/include/asm/netlogic/haldefs.h
2873  create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/bridge.h
2874  create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h
2875  create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/iomap.h
2876  create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/pic.h
2877  create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/sys.h
2878  create mode 100644 arch/mips/include/asm/netlogic/xlp-hal/uart.h
2879  rename arch/mips/{netlogic/xlr/xlr_console.c => include/asm/netlogic/xlp-hal/xlp.h} (82%)
2880  create mode 100644 arch/mips/include/asm/netlogic/xlr/msidef.h
2881  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-address.h (100%)
2882  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-asxx-defs.h (100%)
2883  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-cmd-queue.h (100%)
2884  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-config.h (99%)
2885  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-dbg-defs.h (100%)
2886  create mode 100644 arch/mips/include/asm/octeon/cvmx-dpi-defs.h
2887  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fau.h (100%)
2888  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa-defs.h (100%)
2889  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-fpa.h (100%)
2890  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-gmxx-defs.h (100%)
2891  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-board.h (96%)
2892  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-fpa.h (100%)
2893  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-loop.h (96%)
2894  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-npi.h (96%)
2895  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-rgmii.h (98%)
2896  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-sgmii.h (98%)
2897  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-spi.h (98%)
2898  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-util.h (100%)
2899  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper-xaui.h (98%)
2900  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-helper.h (99%)
2901  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-ipd.h (100%)
2902  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-mdio.h (100%)
2903  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsx-defs.h (100%)
2904  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pcsxx-defs.h (100%)
2905  create mode 100644 arch/mips/include/asm/octeon/cvmx-pemx-defs.h
2906  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip-defs.h (100%)
2907  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pip.h (100%)
2908  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko-defs.h (100%)
2909  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pko.h (100%)
2910  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-pow.h (100%)
2911  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-scratch.h (100%)
2912  create mode 100644 arch/mips/include/asm/octeon/cvmx-sli-defs.h
2913  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spi.h (100%)
2914  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-spxx-defs.h (100%)
2915  create mode 100644 arch/mips/include/asm/octeon/cvmx-sriox-defs.h
2916  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-srxx-defs.h (100%)
2917  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-stxx-defs.h (100%)
2918  rename {drivers/staging => arch/mips/include/asm}/octeon/cvmx-wqe.h (100%)
2919  create mode 100644 arch/mips/include/asm/tlbmisc.h
2920  create mode 100644 arch/mips/kernel/bmips_vec.S
2921  create mode 100644 arch/mips/kernel/smp-bmips.c
2922  create mode 100644 arch/mips/mm/gup.c
2923  create mode 100644 arch/mips/netlogic/Makefile
2924  create mode 100644 arch/mips/netlogic/common/Makefile
2925  create mode 100644 arch/mips/netlogic/common/earlycons.c
2926  create mode 100644 arch/mips/netlogic/common/irq.c
2927  rename arch/mips/netlogic/{xlr => common}/smp.c (65%)
2928  create mode 100644 arch/mips/netlogic/common/smpboot.S
2929  rename arch/mips/netlogic/{xlr => common}/time.c (93%)
2930  create mode 100644 arch/mips/netlogic/xlp/Makefile
2931  create mode 100644 arch/mips/netlogic/xlp/nlm_hal.c
2932  create mode 100644 arch/mips/netlogic/xlp/platform.c
2933  create mode 100644 arch/mips/netlogic/xlp/setup.c
2934  create mode 100644 arch/mips/netlogic/xlp/wakeup.c
2935  delete mode 100644 arch/mips/netlogic/xlr/irq.c
2936  rename arch/mips/netlogic/xlr/{smpboot.S => wakeup.c} (60%)
2937  create mode 100644 arch/mips/pci/pci-ath724x.c
2938  create mode 100644 arch/mips/sgi-ip22/ip22-gio.c
2939  delete mode 100644 drivers/net/irda/au1000_ircc.h
2940  delete mode 100644 drivers/pcmcia/au1000_generic.c
2941  delete mode 100644 drivers/pcmcia/au1000_generic.h
2942  delete mode 100644 drivers/pcmcia/au1000_pb1x00.c
2943  delete mode 100644 drivers/staging/octeon/cvmx-packet.h
2944  delete mode 100644 drivers/staging/octeon/cvmx-smix-defs.h
2945  create mode 100644 drivers/tty/serial/ar933x_uart.c
2946 Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6)
2947 $ git merge openrisc/for-upstream
2948 Already up-to-date.
2949 Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls)
2950 $ git merge parisc/for-next
2951 Merge made by the 'recursive' strategy.
2952  arch/parisc/include/asm/futex.h |   31 +++++++++++++++++++++++++++----
2953  1 files changed, 27 insertions(+), 4 deletions(-)
2954 Merging powerpc/next (7c637b0 powerpc: Enable squashfs as a module)
2955 $ git merge powerpc/next
2956 Auto-merging arch/powerpc/mm/hugetlbpage.c
2957 Removing arch/powerpc/boot/dts/p5020si.dtsi
2958 Removing arch/powerpc/boot/dts/p4080si.dtsi
2959 Removing arch/powerpc/boot/dts/p3060si.dtsi
2960 Removing arch/powerpc/boot/dts/p3041si.dtsi
2961 Removing arch/powerpc/boot/dts/p2041si.dtsi
2962 Removing arch/powerpc/boot/dts/p2020si.dtsi
2963 Removing arch/powerpc/boot/dts/p1020si.dtsi
2964 Removing arch/powerpc/boot/dts/p1010si.dtsi
2965 Merge made by the 'recursive' strategy.
2966  .../devicetree/bindings/powerpc/fsl/srio-rmu.txt   |  163 +++
2967  .../devicetree/bindings/powerpc/fsl/srio.txt       |  103 ++
2968  arch/powerpc/Kconfig                               |    1 +
2969  arch/powerpc/Kconfig.debug                         |   12 +
2970  arch/powerpc/Makefile                              |    5 +-
2971  arch/powerpc/boot/Makefile                         |    7 +
2972  arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi      |  248 ++++
2973  arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi       |   63 +
2974  arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi      |  191 +++
2975  arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi       |   63 +
2976  arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi      |  143 ++
2977  arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi       |   62 +
2978  arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi      |  270 ++++
2979  arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi       |   65 +
2980  arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi      |  304 ++++
2981  arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi       |   64 +
2982  arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi      |  196 +++
2983  arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi       |   70 +
2984  arch/powerpc/boot/dts/fsl/p1010si-post.dtsi        |  198 +++
2985  arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi         |   64 +
2986  arch/powerpc/boot/dts/fsl/p1020si-post.dtsi        |  174 +++
2987  arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi         |   68 +
2988  arch/powerpc/boot/dts/fsl/p1021si-post.dtsi        |  225 +++
2989  arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi         |   68 +
2990  arch/powerpc/boot/dts/fsl/p1022si-post.dtsi        |  235 +++
2991  arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi         |   68 +
2992  arch/powerpc/boot/dts/fsl/p1023si-post.dtsi        |  224 +++
2993  arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi         |   76 +
2994  arch/powerpc/boot/dts/fsl/p2020si-post.dtsi        |  194 +++
2995  arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi         |   69 +
2996  arch/powerpc/boot/dts/fsl/p2041si-post.dtsi        |  325 +++++
2997  arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi         |  111 ++
2998  arch/powerpc/boot/dts/fsl/p3041si-post.dtsi        |  352 +++++
2999  arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi         |  112 ++
3000  arch/powerpc/boot/dts/fsl/p3060si-post.dtsi        |  296 ++++
3001  arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi         |  125 ++
3002  arch/powerpc/boot/dts/fsl/p4080si-post.dtsi        |  350 +++++
3003  arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi         |  143 ++
3004  arch/powerpc/boot/dts/fsl/p5020si-post.dtsi        |  355 +++++
3005  arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi         |   96 ++
3006  arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi           |   66 +
3007  arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi           |   66 +
3008  arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi         |   51 +
3009  arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi         |   41 +
3010  arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi          |   41 +
3011  arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi        |   53 +
3012  arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi        |   53 +
3013  arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi        |   53 +
3014  arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi        |   53 +
3015  arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi  |   39 +
3016  arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi        |   60 +
3017  arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi        |   60 +
3018  arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi        |   59 +
3019  arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi   |   42 +
3020  arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi   |   42 +
3021  arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi   |   42 +
3022  arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi          |   41 +
3023  arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi           |   43 +
3024  arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi           |   43 +
3025  arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi    |   42 +
3026  arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi            |   66 +
3027  arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi           |   68 +
3028  arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi         |   40 +
3029  arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi         |   40 +
3030  arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi        |   43 +
3031  arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi        |   45 +
3032  arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi        |   45 +
3033  arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi        |   45 +
3034  arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi        |   65 +
3035  arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi       |   41 +
3036  arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi       |   41 +
3037  arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi         |   66 +
3038  arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi         |   66 +
3039  arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi       |   51 +
3040  arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi       |   51 +
3041  arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi       |   40 +
3042  arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi        |   41 +
3043  arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi        |   41 +
3044  arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi         |   53 +
3045  arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi         |   53 +
3046  arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi          |  106 ++
3047  arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi         |   68 +
3048  arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi       |   39 +
3049  arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi       |   39 +
3050  arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi      |  100 ++
3051  arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi      |  109 ++
3052  arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi      |  109 ++
3053  arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi     |   41 +
3054  arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi    |   41 +
3055  arch/powerpc/boot/dts/mpc8536ds.dts                |  456 +------
3056  arch/powerpc/boot/dts/mpc8536ds.dtsi               |  141 ++
3057  arch/powerpc/boot/dts/mpc8536ds_36b.dts            |  410 +-----
3058  arch/powerpc/boot/dts/mpc8544ds.dts                |  473 +------
3059  arch/powerpc/boot/dts/mpc8544ds.dtsi               |  161 +++
3060  arch/powerpc/boot/dts/mpc8548cds.dts               |  505 ++-----
3061  arch/powerpc/boot/dts/mpc8568mds.dts               |  482 +------
3062  arch/powerpc/boot/dts/mpc8569mds.dts               |  414 +-----
3063  arch/powerpc/boot/dts/mpc8572ds.dts                |  757 +----------
3064  arch/powerpc/boot/dts/mpc8572ds.dtsi               |  397 +++++
3065  arch/powerpc/boot/dts/mpc8572ds_36b.dts            |  746 +----------
3066  arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts     |  487 +------
3067  arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts     |  245 +---
3068  arch/powerpc/boot/dts/mpc8641_hpcn.dts             |   69 +-
3069  arch/powerpc/boot/dts/obs600.dts                   |  314 ++++
3070  arch/powerpc/boot/dts/p1010rdb.dts                 |  228 +---
3071  arch/powerpc/boot/dts/p1010rdb.dtsi                |  229 +++
3072  arch/powerpc/boot/dts/p1010rdb_36b.dts             |   89 ++
3073  arch/powerpc/boot/dts/p1010si.dtsi                 |  374 -----
3074  arch/powerpc/boot/dts/p1020rdb.dts                 |  262 +----
3075  arch/powerpc/boot/dts/p1020rdb.dtsi                |  242 ++++
3076  arch/powerpc/boot/dts/p1020rdb_36b.dts             |   66 +
3077  arch/powerpc/boot/dts/p1020rdb_camp_core0.dts      |  154 +--
3078  arch/powerpc/boot/dts/p1020rdb_camp_core1.dts      |   11 +-
3079  arch/powerpc/boot/dts/p1020si.dtsi                 |  377 -----
3080  arch/powerpc/boot/dts/p1021mds.dts                 |  421 +-----
3081  arch/powerpc/boot/dts/p1022ds.dts                  |  449 +------
3082  arch/powerpc/boot/dts/p1023rds.dts                 |  380 +-----
3083  arch/powerpc/boot/dts/p2020ds.dts                  |  353 +-----
3084  arch/powerpc/boot/dts/p2020ds.dtsi                 |  316 ++++
3085  arch/powerpc/boot/dts/p2020rdb.dts                 |   63 +-
3086  arch/powerpc/boot/dts/p2020rdb_camp_core0.dts      |  141 +--
3087  arch/powerpc/boot/dts/p2020rdb_camp_core1.dts      |  107 +--
3088  arch/powerpc/boot/dts/p2020si.dtsi                 |  382 -----
3089  arch/powerpc/boot/dts/p2041rdb.dts                 |   22 +-
3090  arch/powerpc/boot/dts/p2041si.dtsi                 |  692 ---------
3091  arch/powerpc/boot/dts/p3041ds.dts                  |   23 +-
3092  arch/powerpc/boot/dts/p3041si.dtsi                 |  729 ----------
3093  arch/powerpc/boot/dts/p3060qds.dts                 |   12 +-
3094  arch/powerpc/boot/dts/p3060si.dtsi                 |  719 ---------
3095  arch/powerpc/boot/dts/p4080ds.dts                  |   24 +-
3096  arch/powerpc/boot/dts/p4080si.dtsi                 |  755 ----------
3097  arch/powerpc/boot/dts/p5020ds.dts                  |   24 +-
3098  arch/powerpc/boot/dts/p5020si.dtsi                 |  716 ---------
3099  arch/powerpc/boot/wrapper                          |   22 +-
3100  arch/powerpc/configs/40x/obs600_defconfig          |   83 ++
3101  arch/powerpc/configs/chroma_defconfig              |  307 ++++
3102  arch/powerpc/configs/corenet32_smp_defconfig       |    1 +
3103  arch/powerpc/configs/corenet64_smp_defconfig       |    1 +
3104  arch/powerpc/configs/mpc85xx_defconfig             |    1 +
3105  arch/powerpc/configs/mpc85xx_smp_defconfig         |    1 +
3106  arch/powerpc/configs/ppc64_defconfig               |    5 +
3107  arch/powerpc/configs/pseries_defconfig             |    5 +
3108  arch/powerpc/include/asm/cputable.h                |    2 +-
3109  arch/powerpc/include/asm/fsl_lbc.h                 |    7 +-
3110  arch/powerpc/include/asm/hugetlb.h                 |   38 +-
3111  arch/powerpc/include/asm/machdep.h                 |    3 +
3112  arch/powerpc/include/asm/mmu-book3e.h              |   11 +
3113  arch/powerpc/include/asm/mpic.h                    |   14 +-
3114  arch/powerpc/include/asm/opal.h                    |  131 ++-
3115  arch/powerpc/include/asm/paca.h                    |    1 +
3116  arch/powerpc/include/asm/page.h                    |    1 +
3117  arch/powerpc/include/asm/page_64.h                 |    2 +
3118  arch/powerpc/include/asm/pci-bridge.h              |    6 +-
3119  arch/powerpc/include/asm/pci.h                     |    2 -
3120  arch/powerpc/include/asm/pgtable.h                 |    3 +
3121  arch/powerpc/include/asm/reg_booke.h               |    4 +
3122  arch/powerpc/include/asm/rtas.h                    |   18 +
3123  arch/powerpc/include/asm/tce.h                     |   10 +-
3124  arch/powerpc/include/asm/time.h                    |    2 +
3125  arch/powerpc/kernel/asm-offsets.c                  |    1 +
3126  arch/powerpc/kernel/cpu_setup_a2.S                 |   10 +-
3127  arch/powerpc/kernel/exceptions-64s.S               |    2 +-
3128  arch/powerpc/kernel/idle_power7.S                  |    4 +
3129  arch/powerpc/kernel/irq.c                          |   24 +-
3130  arch/powerpc/kernel/pci-common.c                   |   78 +-
3131  arch/powerpc/kernel/pci_dn.c                       |    3 +
3132  arch/powerpc/kernel/process.c                      |   22 +-
3133  arch/powerpc/kernel/prom_init.c                    |   16 +-
3134  arch/powerpc/kernel/rtas_flash.c                   |    6 +
3135  arch/powerpc/kernel/rtasd.c                        |    7 +
3136  arch/powerpc/kernel/setup_64.c                     |   10 +
3137  arch/powerpc/kernel/smp.c                          |    3 +-
3138  arch/powerpc/kernel/sysfs.c                        |    8 +
3139  arch/powerpc/kernel/time.c                         |   95 +-
3140  arch/powerpc/kvm/book3s_hv_rmhandlers.S            |    3 +
3141  arch/powerpc/mm/Makefile                           |    2 +
3142  arch/powerpc/mm/fault.c                            |   17 +
3143  arch/powerpc/mm/hugetlbpage-book3e.c               |   21 +-
3144  arch/powerpc/mm/hugetlbpage.c                      |  116 +-
3145  arch/powerpc/mm/icswx.c                            |  273 ++++
3146  arch/powerpc/mm/icswx.h                            |   62 +
3147  arch/powerpc/mm/icswx_pid.c                        |   87 ++
3148  arch/powerpc/mm/mem.c                              |   23 +-
3149  arch/powerpc/mm/mmap_64.c                          |   14 +-
3150  arch/powerpc/mm/mmu_context_hash64.c               |  195 +---
3151  arch/powerpc/mm/tlb_low_64e.S                      |   36 +-
3152  arch/powerpc/mm/tlb_nohash.c                       |    2 +-
3153  arch/powerpc/platforms/40x/Kconfig                 |   10 +
3154  arch/powerpc/platforms/40x/ppc40x_simple.c         |    3 +-
3155  arch/powerpc/platforms/44x/iss4xx.c                |    2 +-
3156  arch/powerpc/platforms/83xx/asp834x.c              |   35 +-
3157  arch/powerpc/platforms/83xx/km83xx.c               |   58 +-
3158  arch/powerpc/platforms/83xx/misc.c                 |   77 +
3159  arch/powerpc/platforms/83xx/mpc830x_rdb.c          |   40 +-
3160  arch/powerpc/platforms/83xx/mpc831x_rdb.c          |   43 +-
3161  arch/powerpc/platforms/83xx/mpc832x_mds.c          |   53 +-
3162  arch/powerpc/platforms/83xx/mpc832x_rdb.c          |   56 +-
3163  arch/powerpc/platforms/83xx/mpc834x_itx.c          |   30 +-
3164  arch/powerpc/platforms/83xx/mpc834x_mds.c          |   42 +-
3165  arch/powerpc/platforms/83xx/mpc836x_mds.c          |   53 +-
3166  arch/powerpc/platforms/83xx/mpc836x_rdk.c          |   48 +-
3167  arch/powerpc/platforms/83xx/mpc837x_mds.c          |   46 +-
3168  arch/powerpc/platforms/83xx/mpc837x_rdb.c          |   47 +-
3169  arch/powerpc/platforms/83xx/mpc83xx.h              |   16 +
3170  arch/powerpc/platforms/83xx/sbc834x.c              |   45 +-
3171  arch/powerpc/platforms/85xx/Makefile               |    2 +
3172  arch/powerpc/platforms/85xx/common.c               |   66 +
3173  arch/powerpc/platforms/85xx/corenet_ds.c           |   28 +-
3174  arch/powerpc/platforms/85xx/ksi8560.c              |   69 +-
3175  arch/powerpc/platforms/85xx/mpc8536_ds.c           |   38 +-
3176  arch/powerpc/platforms/85xx/mpc85xx.h              |   11 +
3177  arch/powerpc/platforms/85xx/mpc85xx_ads.c          |   74 +-
3178  arch/powerpc/platforms/85xx/mpc85xx_cds.c          |   42 +-
3179  arch/powerpc/platforms/85xx/mpc85xx_ds.c           |   50 +-
3180  arch/powerpc/platforms/85xx/mpc85xx_mds.c          |   73 +-
3181  arch/powerpc/platforms/85xx/mpc85xx_rdb.c          |   49 +-
3182  arch/powerpc/platforms/85xx/p1010rdb.c             |   36 +-
3183  arch/powerpc/platforms/85xx/p1022_ds.c             |   37 +-
3184  arch/powerpc/platforms/85xx/p1023_rds.c            |   46 +-
3185  arch/powerpc/platforms/85xx/sbc8548.c              |   43 +-
3186  arch/powerpc/platforms/85xx/sbc8560.c              |   74 +-
3187  arch/powerpc/platforms/85xx/smp.c                  |    1 +
3188  arch/powerpc/platforms/85xx/smp.h                  |   15 +
3189  arch/powerpc/platforms/85xx/socrates.c             |   33 +-
3190  arch/powerpc/platforms/85xx/stx_gp3.c              |   73 +-
3191  arch/powerpc/platforms/85xx/tqm85xx.c              |   73 +-
3192  arch/powerpc/platforms/85xx/xes_mpc85xx.c          |   48 +-
3193  arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |    2 +-
3194  arch/powerpc/platforms/86xx/pic.c                  |   18 +-
3195  arch/powerpc/platforms/Kconfig.cputype             |   25 +-
3196  arch/powerpc/platforms/cell/iommu.c                |    2 +
3197  arch/powerpc/platforms/cell/setup.c                |   25 +-
3198  arch/powerpc/platforms/chrp/setup.c                |    3 +-
3199  arch/powerpc/platforms/embedded6xx/holly.c         |   23 +-
3200  arch/powerpc/platforms/embedded6xx/linkstation.c   |   20 +-
3201  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c  |   24 +-
3202  arch/powerpc/platforms/embedded6xx/storcenter.c    |   26 +-
3203  arch/powerpc/platforms/maple/pci.c                 |   55 +
3204  arch/powerpc/platforms/maple/setup.c               |    2 +-
3205  arch/powerpc/platforms/pasemi/setup.c              |    4 +-
3206  arch/powerpc/platforms/powermac/pic.c              |   46 +-
3207  arch/powerpc/platforms/powermac/setup.c            |    8 +-
3208  arch/powerpc/platforms/powermac/smp.c              |    4 +-
3209  arch/powerpc/platforms/powernv/Makefile            |    2 +-
3210  arch/powerpc/platforms/powernv/opal-wrappers.S     |    8 +
3211  arch/powerpc/platforms/powernv/pci-ioda.c          | 1330 +++++++++++++++++
3212  arch/powerpc/platforms/powernv/pci-p5ioc2.c        |    1 +
3213  arch/powerpc/platforms/powernv/pci.c               |  228 +++-
3214  arch/powerpc/platforms/powernv/pci.h               |  100 ++
3215  arch/powerpc/platforms/powernv/smp.c               |    2 +-
3216  arch/powerpc/platforms/pseries/iommu.c             |   61 +-
3217  arch/powerpc/platforms/pseries/nvram.c             |    7 +
3218  arch/powerpc/platforms/pseries/setup.c             |    3 +-
3219  arch/powerpc/platforms/wsp/Kconfig                 |   12 +-
3220  arch/powerpc/platforms/wsp/Makefile                |    8 +-
3221  arch/powerpc/platforms/wsp/chroma.c                |   56 +
3222  arch/powerpc/platforms/wsp/h8.c                    |  134 ++
3223  arch/powerpc/platforms/wsp/opb_pic.c               |    3 +-
3224  arch/powerpc/platforms/wsp/psr2.c                  |   56 +-
3225  arch/powerpc/platforms/wsp/wsp.c                   |  115 ++
3226  arch/powerpc/platforms/wsp/wsp.h                   |   16 +-
3227  arch/powerpc/sysdev/Makefile                       |    2 +-
3228  arch/powerpc/sysdev/fsl_lbc.c                      |   36 +
3229  arch/powerpc/sysdev/fsl_msi.c                      |   39 +
3230  arch/powerpc/sysdev/fsl_msi.h                      |    3 +
3231  arch/powerpc/sysdev/fsl_rio.c                      | 1519 ++++----------------
3232  arch/powerpc/sysdev/fsl_rio.h                      |  135 ++
3233  arch/powerpc/sysdev/fsl_rmu.c                      | 1103 ++++++++++++++
3234  arch/powerpc/sysdev/mpic.c                         |  201 ++-
3235  arch/powerpc/sysdev/xics/icp-hv.c                  |   38 +-
3236  arch/powerpc/sysdev/xics/xics-common.c             |    2 +-
3237  arch/powerpc/xmon/xmon.c                           |   16 +-
3238  arch/sparc/kernel/sys_sparc_64.c                   |    6 +-
3239  drivers/tty/serial/pmac_zilog.c                    |  102 +-
3240  drivers/tty/serial/ucc_uart.c                      |    3 +
3241  tools/perf/arch/powerpc/util/dwarf-regs.c          |    3 +
3242  276 files changed, 16976 insertions(+), 15185 deletions(-)
3243  create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio-rmu.txt
3244  create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/srio.txt
3245  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi
3246  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8536si-pre.dtsi
3247  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi
3248  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8544si-pre.dtsi
3249  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
3250  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8548si-pre.dtsi
3251  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-post.dtsi
3252  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8568si-pre.dtsi
3253  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-post.dtsi
3254  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8569si-pre.dtsi
3255  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi
3256  create mode 100644 arch/powerpc/boot/dts/fsl/mpc8572si-pre.dtsi
3257  create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-post.dtsi
3258  create mode 100644 arch/powerpc/boot/dts/fsl/p1010si-pre.dtsi
3259  create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-post.dtsi
3260  create mode 100644 arch/powerpc/boot/dts/fsl/p1020si-pre.dtsi
3261  create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-post.dtsi
3262  create mode 100644 arch/powerpc/boot/dts/fsl/p1021si-pre.dtsi
3263  create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
3264  create mode 100644 arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
3265  create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-post.dtsi
3266  create mode 100644 arch/powerpc/boot/dts/fsl/p1023si-pre.dtsi
3267  create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-post.dtsi
3268  create mode 100644 arch/powerpc/boot/dts/fsl/p2020si-pre.dtsi
3269  create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi
3270  create mode 100644 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi
3271  create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi
3272  create mode 100644 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi
3273  create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-post.dtsi
3274  create mode 100644 arch/powerpc/boot/dts/fsl/p3060si-pre.dtsi
3275  create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi
3276  create mode 100644 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi
3277  create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi
3278  create mode 100644 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi
3279  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-0.dtsi
3280  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-dma-1.dtsi
3281  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-duart-0.dtsi
3282  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-esdhc-0.dtsi
3283  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-espi-0.dtsi
3284  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-0.dtsi
3285  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-1.dtsi
3286  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-2.dtsi
3287  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-3.dtsi
3288  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec1-timer-0.dtsi
3289  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-0.dtsi
3290  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-1.dtsi
3291  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-2.dtsi
3292  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-0.dtsi
3293  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-1.dtsi
3294  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-etsec2-grp2-2.dtsi
3295  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-gpio-0.dtsi
3296  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-0.dtsi
3297  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-i2c-1.dtsi
3298  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic-timer-B.dtsi
3299  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-mpic.dtsi
3300  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-rmu-0.dtsi
3301  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-0.dtsi
3302  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sata2-1.dtsi
3303  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec2.1-0.dtsi
3304  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.0-0.dtsi
3305  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.1-0.dtsi
3306  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec3.3-0.dtsi
3307  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-sec4.4-0.dtsi
3308  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-0.dtsi
3309  create mode 100644 arch/powerpc/boot/dts/fsl/pq3-usb2-dr-1.dtsi
3310  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-0.dtsi
3311  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-dma-1.dtsi
3312  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-0.dtsi
3313  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-duart-1.dtsi
3314  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-esdhc-0.dtsi
3315  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-espi-0.dtsi
3316  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-gpio-0.dtsi
3317  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-0.dtsi
3318  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-i2c-1.dtsi
3319  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-mpic.dtsi
3320  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-rmu-0.dtsi
3321  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-0.dtsi
3322  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sata2-1.dtsi
3323  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.0-0.dtsi
3324  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.1-0.dtsi
3325  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec4.2-0.dtsi
3326  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-dr-0.dtsi
3327  create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-usb2-mph-0.dtsi
3328  create mode 100644 arch/powerpc/boot/dts/mpc8536ds.dtsi
3329  create mode 100644 arch/powerpc/boot/dts/mpc8544ds.dtsi
3330  create mode 100644 arch/powerpc/boot/dts/mpc8572ds.dtsi
3331  create mode 100644 arch/powerpc/boot/dts/obs600.dts
3332  create mode 100644 arch/powerpc/boot/dts/p1010rdb.dtsi
3333  create mode 100644 arch/powerpc/boot/dts/p1010rdb_36b.dts
3334  delete mode 100644 arch/powerpc/boot/dts/p1010si.dtsi
3335  create mode 100644 arch/powerpc/boot/dts/p1020rdb.dtsi
3336  create mode 100644 arch/powerpc/boot/dts/p1020rdb_36b.dts
3337  delete mode 100644 arch/powerpc/boot/dts/p1020si.dtsi
3338  create mode 100644 arch/powerpc/boot/dts/p2020ds.dtsi
3339  delete mode 100644 arch/powerpc/boot/dts/p2020si.dtsi
3340  delete mode 100644 arch/powerpc/boot/dts/p2041si.dtsi
3341  delete mode 100644 arch/powerpc/boot/dts/p3041si.dtsi
3342  delete mode 100644 arch/powerpc/boot/dts/p3060si.dtsi
3343  delete mode 100644 arch/powerpc/boot/dts/p4080si.dtsi
3344  delete mode 100644 arch/powerpc/boot/dts/p5020si.dtsi
3345  create mode 100644 arch/powerpc/configs/40x/obs600_defconfig
3346  create mode 100644 arch/powerpc/configs/chroma_defconfig
3347  create mode 100644 arch/powerpc/mm/icswx.c
3348  create mode 100644 arch/powerpc/mm/icswx.h
3349  create mode 100644 arch/powerpc/mm/icswx_pid.c
3350  create mode 100644 arch/powerpc/platforms/85xx/common.c
3351  create mode 100644 arch/powerpc/platforms/85xx/mpc85xx.h
3352  create mode 100644 arch/powerpc/platforms/85xx/smp.h
3353  create mode 100644 arch/powerpc/platforms/powernv/pci-ioda.c
3354  create mode 100644 arch/powerpc/platforms/wsp/chroma.c
3355  create mode 100644 arch/powerpc/platforms/wsp/h8.c
3356  create mode 100644 arch/powerpc/platforms/wsp/wsp.c
3357  create mode 100644 arch/powerpc/sysdev/fsl_rio.h
3358  create mode 100644 arch/powerpc/sysdev/fsl_rmu.c
3359 Merging 4xx/next (228d550 powerpc/47x: Add support for the new IBM currituck platform)
3360 $ git merge 4xx/next
3361 Resolved 'arch/powerpc/platforms/40x/ppc40x_simple.c' using previous resolution.
3362 Auto-merging arch/powerpc/platforms/40x/ppc40x_simple.c
3363 CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/ppc40x_simple.c
3364 Auto-merging arch/powerpc/platforms/40x/Kconfig
3365 Auto-merging arch/powerpc/boot/wrapper
3366 Auto-merging arch/powerpc/boot/Makefile
3367 Auto-merging MAINTAINERS
3368 Automatic merge failed; fix conflicts and then commit the result.
3369 $ git commit -v -a
3370 [master 7a42d48] Merge remote-tracking branch '4xx/next'
3371 $ git diff -M --stat --summary HEAD^..
3372  MAINTAINERS                                  |    2 +-
3373  arch/powerpc/boot/Makefile                   |    5 +-
3374  arch/powerpc/boot/dcr.h                      |    6 +
3375  arch/powerpc/boot/div64.S                    |   52 ++++++
3376  arch/powerpc/boot/dts/currituck.dts          |  237 ++++++++++++++++++++++++++
3377  arch/powerpc/boot/dts/klondike.dts           |  227 ++++++++++++++++++++++++
3378  arch/powerpc/boot/treeboot-currituck.c       |  119 +++++++++++++
3379  arch/powerpc/boot/wrapper                    |    3 +
3380  arch/powerpc/configs/40x/klondike_defconfig  |   55 ++++++
3381  arch/powerpc/configs/44x/currituck_defconfig |  110 ++++++++++++
3382  arch/powerpc/include/asm/reg.h               |    1 +
3383  arch/powerpc/kernel/cputable.c               |   27 +++
3384  arch/powerpc/kernel/head_44x.S               |    2 +
3385  arch/powerpc/mm/44x_mmu.c                    |    4 -
3386  arch/powerpc/platforms/40x/Kconfig           |   11 ++
3387  arch/powerpc/platforms/40x/ppc40x_simple.c   |    1 +
3388  arch/powerpc/platforms/44x/Kconfig           |   14 ++
3389  arch/powerpc/platforms/44x/Makefile          |    1 +
3390  arch/powerpc/platforms/44x/currituck.c       |  204 ++++++++++++++++++++++
3391  arch/powerpc/sysdev/ppc4xx_pci.c             |   85 +++++++++-
3392  arch/powerpc/sysdev/ppc4xx_pci.h             |    7 +
3393  21 files changed, 1159 insertions(+), 14 deletions(-)
3394  create mode 100644 arch/powerpc/boot/dts/currituck.dts
3395  create mode 100644 arch/powerpc/boot/dts/klondike.dts
3396  create mode 100644 arch/powerpc/boot/treeboot-currituck.c
3397  create mode 100644 arch/powerpc/configs/40x/klondike_defconfig
3398  create mode 100644 arch/powerpc/configs/44x/currituck_defconfig
3399  create mode 100644 arch/powerpc/platforms/44x/currituck.c
3400 Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries)
3401 $ git merge 52xx-and-virtex/powerpc/next
3402 Merge made by the 'recursive' strategy.
3403 Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout)
3404 $ git merge galak/next
3405 Already up-to-date.
3406 Merging s390/features (b4c1eb9 [S390] cleanup trap handling)
3407 $ git merge s390/features
3408 Merge made by the 'recursive' strategy.
3409  Documentation/dontdiff              |    1 -
3410  Documentation/s390/Debugging390.txt |   34 --
3411  arch/s390/Kbuild                    |   13 +-
3412  arch/s390/Kconfig                   |   11 +-
3413  arch/s390/Makefile                  |    1 -
3414  arch/s390/boot/Makefile             |    2 +-
3415  arch/s390/include/asm/kdebug.h      |    2 +-
3416  arch/s390/include/asm/lowcore.h     |  142 +++---
3417  arch/s390/include/asm/pgtable.h     |   23 +-
3418  arch/s390/include/asm/processor.h   |    2 -
3419  arch/s390/include/asm/ptrace.h      |    3 +-
3420  arch/s390/include/asm/smp.h         |    1 -
3421  arch/s390/include/asm/sparsemem.h   |    4 +-
3422  arch/s390/include/asm/syscall.h     |    2 +-
3423  arch/s390/include/asm/topology.h    |   40 ++-
3424  arch/s390/kernel/Makefile           |    3 +-
3425  arch/s390/kernel/asm-offsets.c      |    8 +-
3426  arch/s390/kernel/base.S             |   16 +-
3427  arch/s390/kernel/compat_signal.c    |    8 +-
3428  arch/s390/kernel/entry.S            | 1103 +++++++++++++++--------------------
3429  arch/s390/kernel/entry.h            |   10 +-
3430  arch/s390/kernel/entry64.S          |  976 ++++++++++++++-----------------
3431  arch/s390/kernel/head.S             |    4 +-
3432  arch/s390/kernel/mem_detect.c       |  122 +++--
3433  arch/s390/kernel/reipl64.S          |    4 +-
3434  arch/s390/kernel/setup.c            |   69 ++-
3435  arch/s390/kernel/signal.c           |   20 +-
3436  arch/s390/kernel/smp.c              |  121 +---
3437  arch/s390/kernel/topology.c         |  275 ++++++---
3438  arch/s390/kernel/traps.c            |  168 ++----
3439  arch/s390/mm/fault.c                |  104 ++--
3440  arch/s390/mm/init.c                 |   16 +-
3441  arch/s390/mm/pgtable.c              |   11 -
3442  drivers/s390/cio/qdio_setup.c       |    7 +-
3443  34 files changed, 1540 insertions(+), 1786 deletions(-)
3444 Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest)
3445 $ git merge sh/sh-latest
3446 Already up-to-date.
3447 Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest)
3448 $ git merge rmobile/rmobile-latest
3449 Already up-to-date.
3450 Merging sparc-next/master (3ee72ca Merge git://github.com/davem330/net)
3451 $ git merge sparc-next/master
3452 Already up-to-date.
3453 Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines)
3454 $ git merge tile/master
3455 Already up-to-date.
3456 Merging unicore32/unicore32 (ed96dfb unicore32, exec: remove redundant set_fs(USER_DS))
3457 $ git merge unicore32/unicore32
3458 Already up-to-date.
3459 Merging xtensa/master (29aced6 xtensa: remove defining register numbers)
3460 $ git merge xtensa/master
3461 Merge made by the 'recursive' strategy.
3462  arch/xtensa/include/asm/irqflags.h |    1 +
3463  arch/xtensa/include/asm/regs.h     |   91 ++++++++++++++++++---------------
3464  arch/xtensa/include/asm/timex.h    |    4 +-
3465  arch/xtensa/include/asm/uaccess.h  |    2 +-
3466  arch/xtensa/kernel/align.S         |   14 +++---
3467  arch/xtensa/kernel/coprocessor.S   |   10 ++--
3468  arch/xtensa/kernel/entry.S         |   98 ++++++++++++++++++------------------
3469  arch/xtensa/kernel/head.S          |   12 ++--
3470  arch/xtensa/kernel/irq.c           |    5 ++
3471  arch/xtensa/kernel/traps.c         |    4 +-
3472  arch/xtensa/kernel/vectors.S       |   22 ++++----
3473  arch/xtensa/kernel/vmlinux.lds.S   |    1 +
3474  12 files changed, 139 insertions(+), 125 deletions(-)
3475 Merging ceph/for-next (3395734 libceph: fix double-free of page vector)
3476 $ git merge ceph/for-next
3477 Already up-to-date.
3478 Merging cifs/master (8def5f5 Merge git://git.samba.org/sfrench/cifs-2.6)
3479 $ git merge cifs/master
3480 Already up-to-date.
3481 Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
3482 $ git merge configfs/linux-next
3483 Already up-to-date.
3484 Merging ecryptfs/next (aaef29d eCryptfs: Flush file in vma close)
3485 $ git merge ecryptfs/next
3486 Merge made by the 'recursive' strategy.
3487 Merging ext3/for_next (ed47a7d udf: Cleanup metadata flags handling)
3488 $ git merge ext3/for_next
3489 Already up-to-date.
3490 Merging ext4/dev (5a0dc73 ext4: handle EOF correctly in ext4_bio_write_page())
3491 $ git merge ext4/dev
3492 Already up-to-date.
3493 Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.)
3494 $ git merge fatfs/master
3495 Already up-to-date.
3496 Merging fuse/for-next (03c9693 cuse: implement memory mapping)
3497 $ git merge fuse/for-next
3498 Auto-merging fs/fuse/inode.c
3499 Merge made by the 'recursive' strategy.
3500  fs/fuse/cuse.c       |  426 +++++++++++++++++++++++++++++++++++++++++++++++++-
3501  fs/fuse/dev.c        |  206 ++++++++-----------------
3502  fs/fuse/dir.c        |   58 +++++++-
3503  fs/fuse/file.c       |   58 ++------
3504  fs/fuse/fuse_i.h     |   45 +++++-
3505  fs/fuse/inode.c      |  167 +++++++++++++++++++-
3506  include/linux/fuse.h |   41 +++++-
3507  7 files changed, 802 insertions(+), 199 deletions(-)
3508 Merging gfs2/master (46cc1e5 GFS2: local functions should be static)
3509 $ git merge gfs2/master
3510 Merge made by the 'recursive' strategy.
3511  fs/gfs2/acl.c        |   14 +--
3512  fs/gfs2/aops.c       |   18 ++--
3513  fs/gfs2/bmap.c       |   26 ++---
3514  fs/gfs2/dir.c        |   64 ++++++++++-
3515  fs/gfs2/dir.h        |    2 +-
3516  fs/gfs2/export.c     |    3 +-
3517  fs/gfs2/file.c       |   34 +++---
3518  fs/gfs2/incore.h     |   20 ++--
3519  fs/gfs2/inode.c      |   72 +++++++------
3520  fs/gfs2/log.c        |    2 +-
3521  fs/gfs2/main.c       |    3 +-
3522  fs/gfs2/meta_io.c    |    4 +-
3523  fs/gfs2/ops_fstype.c |    2 +-
3524  fs/gfs2/quota.c      |   87 ++++++---------
3525  fs/gfs2/rgrp.c       |  293 +++++++++++++++++++++++++++----------------------
3526  fs/gfs2/rgrp.h       |   16 ++--
3527  fs/gfs2/super.c      |   14 ++--
3528  fs/gfs2/trans.h      |    6 +-
3529  fs/gfs2/xattr.c      |   48 ++++-----
3530  19 files changed, 394 insertions(+), 334 deletions(-)
3531 Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors)
3532 $ git merge hfsplus/for-next
3533 Already up-to-date.
3534 Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes)
3535 $ git merge jfs/next
3536 Already up-to-date.
3537 Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages)
3538 $ git merge logfs/master
3539 Resolved 'fs/logfs/file.c' using previous resolution.
3540 Auto-merging fs/logfs/super.c
3541 Auto-merging fs/logfs/readwrite.c
3542 Auto-merging fs/logfs/logfs.h
3543 Auto-merging fs/logfs/inode.c
3544 Auto-merging fs/logfs/file.c
3545 CONFLICT (content): Merge conflict in fs/logfs/file.c
3546 Auto-merging fs/logfs/dir.c
3547 Auto-merging MAINTAINERS
3548 Automatic merge failed; fix conflicts and then commit the result.
3549 $ git commit -v -a
3550 [master 2e4db30] Merge remote-tracking branch 'logfs/master'
3551 $ git diff -M --stat --summary HEAD^..
3552  MAINTAINERS          |    1 +
3553  fs/logfs/dev_mtd.c   |   26 +++++++++++-------------
3554  fs/logfs/dir.c       |    2 +-
3555  fs/logfs/file.c      |    2 +
3556  fs/logfs/gc.c        |    2 +-
3557  fs/logfs/inode.c     |    4 ++-
3558  fs/logfs/journal.c   |    1 -
3559  fs/logfs/logfs.h     |    5 +++-
3560  fs/logfs/readwrite.c |   51 +++++++++++++++++++++++++++++++++----------------
3561  fs/logfs/segment.c   |   51 ++++++++++++++++++++++++++++++++++++++-----------
3562  fs/logfs/super.c     |    3 +-
3563  11 files changed, 99 insertions(+), 49 deletions(-)
3564 Merging nfs/linux-next (652f89f NFSv4: Do not accept delegated opens when a delegation recall is in effect)
3565 $ git merge nfs/linux-next
3566 Merge made by the 'recursive' strategy.
3567  fs/nfs/nfs4proc.c  |   24 ++++++++++++++++--------
3568  fs/nfs/nfs4state.c |   33 +++++++++++++++++++++------------
3569  net/sunrpc/sched.c |   30 +++++++++++++++++++++++-------
3570  net/sunrpc/xprt.c  |   10 ++++------
3571  4 files changed, 64 insertions(+), 33 deletions(-)
3572 Merging nfsd/nfsd-next (f32f3c2 nfsd4: initialize special stateid's at compile time)
3573 $ git merge nfsd/nfsd-next
3574 Auto-merging MAINTAINERS
3575 Auto-merging CREDITS
3576 Merge made by the 'recursive' strategy.
3577  CREDITS                                           |    5 +
3578  Documentation/filesystems/nfs/00-INDEX            |    2 +
3579  Documentation/filesystems/nfs/fault_injection.txt |   69 +++++
3580  MAINTAINERS                                       |    1 -
3581  fs/nfsd/Kconfig                                   |   10 +
3582  fs/nfsd/Makefile                                  |    1 +
3583  fs/nfsd/export.c                                  |   12 +-
3584  fs/nfsd/fault_inject.c                            |   91 ++++++
3585  fs/nfsd/fault_inject.h                            |   28 ++
3586  fs/nfsd/nfs4idmap.c                               |   11 +-
3587  fs/nfsd/nfs4proc.c                                |    7 +-
3588  fs/nfsd/nfs4state.c                               |  324 +++++++++++++++------
3589  fs/nfsd/nfs4xdr.c                                 |    3 +-
3590  fs/nfsd/nfsctl.c                                  |   10 +-
3591  fs/nfsd/nfsd.h                                    |   20 +-
3592  fs/nfsd/state.h                                   |    1 +
3593  include/linux/sunrpc/svc_xprt.h                   |    3 +-
3594  include/linux/sunrpc/svcsock.h                    |    2 +-
3595  net/sunrpc/cache.c                                |    2 +
3596  net/sunrpc/svc.c                                  |   21 +-
3597  net/sunrpc/svc_xprt.c                             |   62 +++--
3598  net/sunrpc/svcsock.c                              |    8 +-
3599  net/sunrpc/xprtrdma/svc_rdma_transport.c          |    2 +-
3600  tools/nfsd/inject_fault.sh                        |   49 +++
3601  24 files changed, 591 insertions(+), 153 deletions(-)
3602  create mode 100644 Documentation/filesystems/nfs/fault_injection.txt
3603  create mode 100644 fs/nfsd/fault_inject.c
3604  create mode 100644 fs/nfsd/fault_inject.h
3605  create mode 100755 tools/nfsd/inject_fault.sh
3606 Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2)
3607 $ git merge nilfs2/for-next
3608 Already up-to-date.
3609 Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap)
3610 $ git merge ocfs2/linux-next
3611 Already up-to-date.
3612 Merging omfs/for-next (976d167 Linux 3.1-rc9)
3613 $ git merge omfs/for-next
3614 Already up-to-date.
3615 Merging squashfs/master (7657cac Squashfs: Add an option to set dev block size to 4K)
3616 $ git merge squashfs/master
3617 Already up-to-date.
3618 Merging v9fs/for-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
3619 $ git merge v9fs/for-next
3620 Already up-to-date.
3621 Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation)
3622 $ git merge ubifs/linux-next
3623 Merge made by the 'recursive' strategy.
3624  fs/ubifs/lpt.c   |    6 ++----
3625  fs/ubifs/tnc.c   |    3 +--
3626  fs/ubifs/xattr.c |    6 ++----
3627  3 files changed, 5 insertions(+), 10 deletions(-)
3628 Merging xfs/master (9f9c19e xfs: fix the logspace waiting algorithm)
3629 $ git merge xfs/master
3630 Already up-to-date.
3631 Merging vfs/for-next (206b1d0 Fix POSIX ACL permission check)
3632 $ git merge vfs/for-next
3633 Already up-to-date.
3634 Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again)
3635 $ git merge vfs-scale/vfs-scale-working
3636 Already up-to-date.
3637 Merging pci/linux-next (770aed2 PCI: kconfig: English typo in pci/pcie/Kconfig)
3638 $ git merge pci/linux-next
3639 Auto-merging arch/tile/kernel/pci.c
3640 Auto-merging arch/powerpc/kernel/pci-common.c
3641 Auto-merging arch/powerpc/include/asm/pci.h
3642 Auto-merging arch/powerpc/include/asm/pci-bridge.h
3643 Auto-merging arch/mips/pci/pci.c
3644 Auto-merging arch/arm/mach-orion5x/pci.c
3645 Auto-merging arch/arm/mach-mv78xx0/pcie.c
3646 Auto-merging arch/arm/mach-kirkwood/pcie.c
3647 Auto-merging arch/arm/mach-ixp2000/enp2611.c
3648 Auto-merging arch/arm/mach-dove/pcie.c
3649 Merge made by the 'recursive' strategy.
3650  Documentation/ABI/testing/sysfs-bus-pci    |   18 ++++
3651  Documentation/feature-removal-schedule.txt |   12 ++
3652  arch/alpha/kernel/pci.c                    |   37 ++++---
3653  arch/arm/common/it8152.c                   |    9 +-
3654  arch/arm/common/via82c505.c                |    3 +-
3655  arch/arm/include/asm/mach/pci.h            |    2 +-
3656  arch/arm/include/asm/pci.h                 |   12 --
3657  arch/arm/kernel/bios32.c                   |   34 +++----
3658  arch/arm/mach-cns3xxx/pcie.c               |    8 +-
3659  arch/arm/mach-dove/pcie.c                  |    9 +-
3660  arch/arm/mach-footbridge/dc21285.c         |    8 +-
3661  arch/arm/mach-integrator/pci_v3.c          |   19 ++--
3662  arch/arm/mach-iop13xx/pci.c                |   17 ++--
3663  arch/arm/mach-ixp2000/enp2611.c            |    3 +-
3664  arch/arm/mach-ixp2000/pci.c                |    8 +-
3665  arch/arm/mach-ixp23xx/pci.c                |    8 +-
3666  arch/arm/mach-ixp4xx/common-pci.c          |    8 +-
3667  arch/arm/mach-kirkwood/pcie.c              |    8 +-
3668  arch/arm/mach-ks8695/pci.c                 |    8 +-
3669  arch/arm/mach-mv78xx0/pcie.c               |    8 +-
3670  arch/arm/mach-orion5x/pci.c                |   16 ++--
3671  arch/arm/mach-sa1100/pci-nanoengine.c      |    9 +-
3672  arch/arm/mach-tegra/pcie.c                 |    9 +-
3673  arch/arm/mach-versatile/pci.c              |   19 ++--
3674  arch/arm/plat-iop/pci.c                    |    8 +-
3675  arch/blackfin/include/asm/pci.h            |    4 -
3676  arch/frv/mb93090-mb00/pci-frv.c            |   20 ----
3677  arch/frv/mb93090-mb00/pci-frv.h            |    2 -
3678  arch/frv/mb93090-mb00/pci-vdk.c            |   11 +-
3679  arch/h8300/include/asm/pci.h               |    5 -
3680  arch/ia64/include/asm/pci.h                |    6 -
3681  arch/ia64/pci/pci.c                        |   43 ++++----
3682  arch/microblaze/include/asm/pci-bridge.h   |    1 -
3683  arch/microblaze/include/asm/pci.h          |    5 -
3684  arch/microblaze/pci/pci-common.c           |   43 ++++----
3685  arch/mips/pci/pci.c                        |   38 ++-----
3686  arch/mn10300/unit-asb2305/pci-asb2305.c    |   22 ----
3687  arch/mn10300/unit-asb2305/pci-asb2305.h    |    2 -
3688  arch/mn10300/unit-asb2305/pci.c            |   12 +-
3689  arch/powerpc/include/asm/pci-bridge.h      |    1 -
3690  arch/powerpc/include/asm/pci.h             |    5 -
3691  arch/powerpc/kernel/pci-common.c           |   30 ++++--
3692  arch/powerpc/kernel/pci_64.c               |   40 ++++----
3693  arch/sh/drivers/pci/pci.c                  |   41 ++------
3694  arch/sparc/include/asm/pci_32.h            |    5 -
3695  arch/sparc/include/asm/pci_64.h            |    5 -
3696  arch/sparc/kernel/leon_pci.c               |   25 ++---
3697  arch/sparc/kernel/pci.c                    |   22 ++--
3698  arch/tile/include/asm/pci.h                |    7 --
3699  arch/tile/kernel/pci.c                     |    5 +
3700  arch/unicore32/include/asm/pci.h           |    5 -
3701  arch/unicore32/kernel/pci.c                |    5 +
3702  arch/x86/include/asm/pci_x86.h             |    2 -
3703  arch/x86/include/asm/topology.h            |    2 +-
3704  arch/x86/pci/acpi.c                        |   46 ++++++---
3705  arch/x86/pci/amd_bus.c                     |    1 -
3706  arch/x86/pci/broadcom_bus.c                |   62 +++++++----
3707  arch/x86/pci/bus_numa.c                    |   31 ++++---
3708  arch/x86/pci/common.c                      |   19 ++--
3709  arch/x86/pci/i386.c                        |   20 ----
3710  arch/x86/pci/legacy.c                      |    3 -
3711  arch/x86/pci/numaq_32.c                    |    2 -
3712  arch/xtensa/include/asm/pci.h              |    5 -
3713  arch/xtensa/kernel/pci.c                   |   90 +++++++++--------
3714  drivers/acpi/pci_irq.c                     |   10 +-
3715  drivers/acpi/pci_root.c                    |    7 ++
3716  drivers/parisc/dino.c                      |   47 ++++-----
3717  drivers/parisc/lba_pci.c                   |   72 +++++++------
3718  drivers/pci/access.c                       |   76 +++++++++-----
3719  drivers/pci/ats.c                          |   20 ++--
3720  drivers/pci/bus.c                          |   32 +++++-
3721  drivers/pci/hotplug/pciehp.h               |    1 -
3722  drivers/pci/hotplug/pciehp_core.c          |   11 +--
3723  drivers/pci/hotplug/pciehp_ctrl.c          |    4 +-
3724  drivers/pci/hotplug/pciehp_hpc.c           |    1 -
3725  drivers/pci/iov.c                          |   16 ++--
3726  drivers/pci/msi.c                          |  121 ++++++++++++++++++++++
3727  drivers/pci/pci-acpi.c                     |   13 ++-
3728  drivers/pci/pci-driver.c                   |    3 +-
3729  drivers/pci/pci.c                          |  152 +++++++++++++++++++++++++++-
3730  drivers/pci/pci.h                          |    2 +
3731  drivers/pci/pcie/Kconfig                   |    2 +-
3732  drivers/pci/pcie/aspm.c                    |   58 +++++++----
3733  drivers/pci/probe.c                        |   68 +++++++++++--
3734  drivers/pci/remove.c                       |   10 ++-
3735  drivers/pci/setup-res.c                    |    6 +-
3736  drivers/scsi/ipr.c                         |   67 +++++++++++--
3737  drivers/scsi/ipr.h                         |    1 +
3738  drivers/uio/uio_pci_generic.c              |   78 ++-------------
3739  include/linux/msi.h                        |    3 +
3740  include/linux/pci-aspm.h                   |    4 +-
3741  include/linux/pci.h                        |   43 +++++---
3742  include/linux/pci_regs.h                   |    6 +-
3743  93 files changed, 1114 insertions(+), 813 deletions(-)
3744 Merging hid/for-next (aba3b66 Merge branch 'multitouch' into for-next)
3745 $ git merge hid/for-next
3746 Auto-merging drivers/hid/hid-wiimote-core.c
3747 Removing drivers/hid/hid-quanta.c
3748 Auto-merging drivers/hid/hid-hyperv.c
3749 Merge made by the 'recursive' strategy.
3750  .../ABI/testing/sysfs-driver-hid-multitouch        |    9 +
3751  .../ABI/testing/sysfs-driver-hid-roccat-isku       |  135 ++++
3752  Documentation/ABI/testing/sysfs-driver-hid-wiimote |   12 +
3753  drivers/hid/Kconfig                                |   35 +-
3754  drivers/hid/Makefile                               |   11 +-
3755  drivers/hid/hid-core.c                             |   71 ++-
3756  drivers/hid/hid-debug.c                            |    8 +
3757  .../{staging/hv/hv_mouse.c => hid/hid-hyperv.c}    |  303 ++++----
3758  drivers/hid/hid-ids.h                              |   27 +-
3759  drivers/hid/hid-input.c                            |  117 +++
3760  drivers/hid/hid-lg4ff.c                            |    2 +-
3761  drivers/hid/hid-multitouch.c                       |  176 ++++--
3762  drivers/hid/hid-picolcd.c                          |    4 +-
3763  drivers/hid/hid-quanta.c                           |  261 -------
3764  drivers/hid/hid-roccat-common.c                    |    4 +-
3765  drivers/hid/hid-roccat-isku.c                      |  487 +++++++++++++
3766  drivers/hid/hid-roccat-isku.h                      |  147 ++++
3767  drivers/hid/hid-roccat-kone.c                      |    4 +-
3768  drivers/hid/hid-wacom.c                            |  179 ++++-
3769  drivers/hid/{hid-wiimote.c => hid-wiimote-core.c}  |  246 +++----
3770  drivers/hid/hid-wiimote-debug.c                    |  227 ++++++
3771  drivers/hid/hid-wiimote-ext.c                      |  752 ++++++++++++++++++++
3772  drivers/hid/hid-wiimote.h                          |  208 ++++++
3773  drivers/hid/usbhid/hid-quirks.c                    |    3 +
3774  drivers/hid/usbhid/usbkbd.c                        |   64 ++-
3775  drivers/staging/hv/Kconfig                         |    6 -
3776  drivers/staging/hv/Makefile                        |    1 -
3777  drivers/usb/misc/usbled.c                          |    2 +
3778  include/linux/hid.h                                |   16 +
3779  29 files changed, 2830 insertions(+), 687 deletions(-)
3780  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-multitouch
3781  create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-isku
3782  rename drivers/{staging/hv/hv_mouse.c => hid/hid-hyperv.c} (75%)
3783  delete mode 100644 drivers/hid/hid-quanta.c
3784  create mode 100644 drivers/hid/hid-roccat-isku.c
3785  create mode 100644 drivers/hid/hid-roccat-isku.h
3786  rename drivers/hid/{hid-wiimote.c => hid-wiimote-core.c} (89%)
3787  create mode 100644 drivers/hid/hid-wiimote-debug.c
3788  create mode 100644 drivers/hid/hid-wiimote-ext.c
3789  create mode 100644 drivers/hid/hid-wiimote.h
3790 Merging quilt/i2c (a682833 i2c-ali1535: enable SPARC support)
3791 $ git merge quilt/i2c
3792 Merge made by the 'recursive' strategy.
3793  drivers/i2c/busses/i2c-ali1535.c |   38 +++++++++++++++++++++++++++-----------
3794  drivers/i2c/busses/i2c-nforce2.c |    2 +-
3795  drivers/i2c/busses/i2c-sis5595.c |    4 ++--
3796  drivers/i2c/busses/i2c-sis630.c  |    6 +++++-
3797  drivers/i2c/busses/i2c-viapro.c  |    7 +++++--
3798  5 files changed, 40 insertions(+), 17 deletions(-)
3799 Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge)
3800 $ git merge bjdooks-i2c/next-i2c
3801 Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution.
3802 Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
3803 CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c
3804 Automatic merge failed; fix conflicts and then commit the result.
3805 $ git commit -v -a
3806 [master bbb55e6] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
3807 $ git diff -M --stat --summary HEAD^..
3808  drivers/i2c/busses/i2c-designware-platdrv.c |    2 +-
3809  1 files changed, 1 insertions(+), 1 deletions(-)
3810 Merging quilt/jdelvare-hwmon (4a96f1a hwmon: (coretemp) Add missing section annotations)
3811 $ git merge quilt/jdelvare-hwmon
3812 Merge made by the 'recursive' strategy.
3813  Documentation/hwmon/lm63 |    8 +++
3814  drivers/hwmon/Kconfig    |    4 +-
3815  drivers/hwmon/coretemp.c |   26 +++++----
3816  drivers/hwmon/lm63.c     |  131 +++++++++++++++++++++++++++++++++++----------
3817  drivers/hwmon/max1111.c  |   15 +++--
3818  5 files changed, 136 insertions(+), 48 deletions(-)
3819 Merging hwmon-staging/hwmon-next (01aa042 hwmon: (f75375s) Add support for F75387SG/RG)
3820 $ git merge hwmon-staging/hwmon-next
3821 Auto-merging drivers/hwmon/Kconfig
3822 Merge made by the 'recursive' strategy.
3823  Documentation/hwmon/pmbus     |    5 +-
3824  Documentation/hwmon/zl6100    |   15 ++
3825  drivers/hwmon/Kconfig         |    4 +-
3826  drivers/hwmon/f75375s.c       |  309 +++++++++++++++++++++++++++++++----------
3827  drivers/hwmon/pmbus/Kconfig   |    9 +-
3828  drivers/hwmon/pmbus/adm1275.c |   71 +++++++---
3829  drivers/hwmon/pmbus/pmbus.c   |    2 -
3830  drivers/hwmon/pmbus/zl6100.c  |   43 +++++-
3831  8 files changed, 344 insertions(+), 114 deletions(-)
3832 Merging quilt/kernel-doc (c3b92c8 Linux 3.1)
3833 $ git merge quilt/kernel-doc
3834 Already up-to-date.
3835 Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move)
3836 $ git merge docs/docs-move
3837 Already up-to-date.
3838 Merging v4l-dvb/master (6dd9380 Merge /home/v4l/v4l/patchwork)
3839 $ git merge v4l-dvb/master
3840 Resolved 'drivers/staging/media/as102/as102_drv.h' using previous resolution.
3841 Auto-merging drivers/staging/media/as102/as102_drv.h
3842 CONFLICT (content): Merge conflict in drivers/staging/media/as102/as102_drv.h
3843 Auto-merging drivers/staging/media/as102/as102_drv.c
3844 Auto-merging MAINTAINERS
3845 Automatic merge failed; fix conflicts and then commit the result.
3846 $ git commit -v -a
3847 [master 18deea5] Merge remote-tracking branch 'v4l-dvb/master'
3848 $ git diff -M --stat --summary HEAD^..
3849  Documentation/DocBook/media/dvb/dvbproperty.xml    |    4 +
3850  Documentation/DocBook/media/v4l/biblio.xml         |    8 -
3851  Documentation/DocBook/media/v4l/common.xml         |    8 -
3852  Documentation/DocBook/media/v4l/compat.xml         |   10 +-
3853  Documentation/DocBook/media/v4l/controls.xml       |    8 -
3854  Documentation/DocBook/media/v4l/dev-capture.xml    |    8 -
3855  Documentation/DocBook/media/v4l/dev-codec.xml      |    8 -
3856  Documentation/DocBook/media/v4l/dev-effect.xml     |    8 -
3857  Documentation/DocBook/media/v4l/dev-event.xml      |    8 -
3858  Documentation/DocBook/media/v4l/dev-osd.xml        |    8 -
3859  Documentation/DocBook/media/v4l/dev-output.xml     |    8 -
3860  Documentation/DocBook/media/v4l/dev-overlay.xml    |    8 -
3861  Documentation/DocBook/media/v4l/dev-radio.xml      |    8 -
3862  Documentation/DocBook/media/v4l/dev-raw-vbi.xml    |    8 -
3863  Documentation/DocBook/media/v4l/dev-rds.xml        |   16 +-
3864  Documentation/DocBook/media/v4l/dev-sliced-vbi.xml |    9 -
3865  Documentation/DocBook/media/v4l/dev-teletext.xml   |    8 -
3866  Documentation/DocBook/media/v4l/driver.xml         |    8 -
3867  Documentation/DocBook/media/v4l/func-close.xml     |    8 -
3868  Documentation/DocBook/media/v4l/func-ioctl.xml     |    8 -
3869  Documentation/DocBook/media/v4l/func-mmap.xml      |    8 -
3870  Documentation/DocBook/media/v4l/func-munmap.xml    |    8 -
3871  Documentation/DocBook/media/v4l/func-open.xml      |    8 -
3872  Documentation/DocBook/media/v4l/func-poll.xml      |    8 -
3873  Documentation/DocBook/media/v4l/func-read.xml      |    8 -
3874  Documentation/DocBook/media/v4l/func-select.xml    |    8 -
3875  Documentation/DocBook/media/v4l/func-write.xml     |    8 -
3876  Documentation/DocBook/media/v4l/io.xml             |    8 -
3877  Documentation/DocBook/media/v4l/libv4l.xml         |    7 -
3878  Documentation/DocBook/media/v4l/pixfmt-grey.xml    |    8 -
3879  Documentation/DocBook/media/v4l/pixfmt-m420.xml    |    8 -
3880  Documentation/DocBook/media/v4l/pixfmt-nv12.xml    |    8 -
3881  Documentation/DocBook/media/v4l/pixfmt-nv12m.xml   |    8 -
3882  Documentation/DocBook/media/v4l/pixfmt-nv12mt.xml  |    8 -
3883  Documentation/DocBook/media/v4l/pixfmt-nv16.xml    |    8 -
3884  .../DocBook/media/v4l/pixfmt-packed-rgb.xml        |    8 -
3885  .../DocBook/media/v4l/pixfmt-packed-yuv.xml        |    8 -
3886  Documentation/DocBook/media/v4l/pixfmt-sbggr16.xml |    8 -
3887  Documentation/DocBook/media/v4l/pixfmt-sbggr8.xml  |    8 -
3888  Documentation/DocBook/media/v4l/pixfmt-sgbrg8.xml  |    8 -
3889  Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml  |    8 -
3890  Documentation/DocBook/media/v4l/pixfmt-uyvy.xml    |    8 -
3891  Documentation/DocBook/media/v4l/pixfmt-vyuy.xml    |    8 -
3892  Documentation/DocBook/media/v4l/pixfmt-y16.xml     |    8 -
3893  Documentation/DocBook/media/v4l/pixfmt-y41p.xml    |    8 -
3894  Documentation/DocBook/media/v4l/pixfmt-yuv410.xml  |    8 -
3895  Documentation/DocBook/media/v4l/pixfmt-yuv411p.xml |    8 -
3896  Documentation/DocBook/media/v4l/pixfmt-yuv420.xml  |    8 -
3897  Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml |    8 -
3898  Documentation/DocBook/media/v4l/pixfmt-yuv422p.xml |    8 -
3899  Documentation/DocBook/media/v4l/pixfmt-yuyv.xml    |    8 -
3900  Documentation/DocBook/media/v4l/pixfmt-yvyu.xml    |    8 -
3901  Documentation/DocBook/media/v4l/pixfmt.xml         |    8 -
3902  .../DocBook/media/v4l/vidioc-enum-dv-presets.xml   |    8 -
3903  .../DocBook/media/v4l/vidioc-enum-fmt.xml          |    8 -
3904  .../DocBook/media/v4l/vidioc-enuminput.xml         |    8 -
3905  .../DocBook/media/v4l/vidioc-enumoutput.xml        |    8 -
3906  Documentation/DocBook/media/v4l/vidioc-enumstd.xml |    8 -
3907  Documentation/DocBook/media/v4l/vidioc-g-ctrl.xml  |    8 -
3908  .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml       |    7 -
3909  Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml  |   14 +-
3910  .../DocBook/media/v4l/vidioc-g-frequency.xml       |    8 -
3911  .../DocBook/media/v4l/vidioc-g-modulator.xml       |    8 -
3912  .../DocBook/media/v4l/vidioc-g-priority.xml        |    8 -
3913  Documentation/DocBook/media/v4l/vidioc-g-std.xml   |    8 -
3914  Documentation/DocBook/media/v4l/vidioc-g-tuner.xml |   18 +-
3915  .../DocBook/media/v4l/vidioc-querybuf.xml          |    8 -
3916  .../DocBook/media/v4l/vidioc-queryctrl.xml         |    8 -
3917  .../DocBook/media/v4l/vidioc-s-hw-freq-seek.xml    |    8 -
3918  Documentation/dvb/get_dvb_firmware                 |   42 +-
3919  Documentation/video4linux/CARDLIST.bttv            |    2 +-
3920  Documentation/video4linux/CARDLIST.cx23885         |    2 +
3921  Documentation/video4linux/CARDLIST.cx88            |    2 +
3922  Documentation/video4linux/CARDLIST.em28xx          |    6 +-
3923  Documentation/video4linux/CARDLIST.saa7134         |    1 +
3924  Documentation/video4linux/CARDLIST.saa7164         |    2 +
3925  Documentation/video4linux/v4l2-framework.txt       |   11 +
3926  MAINTAINERS                                        |   10 +
3927  drivers/media/common/tuners/mt2060.c               |    9 +-
3928  drivers/media/common/tuners/mxl5007t.c             |   52 +-
3929  drivers/media/common/tuners/qt1010.c               |    9 +-
3930  drivers/media/common/tuners/tda18212.c             |   66 +-
3931  drivers/media/common/tuners/tda18212.h             |    4 +
3932  drivers/media/common/tuners/tda18218.c             |   18 +-
3933  drivers/media/common/tuners/tda18218_priv.h        |    2 +
3934  drivers/media/common/tuners/tda18271-fe.c          |   10 +
3935  drivers/media/common/tuners/tda18271-priv.h        |    2 +
3936  drivers/media/common/tuners/tuner-simple.c         |   11 +
3937  drivers/media/common/tuners/tuner-xc2028.c         |    2 +-
3938  drivers/media/common/tuners/xc5000.c               |   47 +-
3939  drivers/media/dvb/dvb-core/dvb_frontend.c          |    2 +
3940  drivers/media/dvb/dvb-usb/Kconfig                  |    5 +-
3941  drivers/media/dvb/dvb-usb/af9015.c                 |   97 ++
3942  drivers/media/dvb/dvb-usb/af9015.h                 |    7 +
3943  drivers/media/dvb/dvb-usb/anysee.c                 |  411 +++++++--
3944  drivers/media/dvb/dvb-usb/anysee.h                 |    6 +
3945  drivers/media/dvb/dvb-usb/dib0700_devices.c        |  676 ++++++++++++-
3946  drivers/media/dvb/dvb-usb/dvb-usb-ids.h            |    5 +
3947  drivers/media/dvb/dvb-usb/dw2102.c                 |   15 +-
3948  drivers/media/dvb/dvb-usb/it913x.c                 |  282 ++++--
3949  drivers/media/dvb/dvb-usb/mxl111sf-tuner.c         |   56 +-
3950  drivers/media/dvb/dvb-usb/ttusb2.c                 |   19 +-
3951  drivers/media/dvb/firewire/firedtv-avc.c           |    3 +-
3952  drivers/media/dvb/frontends/af9013.c               |   41 +-
3953  drivers/media/dvb/frontends/au8522_dig.c           |   31 +-
3954  drivers/media/dvb/frontends/cxd2820r.h             |   13 -
3955  drivers/media/dvb/frontends/cxd2820r_c.c           |   13 +-
3956  drivers/media/dvb/frontends/cxd2820r_t.c           |   55 +-
3957  drivers/media/dvb/frontends/cxd2820r_t2.c          |   62 +-
3958  drivers/media/dvb/frontends/dib0090.c              |  163 +++-
3959  drivers/media/dvb/frontends/dib0090.h              |   54 +-
3960  drivers/media/dvb/frontends/dib7000p.c             |  332 ++++---
3961  drivers/media/dvb/frontends/dib7000p.h             |   16 +-
3962  drivers/media/dvb/frontends/dib8000.c              | 1061 ++++++++++++++++++--
3963  drivers/media/dvb/frontends/dib8000.h              |   42 +-
3964  drivers/media/dvb/frontends/dibx000_common.h       |    7 +
3965  drivers/media/dvb/frontends/drxd_hard.c            |    3 +-
3966  drivers/media/dvb/frontends/drxk.h                 |    2 +
3967  drivers/media/dvb/frontends/drxk_hard.c            |   18 +-
3968  drivers/media/dvb/frontends/drxk_hard.h            |    2 +
3969  drivers/media/dvb/frontends/it913x-fe-priv.h       |  742 +++++++++++++-
3970  drivers/media/dvb/frontends/it913x-fe.c            |  198 +++-
3971  drivers/media/dvb/frontends/it913x-fe.h            |   33 +-
3972  drivers/media/dvb/frontends/s5h1409.c              |   31 +-
3973  drivers/media/dvb/frontends/s5h1411.c              |   31 +-
3974  drivers/media/dvb/frontends/tda18271c2dd.c         |   32 +-
3975  drivers/media/dvb/ttpci/av7110.c                   |    2 +-
3976  drivers/media/radio/Kconfig                        |  297 +++---
3977  drivers/media/radio/tef6862.c                      |    8 +-
3978  drivers/media/radio/wl128x/fmdrv_v4l2.c            |    1 +
3979  drivers/media/rc/Kconfig                           |   10 +
3980  drivers/media/rc/Makefile                          |    1 +
3981  drivers/media/rc/ati_remote.c                      |  111 +--
3982  drivers/media/rc/ir-nec-decoder.c                  |    4 +-
3983  drivers/media/rc/ir-raw.c                          |    1 +
3984  drivers/media/rc/ir-rc6-decoder.c                  |   67 +-
3985  drivers/media/rc/ir-sanyo-decoder.c                |  205 ++++
3986  drivers/media/rc/keymaps/rc-ati-x10.c              |   96 +-
3987  drivers/media/rc/keymaps/rc-hauppauge.c            |   51 +
3988  drivers/media/rc/keymaps/rc-medion-x10.c           |  128 ++--
3989  drivers/media/rc/keymaps/rc-snapstream-firefly.c   |  114 ++--
3990  drivers/media/rc/rc-core-priv.h                    |   12 +
3991  drivers/media/rc/rc-main.c                         |    1 +
3992  drivers/media/rc/redrat3.c                         |   52 +-
3993  drivers/media/video/Kconfig                        |  412 +++++----
3994  drivers/media/video/Makefile                       |    2 +
3995  drivers/media/video/adv7170.c                      |   62 ++
3996  drivers/media/video/atmel-isi.c                    |    2 +-
3997  drivers/media/video/au0828/au0828-cards.c          |    7 +
3998  drivers/media/video/au0828/au0828-i2c.c            |    2 +-
3999  drivers/media/video/bt8xx/bt848.h                  |    5 +-
4000  drivers/media/video/bt8xx/bttv-cards.c             |   58 +-
4001  drivers/media/video/bt8xx/bttv-driver.c            |    1 +
4002  drivers/media/video/bt8xx/bttv-i2c.c               |    2 +-
4003  drivers/media/video/bt8xx/bttv.h                   |    3 +-
4004  drivers/media/video/cx18/cx18-i2c.c                |    2 +-
4005  drivers/media/video/cx18/cx18-i2c.h                |    2 +-
4006  drivers/media/video/cx231xx/Kconfig                |    4 +-
4007  drivers/media/video/cx23885/cx23885-cards.c        |   36 +
4008  drivers/media/video/cx23885/cx23885-i2c.c          |    2 +-
4009  drivers/media/video/cx23885/cx23885-video.c        |    3 +-
4010  drivers/media/video/cx23885/cx23885.h              |    1 +
4011  drivers/media/video/cx25821/cx25821-alsa.c         |   73 +-
4012  .../media/video/cx25821/cx25821-audio-upstream.c   |  113 +--
4013  drivers/media/video/cx25821/cx25821-audio.h        |   39 +-
4014  drivers/media/video/cx25821/cx25821-cards.c        |    2 +-
4015  drivers/media/video/cx25821/cx25821-core.c         |   57 +-
4016  drivers/media/video/cx25821/cx25821-i2c.c          |   12 +-
4017  .../media/video/cx25821/cx25821-medusa-defines.h   |    6 +-
4018  drivers/media/video/cx25821/cx25821-medusa-reg.h   |  518 +++++-----
4019  drivers/media/video/cx25821/cx25821-medusa-video.c |  410 +++-----
4020  .../video/cx25821/cx25821-video-upstream-ch2.c     |  138 ++--
4021  .../media/video/cx25821/cx25821-video-upstream.c   |  156 ++--
4022  drivers/media/video/cx25821/cx25821-video.c        |  145 ++--
4023  drivers/media/video/cx25821/cx25821.h              |    4 +-
4024  drivers/media/video/cx88/Kconfig                   |   10 +-
4025  drivers/media/video/cx88/cx88-i2c.c                |    2 +-
4026  drivers/media/video/davinci/vpbe_display.c         |    5 +-
4027  drivers/media/video/em28xx/em28xx-cards.c          |   62 ++-
4028  drivers/media/video/em28xx/em28xx-dvb.c            |  135 +++-
4029  drivers/media/video/em28xx/em28xx-input.c          |    7 +-
4030  drivers/media/video/em28xx/em28xx.h                |    3 +
4031  drivers/media/video/gspca/benq.c                   |    7 +-
4032  drivers/media/video/gspca/gl860/gl860.c            |    1 -
4033  drivers/media/video/gspca/gspca.c                  |    3 +-
4034  drivers/media/video/gspca/gspca.h                  |    2 -
4035  drivers/media/video/gspca/konica.c                 |    3 -
4036  drivers/media/video/gspca/mars.c                   |    1 -
4037  drivers/media/video/gspca/nw80x.c                  |    1 -
4038  drivers/media/video/gspca/ov519.c                  |    1 -
4039  drivers/media/video/gspca/pac207.c                 |   10 +-
4040  drivers/media/video/gspca/se401.c                  |   10 +-
4041  drivers/media/video/gspca/sonixj.c                 |   18 +-
4042  drivers/media/video/gspca/spca561.c                |    1 -
4043  drivers/media/video/gspca/topro.c                  |    2 +-
4044  drivers/media/video/gspca/xirlink_cit.c            |    2 -
4045  drivers/media/video/gspca/zc3xx.c                  |  117 +--
4046  drivers/media/video/ivtv/ivtv-fileops.c            |    6 +-
4047  drivers/media/video/ivtv/ivtv-i2c.h                |    2 +-
4048  drivers/media/video/m5mols/m5mols.h                |    2 -
4049  drivers/media/video/m5mols/m5mols_core.c           |   22 +-
4050  drivers/media/video/mt9m001.c                      |    5 +-
4051  drivers/media/video/mt9m111.c                      |    8 +-
4052  drivers/media/video/mt9p031.c                      |    5 +-
4053  drivers/media/video/mt9t001.c                      |    5 +-
4054  drivers/media/video/mt9t031.c                      |    5 +-
4055  drivers/media/video/mt9t112.c                      |    4 +-
4056  drivers/media/video/mt9v022.c                      |    5 +-
4057  drivers/media/video/mt9v032.c                      |    8 +-
4058  drivers/media/video/omap/omap_vout.c               |  196 ++--
4059  drivers/media/video/omap/omap_voutdef.h            |    2 +-
4060  drivers/media/video/omap1_camera.c                 |    1 +
4061  drivers/media/video/omap24xxcam-dma.c              |    2 +-
4062  drivers/media/video/omap3isp/ispvideo.c            |    1 +
4063  drivers/media/video/ov6650.c                       |    2 +-
4064  drivers/media/video/pwc/pwc-ctrl.c                 |  137 ++--
4065  drivers/media/video/pwc/pwc-dec23.c                |    7 +
4066  drivers/media/video/pwc/pwc-dec23.h                |    2 +
4067  drivers/media/video/pwc/pwc-if.c                   |  155 ++--
4068  drivers/media/video/pwc/pwc-v4l.c                  |  155 ++-
4069  drivers/media/video/pwc/pwc.h                      |   11 +-
4070  drivers/media/video/s5p-fimc/fimc-capture.c        |   14 +-
4071  drivers/media/video/s5p-fimc/fimc-core.c           |   24 +-
4072  drivers/media/video/s5p-fimc/fimc-core.h           |    2 +
4073  drivers/media/video/s5p-fimc/fimc-mdevice.c        |   43 +-
4074  drivers/media/video/s5p-fimc/fimc-reg.c            |   15 +-
4075  drivers/media/video/s5p-g2d/Makefile               |    3 +
4076  drivers/media/video/s5p-g2d/g2d-hw.c               |  104 ++
4077  drivers/media/video/s5p-g2d/g2d-regs.h             |  115 +++
4078  drivers/media/video/s5p-g2d/g2d.c                  |  824 +++++++++++++++
4079  drivers/media/video/s5p-g2d/g2d.h                  |   83 ++
4080  drivers/media/video/s5p-mfc/s5p_mfc_enc.c          |    2 +-
4081  drivers/media/video/s5p-tv/mixer_video.c           |    1 +
4082  drivers/media/video/saa7134/saa7134-cards.c        |   33 +
4083  drivers/media/video/saa7134/saa7134.h              |    1 +
4084  drivers/media/video/saa7164/saa7164-bus.c          |    4 +-
4085  drivers/media/video/sh_mobile_ceu_camera.c         |   34 +-
4086  drivers/media/video/sh_mobile_csi2.c               |    4 +-
4087  drivers/media/video/soc_camera.c                   |    3 +-
4088  drivers/media/video/tm6000/Kconfig                 |    6 +-
4089  drivers/media/video/tm6000/tm6000-alsa.c           |   21 +-
4090  drivers/media/video/tm6000/tm6000-cards.c          |   33 +
4091  drivers/media/video/tm6000/tm6000-core.c           |   74 +--
4092  drivers/media/video/tm6000/tm6000-dvb.c            |   16 +-
4093  drivers/media/video/tm6000/tm6000-input.c          |  407 ++++----
4094  drivers/media/video/tm6000/tm6000-regs.h           |   14 +-
4095  drivers/media/video/tm6000/tm6000-stds.c           |   89 +-
4096  drivers/media/video/tm6000/tm6000-video.c          |   21 +-
4097  drivers/media/video/tm6000/tm6000.h                |    3 +
4098  drivers/media/video/tvp5150.c                      |   14 +-
4099  drivers/media/video/usbvision/usbvision-i2c.c      |   46 +-
4100  drivers/media/video/uvc/Kconfig                    |    1 +
4101  drivers/media/video/uvc/Makefile                   |    2 +-
4102  drivers/media/video/uvc/uvc_ctrl.c                 |   17 +-
4103  drivers/media/video/uvc/uvc_debugfs.c              |  136 +++
4104  drivers/media/video/uvc/uvc_driver.c               |   30 +-
4105  drivers/media/video/uvc/uvc_isight.c               |   10 +-
4106  drivers/media/video/uvc/uvc_queue.c                |  564 +++--------
4107  drivers/media/video/uvc/uvc_v4l2.c                 |   29 +-
4108  drivers/media/video/uvc/uvc_video.c                |  625 +++++++++++-
4109  drivers/media/video/uvc/uvcvideo.h                 |  128 ++-
4110  drivers/media/video/v4l2-dev.c                     |   10 +-
4111  drivers/media/video/via-camera.c                   |   10 +-
4112  drivers/media/video/videobuf-core.c                |    3 +-
4113  drivers/media/video/videobuf2-core.c               |   48 +-
4114  drivers/media/video/vino.c                         |    2 +-
4115  drivers/media/video/vivi.c                         |    9 +-
4116  drivers/staging/media/as102/Kconfig                |    1 +
4117  drivers/staging/media/as102/Makefile               |    2 +-
4118  drivers/staging/media/as102/as102_drv.c            |  126 +--
4119  drivers/staging/media/as102/as102_drv.h            |   59 +-
4120  drivers/staging/media/as102/as102_fe.c             |    4 -
4121  drivers/staging/media/as102/as102_fw.c             |   44 +-
4122  drivers/staging/media/as102/as102_fw.h             |   10 +-
4123  drivers/staging/media/as102/as102_usb_drv.c        |   36 +-
4124  drivers/staging/media/as102/as102_usb_drv.h        |    6 +-
4125  drivers/staging/media/as102/as10x_cmd.c            |  139 ++--
4126  drivers/staging/media/as102/as10x_cmd.h            |  895 ++++++++---------
4127  drivers/staging/media/as102/as10x_cmd_cfg.c        |   66 +-
4128  drivers/staging/media/as102/as10x_cmd_stream.c     |   56 +-
4129  drivers/staging/media/as102/as10x_handle.h         |   26 +-
4130  drivers/staging/media/as102/as10x_types.h          |  250 +++---
4131  drivers/staging/media/easycap/easycap.h            |   93 +--
4132  drivers/staging/media/easycap/easycap_ioctl.c      |   60 +-
4133  drivers/staging/media/easycap/easycap_low.c        |  273 +----
4134  drivers/staging/media/easycap/easycap_main.c       |  379 +++-----
4135  drivers/staging/media/easycap/easycap_settings.c   |    2 +-
4136  drivers/staging/media/easycap/easycap_sound.c      |  340 +++----
4137  drivers/staging/media/go7007/go7007-usb.c          |    8 +-
4138  drivers/staging/media/lirc/lirc_imon.c             |    4 +-
4139  drivers/staging/media/lirc/lirc_serial.c           |  113 +--
4140  drivers/staging/media/solo6x10/Makefile            |    2 +-
4141  .../media/solo6x10/{jpeg.h => solo6x10-jpeg.h}     |    0
4142  drivers/staging/media/solo6x10/v4l2-enc.c          |    2 +-
4143  fs/eventpoll.c                                     |   18 +-
4144  fs/select.c                                        |   38 +-
4145  include/linux/dvb/frontend.h                       |    2 +
4146  include/linux/poll.h                               |   13 +-
4147  include/media/rc-map.h                             |    8 +-
4148  include/media/soc_camera.h                         |    7 +-
4149  300 files changed, 10907 insertions(+), 5892 deletions(-)
4150  create mode 100644 drivers/media/rc/ir-sanyo-decoder.c
4151  create mode 100644 drivers/media/video/s5p-g2d/Makefile
4152  create mode 100644 drivers/media/video/s5p-g2d/g2d-hw.c
4153  create mode 100644 drivers/media/video/s5p-g2d/g2d-regs.h
4154  create mode 100644 drivers/media/video/s5p-g2d/g2d.c
4155  create mode 100644 drivers/media/video/s5p-g2d/g2d.h
4156  create mode 100644 drivers/media/video/uvc/uvc_debugfs.c
4157  rename drivers/staging/media/solo6x10/{jpeg.h => solo6x10-jpeg.h} (100%)
4158 Merging kbuild/for-next (ddb550d Merge branch 'kbuild/misc' into kbuild/for-next)
4159 $ git merge kbuild/for-next
4160 Merge made by the 'recursive' strategy.
4161  scripts/tags.sh |   46 ++++++++++++++++++++++++++++++++++++++++++++--
4162  1 files changed, 44 insertions(+), 2 deletions(-)
4163 Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next)
4164 $ git merge kconfig/for-next
4165 Already up-to-date!
4166 Merge made by the 'recursive' strategy.
4167 Merging libata/NEXT (318072d SATA/PATA: convert drivers/ata/* to use module_platform_driver())
4168 $ git merge libata/NEXT
4169 Auto-merging drivers/ata/pata_at91.c
4170 Merge made by the 'recursive' strategy.
4171  drivers/ata/libahci.c          |    5 +-
4172  drivers/ata/libata-core.c      |  154 ++++++++++++++++++++++------------------
4173  drivers/ata/libata-scsi.c      |    3 +-
4174  drivers/ata/libata-sff.c       |    4 +-
4175  drivers/ata/libata-transport.c |    5 ++
4176  drivers/ata/libata.h           |    1 +
4177  drivers/ata/pata_arasan_cf.c   |   12 +---
4178  drivers/ata/pata_at91.c        |   15 +----
4179  drivers/ata/pata_cs5536.c      |   99 +++++++++++---------------
4180  drivers/ata/pata_imx.c         |   12 +---
4181  drivers/ata/pata_ixp4xx_cf.c   |   13 +---
4182  drivers/ata/pata_mpc52xx.c     |   21 +-----
4183  drivers/ata/pata_of_platform.c |   12 +---
4184  drivers/ata/pata_palmld.c      |   13 +---
4185  drivers/ata/pata_platform.c    |   12 +---
4186  drivers/ata/pata_pxa.c         |   13 +---
4187  drivers/ata/pata_rb532_cf.c    |   21 +-----
4188  drivers/ata/sata_dwc_460ex.c   |   13 +---
4189  drivers/ata/sata_fsl.c         |   14 +----
4190  drivers/scsi/scsi_error.c      |    5 +-
4191  drivers/scsi/scsi_pm.c         |   16 ++++-
4192  drivers/scsi/sd.c              |    5 ++
4193  include/scsi/scsi_host.h       |    3 +
4194  23 files changed, 176 insertions(+), 295 deletions(-)
4195 Merging infiniband/for-next (5611cc45 Linux 3.2-rc4)
4196 $ git merge infiniband/for-next
4197 Already up-to-date.
4198 Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next)
4199 $ git merge acpi/next
4200 Already up-to-date.
4201 Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand")
4202 $ git merge cpupowerutils/master
4203 Already up-to-date.
4204 Merging ieee1394/for-next (a572e68 firewire: ohci: fix isochronous DMA synchronization)
4205 $ git merge ieee1394/for-next
4206 Already up-to-date.
4207 Merging ubi/linux-next (c55d743 UBI: fix missing scrub when there is a bit-flip)
4208 $ git merge ubi/linux-next
4209 Merge made by the 'recursive' strategy.
4210  drivers/mtd/ubi/eba.c |    6 ++++--
4211  drivers/mtd/ubi/ubi.h |    2 ++
4212  drivers/mtd/ubi/wl.c  |    5 ++++-
4213  3 files changed, 10 insertions(+), 3 deletions(-)
4214 Merging dlm/next (9beb3bf dlm: convert rsb list to rb_tree)
4215 $ git merge dlm/next
4216 Merge made by the 'recursive' strategy.
4217  fs/dlm/debug_fs.c     |   28 ++++++++-------
4218  fs/dlm/dlm_internal.h |    9 +++--
4219  fs/dlm/lock.c         |   87 +++++++++++++++++++++++++++++++++++++++---------
4220  fs/dlm/lockspace.c    |   23 +++++--------
4221  fs/dlm/recover.c      |   21 +++++++----
4222  5 files changed, 113 insertions(+), 55 deletions(-)
4223 Merging scsi/master (5c41dc3 [SCSI] lpfc 8.3.28: Update driver version to 8.3.28)
4224 $ git merge scsi/master
4225 Merge made by the 'recursive' strategy.
4226  drivers/message/fusion/lsi/mpi_cnfg.h       |    1 +
4227  drivers/message/fusion/mptbase.c            |    7 +-
4228  drivers/message/fusion/mptbase.h            |    1 +
4229  drivers/message/fusion/mptsas.c             |    2 +
4230  drivers/scsi/be2iscsi/be_main.c             |    5 +-
4231  drivers/scsi/bfa/bfa_defs.h                 |    4 +-
4232  drivers/scsi/bfa/bfa_defs_svc.h             |  437 +++++++++--------
4233  drivers/scsi/bfa/bfa_ioc.c                  |    6 +-
4234  drivers/scsi/bfa/bfad_debugfs.c             |    3 +-
4235  drivers/scsi/device_handler/scsi_dh.c       |   58 ---
4236  drivers/scsi/device_handler/scsi_dh_emc.c   |   19 +
4237  drivers/scsi/device_handler/scsi_dh_hp_sw.c |   19 +
4238  drivers/scsi/device_handler/scsi_dh_rdac.c  |   19 +
4239  drivers/scsi/hpsa.c                         |    6 +-
4240  drivers/scsi/lpfc/lpfc.h                    |   14 -
4241  drivers/scsi/lpfc/lpfc_attr.c               |  436 ++++++-----------
4242  drivers/scsi/lpfc/lpfc_bsg.c                |  432 +++++++++++++----
4243  drivers/scsi/lpfc/lpfc_bsg.h                |    3 +-
4244  drivers/scsi/lpfc/lpfc_compat.h             |    5 +-
4245  drivers/scsi/lpfc/lpfc_crtn.h               |   13 +-
4246  drivers/scsi/lpfc/lpfc_debugfs.c            |  172 +++++---
4247  drivers/scsi/lpfc/lpfc_els.c                |  214 +++++----
4248  drivers/scsi/lpfc/lpfc_hbadisc.c            |  157 +++++--
4249  drivers/scsi/lpfc/lpfc_hw.h                 |   21 +-
4250  drivers/scsi/lpfc/lpfc_hw4.h                |   11 +-
4251  drivers/scsi/lpfc/lpfc_init.c               |  338 +++++++++-----
4252  drivers/scsi/lpfc/lpfc_mbox.c               |   25 +-
4253  drivers/scsi/lpfc/lpfc_mem.c                |    4 +-
4254  drivers/scsi/lpfc/lpfc_nportdisc.c          |   10 +-
4255  drivers/scsi/lpfc/lpfc_scsi.c               |   17 +-
4256  drivers/scsi/lpfc/lpfc_scsi.h               |    5 +-
4257  drivers/scsi/lpfc/lpfc_sli.c                |  704 +++++++++++++++++++--------
4258  drivers/scsi/lpfc/lpfc_sli4.h               |   11 +-
4259  drivers/scsi/lpfc/lpfc_version.h            |    2 +-
4260  drivers/scsi/lpfc/lpfc_vport.c              |    6 +-
4261  drivers/scsi/mac_scsi.c                     |    3 +-
4262  drivers/scsi/mpt2sas/mpi/mpi2.h             |   10 +-
4263  drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h        |   28 +-
4264  drivers/scsi/mpt2sas/mpi/mpi2_ioc.h         |   49 ++-
4265  drivers/scsi/mpt2sas/mpi/mpi2_raid.h        |   67 +++-
4266  drivers/scsi/mpt2sas/mpi/mpi2_tool.h        |    9 +-
4267  drivers/scsi/mpt2sas/mpt2sas_base.c         |  205 +++++----
4268  drivers/scsi/mpt2sas/mpt2sas_base.h         |   26 +-
4269  drivers/scsi/mpt2sas/mpt2sas_ctl.c          |    8 +-
4270  drivers/scsi/mpt2sas/mpt2sas_scsih.c        |  168 ++++---
4271  drivers/scsi/mpt2sas/mpt2sas_transport.c    |    9 +-
4272  drivers/scsi/qla2xxx/qla_attr.c             |   10 +-
4273  drivers/scsi/qla2xxx/qla_bsg.c              |   20 +-
4274  drivers/scsi/qla2xxx/qla_dbg.c              |  310 ++++++------
4275  drivers/scsi/qla2xxx/qla_dbg.h              |   19 +-
4276  drivers/scsi/qla2xxx/qla_def.h              |    6 +-
4277  drivers/scsi/qla2xxx/qla_gbl.h              |    2 +-
4278  drivers/scsi/qla2xxx/qla_gs.c               |    2 +-
4279  drivers/scsi/qla2xxx/qla_init.c             |   95 ++--
4280  drivers/scsi/qla2xxx/qla_iocb.c             |  641 ++++++++++++++++++++----
4281  drivers/scsi/qla2xxx/qla_isr.c              |  253 ++++++----
4282  drivers/scsi/qla2xxx/qla_mbx.c              |    2 +-
4283  drivers/scsi/qla2xxx/qla_nx.c               |  512 +-------------------
4284  drivers/scsi/qla2xxx/qla_os.c               |  363 +++++++-------
4285  drivers/scsi/qla2xxx/qla_sup.c              |    5 +-
4286  drivers/scsi/qla4xxx/ql4_dbg.c              |    6 +-
4287  drivers/scsi/qla4xxx/ql4_def.h              |    1 +
4288  drivers/scsi/qla4xxx/ql4_isr.c              |   30 +-
4289  drivers/scsi/qla4xxx/ql4_nx.c               |   23 +-
4290  drivers/scsi/qla4xxx/ql4_os.c               |  127 ++++-
4291  drivers/scsi/qla4xxx/ql4_version.h          |    2 +-
4292  drivers/scsi/scsi_priv.h                    |    1 -
4293  drivers/scsi/scsi_transport_iscsi.c         |   21 +-
4294  include/scsi/scsi_device.h                  |    1 -
4295  include/scsi/scsi_transport_iscsi.h         |    5 +
4296  70 files changed, 3624 insertions(+), 2602 deletions(-)
4297 Merging target-updates/for-next (6d5b597 target: Remove legacy device status check from transport_execute_tasks)
4298 $ git merge target-updates/for-next
4299 Removing include/target/target_core_transport.h
4300 Removing include/target/target_core_tpg.h
4301 Removing include/target/target_core_tmr.h
4302 Removing include/target/target_core_fabric_lib.h
4303 Auto-merging include/target/target_core_fabric.h
4304 Removing include/target/target_core_device.h
4305 Removing drivers/target/target_core_stat.h
4306 Removing drivers/target/target_core_hba.h
4307 Removing drivers/target/target_core_cdb.h
4308 Merge made by the 'recursive' strategy.
4309  Documentation/target/tcm_mod_builder.py            |   60 +---
4310  drivers/target/iscsi/iscsi_target.c                |   19 +-
4311  drivers/target/iscsi/iscsi_target_auth.c           |   36 ++-
4312  drivers/target/iscsi/iscsi_target_configfs.c       |   11 +-
4313  drivers/target/iscsi/iscsi_target_device.c         |    3 +-
4314  drivers/target/iscsi/iscsi_target_erl0.c           |    2 +-
4315  drivers/target/iscsi/iscsi_target_erl1.c           |    2 +-
4316  drivers/target/iscsi/iscsi_target_erl2.c           |    2 +-
4317  drivers/target/iscsi/iscsi_target_login.c          |   23 +-
4318  drivers/target/iscsi/iscsi_target_nego.c           |    4 +-
4319  drivers/target/iscsi/iscsi_target_nodeattrib.c     |    3 +-
4320  drivers/target/iscsi/iscsi_target_stat.c           |   17 +-
4321  drivers/target/iscsi/iscsi_target_tmr.c            |    2 +-
4322  drivers/target/iscsi/iscsi_target_tpg.c            |    6 +-
4323  drivers/target/iscsi/iscsi_target_util.c           |    8 +-
4324  drivers/target/loopback/tcm_loop.c                 |   33 +--
4325  drivers/target/loopback/tcm_loop.h                 |   11 +-
4326  drivers/target/target_core_alua.c                  |    7 +-
4327  drivers/target/target_core_cdb.c                   |   39 ++-
4328  drivers/target/target_core_cdb.h                   |   14 -
4329  drivers/target/target_core_configfs.c              |   34 ++-
4330  drivers/target/target_core_device.c                |   15 +-
4331  drivers/target/target_core_fabric_configfs.c       |    8 +-
4332  drivers/target/target_core_fabric_lib.c            |   13 +-
4333  drivers/target/target_core_file.c                  |   15 +-
4334  drivers/target/target_core_hba.c                   |    7 +-
4335  drivers/target/target_core_hba.h                   |    7 -
4336  drivers/target/target_core_iblock.c                |    7 +-
4337  drivers/target/target_core_internal.h              |  123 ++++++++
4338  drivers/target/target_core_pr.c                    |   24 +--
4339  drivers/target/target_core_pr.h                    |    2 -
4340  drivers/target/target_core_pscsi.c                 |   20 +-
4341  drivers/target/target_core_rd.c                    |    6 +-
4342  drivers/target/target_core_stat.c                  |    9 +-
4343  drivers/target/target_core_stat.h                  |    8 -
4344  drivers/target/target_core_tmr.c                   |   36 ++-
4345  drivers/target/target_core_tpg.c                   |    9 +-
4346  drivers/target/target_core_transport.c             |  329 +++++++++++---------
4347  drivers/target/target_core_ua.c                    |    6 +-
4348  drivers/target/tcm_fc/tfc_cmd.c                    |   57 +---
4349  drivers/target/tcm_fc/tfc_conf.c                   |    6 +-
4350  drivers/target/tcm_fc/tfc_io.c                     |    5 +-
4351  drivers/target/tcm_fc/tfc_sess.c                   |    5 +-
4352  include/target/target_core_backend.h               |   65 ++++
4353  include/target/target_core_base.h                  |  168 ++++++++---
4354  include/target/target_core_device.h                |   63 ----
4355  ...rget_core_fabric_ops.h => target_core_fabric.h} |   94 ++++++-
4356  include/target/target_core_fabric_lib.h            |   28 --
4357  include/target/target_core_tmr.h                   |   35 --
4358  include/target/target_core_tpg.h                   |   35 --
4359  include/target/target_core_transport.h             |  287 -----------------
4360  51 files changed, 814 insertions(+), 1014 deletions(-)
4361  delete mode 100644 drivers/target/target_core_cdb.h
4362  delete mode 100644 drivers/target/target_core_hba.h
4363  create mode 100644 drivers/target/target_core_internal.h
4364  delete mode 100644 drivers/target/target_core_stat.h
4365  create mode 100644 include/target/target_core_backend.h
4366  delete mode 100644 include/target/target_core_device.h
4367  rename include/target/{target_core_fabric_ops.h => target_core_fabric.h} (50%)
4368  delete mode 100644 include/target/target_core_fabric_lib.h
4369  delete mode 100644 include/target/target_core_tmr.h
4370  delete mode 100644 include/target/target_core_tpg.h
4371  delete mode 100644 include/target/target_core_transport.h
4372 Merging target-merge/for-next-merge (e0d85e5 ib_srpt: Initial SRP Target merge for v3.2-rc1)
4373 $ git merge target-merge/for-next-merge
4374 Merge made by the 'recursive' strategy.
4375  drivers/infiniband/Kconfig              |    1 +
4376  drivers/infiniband/Makefile             |    1 +
4377  drivers/infiniband/ulp/srpt/Kconfig     |   12 +
4378  drivers/infiniband/ulp/srpt/Makefile    |    2 +
4379  drivers/infiniband/ulp/srpt/ib_dm_mad.h |  139 ++
4380  drivers/infiniband/ulp/srpt/ib_srpt.c   | 4081 +++++++++++++++++++++++++++++++
4381  drivers/infiniband/ulp/srpt/ib_srpt.h   |  444 ++++
4382  7 files changed, 4680 insertions(+), 0 deletions(-)
4383  create mode 100644 drivers/infiniband/ulp/srpt/Kconfig
4384  create mode 100644 drivers/infiniband/ulp/srpt/Makefile
4385  create mode 100644 drivers/infiniband/ulp/srpt/ib_dm_mad.h
4386  create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.c
4387  create mode 100644 drivers/infiniband/ulp/srpt/ib_srpt.h
4388 $ git am -3 ../patches/Re__linux-next__build_failure_after_merge_of_the_target-merge_tree.patch
4389 Applying: linux-next: build failure after merge of the target-merge tree
4390 $ git reset HEAD^
4391 Unstaged changes after reset:
4392 M       drivers/infiniband/ulp/srpt/ib_srpt.c
4393 $ git add .
4394 $ git commit -v -a --amend
4395 [master 0119820] Merge remote-tracking branch 'target-merge/for-next-merge'
4396 Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
4397 $ git merge ibft/linux-next
4398 Already up-to-date.
4399 Merging slave-dma/next (3506c0d DMA: PL330: Remove pm_runtime_xxx calls from pl330 probe/remove)
4400 $ git merge slave-dma/next
4401 Resolved 'drivers/dma/pl330.c' using previous resolution.
4402 Auto-merging drivers/usb/renesas_usbhs/fifo.c
4403 Auto-merging drivers/tty/serial/sh-sci.c
4404 Auto-merging drivers/tty/serial/pch_uart.c
4405 Auto-merging drivers/spi/spi-pl022.c
4406 Auto-merging drivers/mmc/host/sh_mmcif.c
4407 Auto-merging drivers/mmc/host/mxcmmc.c
4408 Auto-merging drivers/misc/carma/carma-fpga-program.c
4409 Auto-merging drivers/dma/pl330.c
4410 CONFLICT (content): Merge conflict in drivers/dma/pl330.c
4411 Auto-merging arch/arm/plat-samsung/include/plat/dma-ops.h
4412 Auto-merging arch/arm/plat-samsung/dma-ops.c
4413 Auto-merging MAINTAINERS
4414 Automatic merge failed; fix conflicts and then commit the result.
4415 $ git commit -v -a
4416 [master 8f2ad82] Merge remote-tracking branch 'slave-dma/next'
4417 $ git diff -M --stat --summary HEAD^..
4418  .../devicetree/bindings/dma/atmel-dma.txt          |   14 +
4419  Documentation/dmaengine.txt                        |    8 +
4420  MAINTAINERS                                        |    1 +
4421  arch/arm/mach-ep93xx/include/mach/dma.h            |    6 +-
4422  arch/arm/plat-mxc/include/mach/mx3fb.h             |   15 +
4423  arch/arm/plat-nomadik/include/plat/ste_dma40.h     |   11 +-
4424  arch/arm/plat-samsung/dma-ops.c                    |    4 +-
4425  arch/arm/plat-samsung/include/plat/dma-ops.h       |    4 +-
4426  drivers/dma/Kconfig                                |   27 +-
4427  drivers/dma/Makefile                               |    1 +
4428  drivers/dma/amba-pl08x.c                           |   41 +-
4429  drivers/dma/at_hdmac.c                             |  103 +++-
4430  drivers/dma/at_hdmac_regs.h                        |    1 +
4431  drivers/dma/coh901318.c                            |   12 +-
4432  drivers/dma/coh901318_lli.c                        |   23 +-
4433  drivers/dma/coh901318_lli.h                        |    4 +-
4434  drivers/dma/dmaengine.c                            |    4 +-
4435  drivers/dma/dw_dmac.c                              |   83 ++-
4436  drivers/dma/dw_dmac_regs.h                         |    1 +
4437  drivers/dma/ep93xx_dma.c                           |   90 ++-
4438  drivers/dma/fsldma.c                               |    4 +-
4439  drivers/dma/imx-dma.c                              |   10 +-
4440  drivers/dma/imx-sdma.c                             |   22 +-
4441  drivers/dma/intel_mid_dma.c                        |   14 +-
4442  drivers/dma/intel_mid_dma_regs.h                   |    2 +-
4443  drivers/dma/iop-adma.c                             |   16 +-
4444  drivers/dma/ipu/ipu_idmac.c                        |   29 +-
4445  drivers/dma/mpc512x_dma.c                          |   12 +-
4446  drivers/dma/mxs-dma.c                              |    8 +-
4447  drivers/dma/pch_dma.c                              |   20 +-
4448  drivers/dma/pl330.c                                |   35 +-
4449  drivers/dma/shdma.c                                |   25 +-
4450  drivers/dma/sirf-dma.c                             |  707 ++++++++++++++++++++
4451  drivers/dma/ste_dma40.c                            |  437 +++++++++++--
4452  drivers/dma/ste_dma40_ll.h                         |   11 +
4453  drivers/dma/timb_dma.c                             |   30 +-
4454  drivers/dma/txx9dmac.c                             |   12 +-
4455  drivers/media/video/mx3_camera.c                   |    2 +-
4456  drivers/media/video/timblogiw.c                    |    2 +-
4457  drivers/misc/carma/carma-fpga-program.c            |    2 +-
4458  drivers/mmc/host/atmel-mci.c                       |   10 +-
4459  drivers/mmc/host/mmci.c                            |   11 +-
4460  drivers/mmc/host/mxcmmc.c                          |   10 +-
4461  drivers/mmc/host/mxs-mmc.c                         |    7 +-
4462  drivers/mmc/host/sh_mmcif.c                        |    4 +-
4463  drivers/mmc/host/tmio_mmc_dma.c                    |    4 +-
4464  drivers/net/ethernet/micrel/ks8842.c               |    4 +-
4465  drivers/spi/spi-dw-mid.c                           |    8 +-
4466  drivers/spi/spi-ep93xx.c                           |    9 +-
4467  drivers/spi/spi-pl022.c                            |    8 +-
4468  drivers/spi/spi-topcliff-pch.c                     |    4 +-
4469  drivers/tty/serial/amba-pl011.c                    |    8 +-
4470  drivers/tty/serial/pch_uart.c                      |    4 +-
4471  drivers/tty/serial/sh-sci.c                        |    4 +-
4472  drivers/usb/musb/ux500_dma.c                       |    4 +-
4473  drivers/usb/renesas_usbhs/fifo.c                   |    4 +-
4474  drivers/video/mx3fb.c                              |   65 +--
4475  include/linux/amba/pl08x.h                         |    4 +-
4476  include/linux/dmaengine.h                          |   98 +++-
4477  include/linux/dw_dmac.h                            |    2 +-
4478  include/linux/sh_dma.h                             |    2 +-
4479  include/linux/sirfsoc_dma.h                        |    6 +
4480  sound/atmel/abdac.c                                |    2 +-
4481  sound/atmel/ac97c.c                                |   10 +-
4482  sound/soc/ep93xx/ep93xx-pcm.c                      |    4 +-
4483  sound/soc/imx/imx-pcm-dma-mx2.c                    |    6 +-
4484  sound/soc/samsung/dma.c                            |    4 +-
4485  sound/soc/sh/siu_pcm.c                             |    4 +-
4486  sound/soc/txx9/txx9aclc.c                          |    2 +-
4487  69 files changed, 1709 insertions(+), 456 deletions(-)
4488  create mode 100644 Documentation/devicetree/bindings/dma/atmel-dma.txt
4489  create mode 100644 drivers/dma/sirf-dma.c
4490  create mode 100644 include/linux/sirfsoc_dma.h
4491 Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization)
4492 $ git merge async_tx/next
4493 Already up-to-date.
4494 Merging net-next/master (bcebcc4 tg3: Break out RSS indir table init and assignment)
4495 $ git merge net-next/master
4496 Auto-merging net/sunrpc/svcsock.c
4497 Auto-merging net/sunrpc/svc_xprt.c
4498 Auto-merging net/sunrpc/svc.c
4499 Auto-merging net/sched/sch_gred.c
4500 Auto-merging net/nfc/nci/core.c
4501 Auto-merging net/mac80211/agg-tx.c
4502 Auto-merging net/ipv6/sit.c
4503 Auto-merging net/ipv6/route.c
4504 CONFLICT (content): Merge conflict in net/ipv6/route.c
4505 Auto-merging net/ipv6/addrconf.c
4506 Auto-merging net/ipv4/ipip.c
4507 Auto-merging net/batman-adv/translation-table.c
4508 CONFLICT (content): Merge conflict in net/batman-adv/translation-table.c
4509 Removing drivers/net/wireless/wl12xx/sdio_test.c
4510 Auto-merging drivers/net/wireless/iwlwifi/iwl-ucode.c
4511 Auto-merging drivers/net/wireless/iwlwifi/iwl-testmode.c
4512 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
4513 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c
4514 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c
4515 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
4516 Auto-merging drivers/net/wireless/iwlegacy/prph.h
4517 Removing drivers/net/wireless/iwlegacy/iwl4965-base.c
4518 Removing drivers/net/wireless/iwlegacy/iwl3945-base.c
4519 Removing drivers/net/wireless/iwlegacy/iwl-tx.c
4520 Removing drivers/net/wireless/iwlegacy/iwl-sta.h
4521 Removing drivers/net/wireless/iwlegacy/iwl-scan.c
4522 Removing drivers/net/wireless/iwlegacy/iwl-rx.c
4523 Removing drivers/net/wireless/iwlegacy/iwl-power.h
4524 Removing drivers/net/wireless/iwlegacy/iwl-power.c
4525 Removing drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
4526 Removing drivers/net/wireless/iwlegacy/iwl-led.h
4527 Removing drivers/net/wireless/iwlegacy/iwl-led.c
4528 Removing drivers/net/wireless/iwlegacy/iwl-io.h
4529 Removing drivers/net/wireless/iwlegacy/iwl-helpers.h
4530 Removing drivers/net/wireless/iwlegacy/iwl-hcmd.c
4531 Removing drivers/net/wireless/iwlegacy/iwl-fh.h
4532 Removing drivers/net/wireless/iwlegacy/iwl-eeprom.h
4533 Removing drivers/net/wireless/iwlegacy/iwl-eeprom.c
4534 Removing drivers/net/wireless/iwlegacy/iwl-devtrace.h
4535 Removing drivers/net/wireless/iwlegacy/iwl-devtrace.c
4536 Removing drivers/net/wireless/iwlegacy/iwl-dev.h
4537 Removing drivers/net/wireless/iwlegacy/iwl-debugfs.c
4538 Removing drivers/net/wireless/iwlegacy/iwl-debug.h
4539 Removing drivers/net/wireless/iwlegacy/iwl-core.h
4540 Removing drivers/net/wireless/iwlegacy/iwl-core.c
4541 Removing drivers/net/wireless/iwlegacy/iwl-4965.h
4542 Removing drivers/net/wireless/iwlegacy/iwl-4965.c
4543 Removing drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
4544 Removing drivers/net/wireless/iwlegacy/iwl-4965-tx.c
4545 Removing drivers/net/wireless/iwlegacy/iwl-4965-sta.c
4546 Removing drivers/net/wireless/iwlegacy/iwl-4965-rx.c
4547 Removing drivers/net/wireless/iwlegacy/iwl-4965-rs.c
4548 Removing drivers/net/wireless/iwlegacy/iwl-4965-lib.c
4549 Removing drivers/net/wireless/iwlegacy/iwl-4965-led.h
4550 Removing drivers/net/wireless/iwlegacy/iwl-4965-led.c
4551 Removing drivers/net/wireless/iwlegacy/iwl-4965-hw.h
4552 Removing drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
4553 Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
4554 Removing drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
4555 Removing drivers/net/wireless/iwlegacy/iwl-4965-calib.h
4556 Removing drivers/net/wireless/iwlegacy/iwl-3945.h
4557 Removing drivers/net/wireless/iwlegacy/iwl-3945.c
4558 Removing drivers/net/wireless/iwlegacy/iwl-3945-rs.c
4559 Removing drivers/net/wireless/iwlegacy/iwl-3945-led.h
4560 Removing drivers/net/wireless/iwlegacy/iwl-3945-led.c
4561 Removing drivers/net/wireless/iwlegacy/iwl-3945-hw.h
4562 Removing drivers/net/wireless/iwlegacy/iwl-3945-fh.h
4563 Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
4564 Removing drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
4565 Auto-merging drivers/net/wireless/iwlegacy/csr.h
4566 Auto-merging drivers/net/wireless/iwlegacy/commands.h
4567 Auto-merging drivers/net/wireless/iwlegacy/4965-calib.c
4568 Removing drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
4569 Auto-merging drivers/net/wireless/ath/ath9k/main.c
4570 Removing drivers/net/wireless/ath/ath6kl/htc_hif.h
4571 Auto-merging drivers/net/wireless/ath/ath6kl/hif.c
4572 Auto-merging drivers/net/ppp/pptp.c
4573 Auto-merging drivers/net/ethernet/natsemi/macsonic.c
4574 Auto-merging drivers/net/ethernet/micrel/ks8842.c
4575 Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
4576 Auto-merging drivers/net/ethernet/freescale/fsl_pq_mdio.c
4577 CONFLICRecorded preimage for 'net/ipv6/route.c'
4578 Resolved 'drivers/net/ethernet/freescale/fsl_pq_mdio.c' using previous resolution.
4579 Resolved 'drivers/net/wireless/iwlwifi/iwl-agn.c' using previous resolution.
4580 Resolved 'net/batman-adv/translation-table.c' using previous resolution.
4581 T (content): Merge conflict in drivers/net/ethernet/freescale/fsl_pq_mdio.c
4582 Auto-merging drivers/net/ethernet/freescale/fec.c
4583 Auto-merging drivers/net/ethernet/Makefile
4584 Auto-merging drivers/net/dsa/mv88e6xxx.h
4585 Auto-merging drivers/net/dsa/mv88e6xxx.c
4586 Auto-merging drivers/net/dsa/mv88e6131.c
4587 Auto-merging drivers/net/dsa/mv88e6123_61_65.c
4588 Auto-merging drivers/net/dsa/mv88e6060.c
4589 Removing drivers/net/bonding/bond_ipv6.c
4590 Auto-merging MAINTAINERS
4591 Auto-merging Documentation/feature-removal-schedule.txt
4592 Automatic merge failed; fix conflicts and then commit the result.
4593 $ git commit -v -a
4594 Recorded resolution for 'net/ipv6/route.c'.
4595 [master 8459099] Merge remote-tracking branch 'net-next/master'
4596 $ git diff -M --stat --summary HEAD^..
4597  Documentation/cgroups/memory.txt                   |   46 +-
4598  Documentation/cgroups/net_prio.txt                 |   53 +
4599  .../devicetree/bindings/net/calxeda-xgmac.txt      |   15 +
4600  .../devicetree/bindings/net/can/cc770.txt          |   53 +
4601  Documentation/feature-removal-schedule.txt         |    3 +-
4602  Documentation/networking/00-INDEX                  |    2 +
4603  Documentation/networking/batman-adv.txt            |    7 +-
4604  Documentation/networking/ieee802154.txt            |   27 +
4605  Documentation/networking/ifenslave.c               |    2 +
4606  Documentation/networking/ip-sysctl.txt             |   13 +
4607  Documentation/networking/openvswitch.txt           |  195 +
4608  Documentation/networking/team.txt                  |    2 +
4609  MAINTAINERS                                        |   15 +
4610  arch/alpha/include/asm/socket.h                    |    3 +
4611  arch/arm/include/asm/socket.h                      |    3 +
4612  arch/avr32/include/asm/socket.h                    |    3 +
4613  arch/cris/include/asm/socket.h                     |    3 +
4614  arch/frv/include/asm/socket.h                      |    3 +
4615  arch/h8300/include/asm/socket.h                    |    3 +
4616  arch/ia64/include/asm/socket.h                     |    3 +
4617  arch/m32r/include/asm/socket.h                     |    3 +
4618  arch/m68k/include/asm/socket.h                     |    3 +
4619  arch/mips/include/asm/socket.h                     |    3 +
4620  arch/mn10300/include/asm/socket.h                  |    3 +
4621  arch/parisc/include/asm/socket.h                   |    3 +
4622  arch/powerpc/boot/dts/tqm8548-bigflash.dts         |   19 +-
4623  arch/powerpc/boot/dts/tqm8548.dts                  |   19 +-
4624  arch/powerpc/boot/dts/tqm8xx.dts                   |   25 +
4625  arch/powerpc/include/asm/socket.h                  |    3 +
4626  arch/s390/include/asm/socket.h                     |    3 +
4627  arch/sparc/include/asm/socket.h                    |    3 +
4628  arch/xtensa/include/asm/socket.h                   |    3 +
4629  drivers/atm/iphase.c                               |    4 +-
4630  drivers/bcma/host_pci.c                            |   32 +-
4631  drivers/bluetooth/ath3k.c                          |   15 +-
4632  drivers/bluetooth/bfusb.c                          |    4 +-
4633  drivers/bluetooth/bluecard_cs.c                    |    4 +-
4634  drivers/bluetooth/bt3c_cs.c                        |    4 +-
4635  drivers/bluetooth/btuart_cs.c                      |    4 +-
4636  drivers/bluetooth/btusb.c                          |   16 +-
4637  drivers/bluetooth/dtl1_cs.c                        |    4 +-
4638  drivers/bluetooth/hci_vhci.c                       |   13 +-
4639  drivers/ieee802154/fakehard.c                      |    2 +-
4640  drivers/infiniband/core/addr.c                     |   53 +-
4641  drivers/infiniband/core/cma.c                      |    8 +-
4642  drivers/infiniband/hw/cxgb3/iwch_cm.c              |   15 +-
4643  drivers/infiniband/hw/cxgb4/cm.c                   |  220 +-
4644  drivers/infiniband/hw/mlx4/mad.c                   |    6 +-
4645  drivers/infiniband/hw/mlx4/main.c                  |   14 +-
4646  drivers/infiniband/hw/nes/nes_cm.c                 |   14 +-
4647  drivers/infiniband/hw/nes/nes_nic.c                |    6 +-
4648  drivers/infiniband/ulp/ipoib/ipoib_main.c          |   32 +-
4649  drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |    4 +-
4650  drivers/isdn/gigaset/i4l.c                         |    3 +-
4651  drivers/lguest/lguest_device.c                     |    6 +
4652  drivers/misc/eeprom/eeprom_93cx6.c                 |   88 +
4653  drivers/misc/sgi-xp/xpnet.c                        |    2 +-
4654  drivers/net/Kconfig                                |    4 +
4655  drivers/net/Makefile                               |    2 +
4656  drivers/net/bonding/bond_ipv6.c                    |  225 -
4657  drivers/net/bonding/bond_main.c                    |   74 +-
4658  drivers/net/caif/caif_hsi.c                        |   13 +-
4659  drivers/net/caif/caif_serial.c                     |    4 +-
4660  drivers/net/caif/caif_shmcore.c                    |   27 +-
4661  drivers/net/caif/caif_spi.c                        |  176 +-
4662  drivers/net/can/Kconfig                            |    2 +
4663  drivers/net/can/Makefile                           |    1 +
4664  drivers/net/can/at91_can.c                         |   13 +-
4665  drivers/net/can/bfin_can.c                         |   12 +-
4666  drivers/net/can/c_can/c_can_platform.c             |   12 +-
4667  drivers/net/can/cc770/Kconfig                      |   21 +
4668  drivers/net/can/cc770/Makefile                     |    9 +
4669  drivers/net/can/cc770/cc770.c                      |  881 +++
4670  drivers/net/can/cc770/cc770.h                      |  203 +
4671  drivers/net/can/cc770/cc770_isa.c                  |  367 ++
4672  drivers/net/can/cc770/cc770_platform.c             |  272 +
4673  drivers/net/can/dev.c                              |    2 +-
4674  drivers/net/can/flexcan.c                          |   15 +-
4675  drivers/net/can/janz-ican3.c                       |   13 +-
4676  drivers/net/can/mscan/mpc5xxx_can.c                |   12 +-
4677  drivers/net/can/mscan/mscan.c                      |    8 +-
4678  drivers/net/can/sja1000/Kconfig                    |    1 -
4679  drivers/net/can/sja1000/sja1000_isa.c              |  118 +-
4680  drivers/net/can/sja1000/sja1000_of_platform.c      |   12 +-
4681  drivers/net/can/sja1000/sja1000_platform.c         |   13 +-
4682  drivers/net/can/slcan.c                            |    2 +-
4683  drivers/net/can/softing/softing_main.c             |   16 +-
4684  drivers/net/can/ti_hecc.c                          |   15 +-
4685  drivers/net/dsa/Kconfig                            |   36 +
4686  drivers/net/dsa/Makefile                           |    9 +
4687  {net => drivers/net}/dsa/mv88e6060.c               |    7 +-
4688  {net => drivers/net}/dsa/mv88e6123_61_65.c         |   19 +-
4689  {net => drivers/net}/dsa/mv88e6131.c               |   20 +-
4690  {net => drivers/net}/dsa/mv88e6xxx.c               |   29 +-
4691  {net => drivers/net}/dsa/mv88e6xxx.h               |    3 +
4692  drivers/net/dummy.c                                |    2 +-
4693  drivers/net/ethernet/3com/3c589_cs.c               |    7 +-
4694  drivers/net/ethernet/3com/3c59x.c                  |   12 +-
4695  drivers/net/ethernet/3com/typhoon.c                |   16 +-
4696  drivers/net/ethernet/8390/8390.h                   |    2 -
4697  drivers/net/ethernet/8390/apne.c                   |    2 +-
4698  drivers/net/ethernet/8390/ax88796.c                |   18 +-
4699  drivers/net/ethernet/8390/es3210.c                 |    2 +-
4700  drivers/net/ethernet/8390/hp-plus.c                |    2 +-
4701  drivers/net/ethernet/8390/hp.c                     |    2 +-
4702  drivers/net/ethernet/8390/hydra.c                  |    2 +-
4703  drivers/net/ethernet/8390/lne390.c                 |    4 +-
4704  drivers/net/ethernet/8390/ne-h8300.c               |    2 +-
4705  drivers/net/ethernet/8390/ne.c                     |    4 +-
4706  drivers/net/ethernet/8390/ne2.c                    |    2 +-
4707  drivers/net/ethernet/8390/ne2k-pci.c               |    6 +-
4708  drivers/net/ethernet/8390/ne3210.c                 |    2 +-
4709  drivers/net/ethernet/8390/stnic.c                  |    2 +-
4710  drivers/net/ethernet/8390/zorro8390.c              |    2 +-
4711  drivers/net/ethernet/Kconfig                       |    1 +
4712  drivers/net/ethernet/Makefile                      |    1 +
4713  drivers/net/ethernet/adaptec/starfire.c            |   14 +-
4714  drivers/net/ethernet/aeroflex/greth.c              |   13 +-
4715  drivers/net/ethernet/amd/amd8111e.c                |   15 +-
4716  drivers/net/ethernet/amd/amd8111e.h                |    1 -
4717  drivers/net/ethernet/amd/au1000_eth.c              |   15 +-
4718  drivers/net/ethernet/amd/nmclan_cs.c               |   19 +-
4719  drivers/net/ethernet/amd/pcnet32.c                 |   10 +-
4720  drivers/net/ethernet/amd/sunlance.c                |   15 +-
4721  drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c |    1 -
4722  drivers/net/ethernet/atheros/atl1c/atl1c_main.c    |   13 +-
4723  drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c |   10 +-
4724  drivers/net/ethernet/atheros/atl1e/atl1e_main.c    |   13 +-
4725  drivers/net/ethernet/atheros/atlx/atl1.c           |    1 -
4726  drivers/net/ethernet/atheros/atlx/atl2.c           |   23 +-
4727  drivers/net/ethernet/atheros/atlx/atlx.c           |   13 +-
4728  drivers/net/ethernet/broadcom/bnx2.c               |  188 +-
4729  drivers/net/ethernet/broadcom/bnx2.h               |   17 +-
4730  drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |   70 +-
4731  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |  363 +-
4732  drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h    |  116 +-
4733  drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c    |   61 +-
4734  drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h    |    4 +-
4735  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |   37 +-
4736  drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h    |  217 +-
4737  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   | 1060 ++--
4738  drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h   |    2 +-
4739  drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |  478 ++-
4740  drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h    |   69 +-
4741  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |   35 +-
4742  drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h     |   13 +
4743  drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c  |  112 +-
4744  drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h  |    6 +
4745  drivers/net/ethernet/broadcom/cnic.c               |   55 +-
4746  drivers/net/ethernet/broadcom/cnic_if.h            |    9 +
4747  drivers/net/ethernet/broadcom/sb1250-mac.c         |   16 +-
4748  drivers/net/ethernet/broadcom/tg3.c                |  605 +-
4749  drivers/net/ethernet/broadcom/tg3.h                |   44 +-
4750  drivers/net/ethernet/brocade/bna/bnad.c            |   12 +-
4751  drivers/net/ethernet/brocade/bna/bnad_ethtool.c    |   11 +-
4752  drivers/net/ethernet/brocade/bna/cna.h             |    3 +-
4753  drivers/net/ethernet/calxeda/Kconfig               |    7 +
4754  drivers/net/ethernet/calxeda/Makefile              |    1 +
4755  drivers/net/ethernet/calxeda/xgmac.c               | 1928 ++++++
4756  drivers/net/ethernet/chelsio/cxgb/cxgb2.c          |   15 +-
4757  drivers/net/ethernet/chelsio/cxgb/sge.c            |    2 +-
4758  drivers/net/ethernet/chelsio/cxgb/sge.h            |    2 +-
4759  drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c    |   21 +-
4760  drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c |   26 +-
4761  drivers/net/ethernet/chelsio/cxgb3/l2t.c           |   27 +-
4762  drivers/net/ethernet/chelsio/cxgb3/l2t.h           |    2 +-
4763  drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   23 +-
4764  drivers/net/ethernet/chelsio/cxgb4/sge.c           |    6 +-
4765  .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |   15 +-
4766  drivers/net/ethernet/chelsio/cxgb4vf/sge.c         |    5 +-
4767  drivers/net/ethernet/cisco/enic/enic_dev.c         |   14 +-
4768  drivers/net/ethernet/cisco/enic/enic_dev.h         |    4 +-
4769  drivers/net/ethernet/cisco/enic/enic_main.c        |   10 +-
4770  drivers/net/ethernet/davicom/dm9000.c              |    5 +-
4771  drivers/net/ethernet/dec/tulip/de2104x.c           |    6 +-
4772  drivers/net/ethernet/dec/tulip/dmfe.c              |    7 +-
4773  drivers/net/ethernet/dec/tulip/tulip_core.c        |    6 +-
4774  drivers/net/ethernet/dec/tulip/uli526x.c           |    7 +-
4775  drivers/net/ethernet/dec/tulip/winbond-840.c       |    6 +-
4776  drivers/net/ethernet/dlink/sundance.c              |    6 +-
4777  drivers/net/ethernet/dnet.c                        |   19 +-
4778  drivers/net/ethernet/emulex/benet/be.h             |   32 +-
4779  drivers/net/ethernet/emulex/benet/be_cmds.c        |  218 +-
4780  drivers/net/ethernet/emulex/benet/be_cmds.h        |   77 +-
4781  drivers/net/ethernet/emulex/benet/be_ethtool.c     |  113 +-
4782  drivers/net/ethernet/emulex/benet/be_main.c        |  515 ++-
4783  drivers/net/ethernet/ethoc.c                       |   13 +-
4784  drivers/net/ethernet/fealnx.c                      |    6 +-
4785  drivers/net/ethernet/freescale/Kconfig             |    2 +-
4786  drivers/net/ethernet/freescale/fec.c               |   64 +-
4787  .../net/ethernet/freescale/fs_enet/fs_enet-main.c  |   15 +-
4788  .../net/ethernet/freescale/fs_enet/mii-bitbang.c   |   13 +-
4789  drivers/net/ethernet/freescale/fs_enet/mii-fec.c   |   13 +-
4790  drivers/net/ethernet/freescale/fsl_pq_mdio.c       |   23 +-
4791  drivers/net/ethernet/freescale/gianfar.c           |   28 +-
4792  drivers/net/ethernet/freescale/gianfar.h           |    7 +-
4793  drivers/net/ethernet/freescale/gianfar_ethtool.c   |    7 +-
4794  drivers/net/ethernet/freescale/gianfar_ptp.c       |   16 +-
4795  drivers/net/ethernet/freescale/ucc_geth.c          |    2 +-
4796  drivers/net/ethernet/freescale/ucc_geth.h          |    6 +-
4797  drivers/net/ethernet/fujitsu/fmvj18x_cs.c          |    7 +-
4798  drivers/net/ethernet/i825xx/eepro.c                |    7 +-
4799  drivers/net/ethernet/ibm/ehea/ehea_main.c          |   21 +-
4800  drivers/net/ethernet/ibm/emac/core.c               |    3 +
4801  drivers/net/ethernet/ibm/ibmveth.c                 |    6 +-
4802  drivers/net/ethernet/icplus/ipg.c                  |   13 +-
4803  drivers/net/ethernet/intel/e100.c                  |    8 +-
4804  drivers/net/ethernet/intel/e1000/e1000_ethtool.c   |   12 +-
4805  drivers/net/ethernet/intel/e1000/e1000_hw.h        |    1 -
4806  drivers/net/ethernet/intel/e1000/e1000_main.c      |   28 +-
4807  drivers/net/ethernet/intel/e1000e/e1000.h          |    1 +
4808  drivers/net/ethernet/intel/e1000e/ethtool.c        |   18 +-
4809  drivers/net/ethernet/intel/e1000e/netdev.c         |  441 +-
4810  drivers/net/ethernet/intel/igb/e1000_82575.c       |    5 +-
4811  drivers/net/ethernet/intel/igb/igb_ethtool.c       |   15 +-
4812  drivers/net/ethernet/intel/igb/igb_main.c          |  217 +-
4813  drivers/net/ethernet/intel/igbvf/ethtool.c         |   10 +-
4814  drivers/net/ethernet/intel/igbvf/netdev.c          |   37 +-
4815  drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c     |   10 +-
4816  drivers/net/ethernet/intel/ixgb/ixgb_main.c        |   20 +-
4817  drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c    |   96 +-
4818  drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |   16 +-
4819  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   16 +-
4820  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |    2 +-
4821  drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h     |    1 -
4822  drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |    8 +-
4823  drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c      |   18 +-
4824  drivers/net/ethernet/intel/ixgbevf/defines.h       |    1 -
4825  drivers/net/ethernet/intel/ixgbevf/ethtool.c       |   16 +-
4826  drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |   40 +-
4827  drivers/net/ethernet/intel/ixgbevf/vf.c            |    4 +-
4828  drivers/net/ethernet/jme.c                         |   16 +-
4829  drivers/net/ethernet/korina.c                      |   13 +-
4830  drivers/net/ethernet/marvell/mv643xx_eth.c         |   14 +-
4831  drivers/net/ethernet/marvell/pxa168_eth.c          |   13 +-
4832  drivers/net/ethernet/marvell/skge.c                |    8 +-
4833  drivers/net/ethernet/marvell/sky2.c                |   39 +-
4834  drivers/net/ethernet/mellanox/mlx4/Makefile        |    2 +-
4835  drivers/net/ethernet/mellanox/mlx4/catas.c         |    7 +-
4836  drivers/net/ethernet/mellanox/mlx4/cmd.c           | 1308 ++++-
4837  drivers/net/ethernet/mellanox/mlx4/cq.c            |  141 +-
4838  drivers/net/ethernet/mellanox/mlx4/en_cq.c         |    7 +-
4839  drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |   31 +-
4840  drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |   58 +-
4841  drivers/net/ethernet/mellanox/mlx4/en_port.c       |   84 +-
4842  drivers/net/ethernet/mellanox/mlx4/en_port.h       |   43 -
4843  drivers/net/ethernet/mellanox/mlx4/en_resources.c  |    2 +-
4844  drivers/net/ethernet/mellanox/mlx4/en_rx.c         |   31 +-
4845  drivers/net/ethernet/mellanox/mlx4/en_selftest.c   |    2 +-
4846  drivers/net/ethernet/mellanox/mlx4/en_tx.c         |   96 +-
4847  drivers/net/ethernet/mellanox/mlx4/eq.c            |  430 +-
4848  drivers/net/ethernet/mellanox/mlx4/fw.c            |  404 ++-
4849  drivers/net/ethernet/mellanox/mlx4/fw.h            |   26 +
4850  drivers/net/ethernet/mellanox/mlx4/icm.c           |    5 +-
4851  drivers/net/ethernet/mellanox/mlx4/intf.c          |    6 +-
4852  drivers/net/ethernet/mellanox/mlx4/main.c          |  870 +++-
4853  drivers/net/ethernet/mellanox/mlx4/mcg.c           |  228 +-
4854  drivers/net/ethernet/mellanox/mlx4/mlx4.h          |  670 ++-
4855  drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   17 +-
4856  drivers/net/ethernet/mellanox/mlx4/mr.c            |  486 ++-
4857  drivers/net/ethernet/mellanox/mlx4/pd.c            |   19 +-
4858  drivers/net/ethernet/mellanox/mlx4/port.c          |  616 ++-
4859  drivers/net/ethernet/mellanox/mlx4/profile.c       |    9 +-
4860  drivers/net/ethernet/mellanox/mlx4/qp.c            |  238 +-
4861  .../net/ethernet/mellanox/mlx4/resource_tracker.c  | 3103 ++++++++++
4862  drivers/net/ethernet/mellanox/mlx4/sense.c         |    3 +-
4863  drivers/net/ethernet/mellanox/mlx4/srq.c           |  132 +-
4864  drivers/net/ethernet/micrel/Kconfig                |    2 +
4865  drivers/net/ethernet/micrel/ks8842.c               |   13 +-
4866  drivers/net/ethernet/micrel/ks8851.c               |  513 +-
4867  drivers/net/ethernet/micrel/ks8851.h               |   15 +-
4868  drivers/net/ethernet/micrel/ks8851_mll.c           |   16 +-
4869  drivers/net/ethernet/micrel/ksz884x.c              |   75 +-
4870  drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |    5 +-
4871  drivers/net/ethernet/natsemi/jazzsonic.c           |   13 +-
4872  drivers/net/ethernet/natsemi/macsonic.c            |   13 +-
4873  drivers/net/ethernet/natsemi/natsemi.c             |    6 +-
4874  drivers/net/ethernet/natsemi/ns83820.c             |    6 +-
4875  drivers/net/ethernet/natsemi/xtsonic.c             |   13 +-
4876  drivers/net/ethernet/neterion/s2io.c               |   11 +-
4877  drivers/net/ethernet/neterion/vxge/vxge-main.c     |   15 +-
4878  drivers/net/ethernet/nuvoton/w90p910_ether.c       |   13 +-
4879  drivers/net/ethernet/nvidia/forcedeth.c            |  503 ++-
4880  .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |    8 +-
4881  .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c   |    5 +-
4882  .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |   12 +-
4883  .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |    6 +-
4884  drivers/net/ethernet/qlogic/qla3xxx.c              |    9 +-
4885  drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |    5 +-
4886  .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c    |   13 +-
4887  drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c     |    9 +-
4888  drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |   12 +-
4889  drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c    |   11 +-
4890  drivers/net/ethernet/qlogic/qlge/qlge_main.c       |   48 +-
4891  drivers/net/ethernet/realtek/8139cp.c              |    8 +-
4892  drivers/net/ethernet/realtek/8139too.c             |    6 +-
4893  drivers/net/ethernet/realtek/r8169.c               |   22 +-
4894  drivers/net/ethernet/renesas/sh_eth.c              |   13 +-
4895  drivers/net/ethernet/seeq/sgiseeq.c                |   18 +-
4896  drivers/net/ethernet/sfc/efx.c                     |    2 +-
4897  drivers/net/ethernet/sfc/net_driver.h              |    2 +-
4898  drivers/net/ethernet/sfc/rx.c                      |    2 +-
4899  drivers/net/ethernet/sfc/selftest.c                |    4 +-
4900  drivers/net/ethernet/sfc/tx.c                      |   29 +-
4901  drivers/net/ethernet/sgi/meth.c                    |   19 +-
4902  drivers/net/ethernet/sis/sis190.c                  |   15 +-
4903  drivers/net/ethernet/sis/sis900.c                  |    7 +-
4904  drivers/net/ethernet/smsc/epic100.c                |    6 +-
4905  drivers/net/ethernet/smsc/smc911x.c                |   13 +-
4906  drivers/net/ethernet/smsc/smc91c92_cs.c            |    4 +-
4907  drivers/net/ethernet/smsc/smc91x.c                 |   13 +-
4908  drivers/net/ethernet/smsc/smsc911x.c               |  111 +-
4909  drivers/net/ethernet/smsc/smsc9420.c               |    7 +-
4910  .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |    5 +-
4911  drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   27 +-
4912  drivers/net/ethernet/sun/cassini.c                 |    7 +-
4913  drivers/net/ethernet/sun/niu.c                     |   42 +-
4914  drivers/net/ethernet/sun/sunbmac.c                 |   13 +-
4915  drivers/net/ethernet/sun/sungem.c                  |    6 +-
4916  drivers/net/ethernet/sun/sunhme.c                  |    9 +-
4917  drivers/net/ethernet/tehuti/tehuti.c               |    6 +-
4918  drivers/net/ethernet/tundra/tsi108_eth.c           |   20 +-
4919  drivers/net/ethernet/via/via-rhine.c               |   16 +-
4920  drivers/net/ethernet/via/via-velocity.c            |   12 +-
4921  drivers/net/ethernet/xilinx/ll_temac_main.c        |   28 +-
4922  drivers/net/ethernet/xilinx/xilinx_emaclite.c      |   22 +-
4923  drivers/net/ethernet/xircom/xirc2ps_cs.c           |    2 +-
4924  drivers/net/ifb.c                                  |    2 +-
4925  drivers/net/irda/bfin_sir.c                        |   13 +-
4926  drivers/net/irda/pxaficp_ir.c                      |   13 +-
4927  drivers/net/irda/sh_irda.c                         |   13 +-
4928  drivers/net/irda/sh_sir.c                          |   13 +-
4929  drivers/net/loopback.c                             |    2 +-
4930  drivers/net/macvlan.c                              |   14 +-
4931  drivers/net/macvtap.c                              |    8 +-
4932  drivers/net/mii.c                                  |   53 +-
4933  drivers/net/phy/mdio-bitbang.c                     |    9 +
4934  drivers/net/phy/mdio-gpio.c                        |    1 +
4935  drivers/net/phy/phy_device.c                       |   20 +-
4936  drivers/net/ppp/pptp.c                             |    2 +-
4937  drivers/net/team/Kconfig                           |   43 +
4938  drivers/net/team/Makefile                          |    7 +
4939  drivers/net/team/team.c                            | 1684 +++++
4940  drivers/net/team/team_mode_activebackup.c          |  136 +
4941  drivers/net/team/team_mode_roundrobin.c            |  107 +
4942  drivers/net/tun.c                                  |   16 +-
4943  drivers/net/usb/cdc-phonet.c                       |   10 +-
4944  drivers/net/usb/cdc_ncm.c                          |    4 +-
4945  drivers/net/usb/smsc75xx.c                         |    3 +-
4946  drivers/net/usb/smsc95xx.c                         |    3 +-
4947  drivers/net/veth.c                                 |    9 +-
4948  drivers/net/virtio_net.c                           |   22 +-
4949  drivers/net/vmxnet3/vmxnet3_drv.c                  |    8 +-
4950  drivers/net/vmxnet3/vmxnet3_ethtool.c              |    9 +-
4951  drivers/net/vmxnet3/vmxnet3_int.h                  |    2 +-
4952  drivers/net/wireless/Makefile                      |    8 +-
4953  drivers/net/wireless/airo.c                        |    4 +-
4954  drivers/net/wireless/ath/ath.h                     |    1 +
4955  drivers/net/wireless/ath/ath5k/ahb.c               |    4 +-
4956  drivers/net/wireless/ath/ath5k/ani.c               |   91 +-
4957  drivers/net/wireless/ath/ath5k/ani.h               |   32 +-
4958  drivers/net/wireless/ath/ath5k/ath5k.h             |  569 ++-
4959  drivers/net/wireless/ath/ath5k/attach.c            |   16 +-
4960  drivers/net/wireless/ath/ath5k/base.c              |  287 +-
4961  drivers/net/wireless/ath/ath5k/caps.c              |   27 +-
4962  drivers/net/wireless/ath/ath5k/desc.c              |  217 +-
4963  drivers/net/wireless/ath/ath5k/desc.h              |  124 +-
4964  drivers/net/wireless/ath/ath5k/dma.c               |  370 +-
4965  drivers/net/wireless/ath/ath5k/gpio.c              |   81 +-
4966  drivers/net/wireless/ath/ath5k/initvals.c          |   75 +-
4967  drivers/net/wireless/ath/ath5k/pci.c               |    2 +-
4968  drivers/net/wireless/ath/ath5k/pcu.c               |  222 +-
4969  drivers/net/wireless/ath/ath5k/phy.c               |  853 ++-
4970  drivers/net/wireless/ath/ath5k/qcu.c               |  143 +-
4971  drivers/net/wireless/ath/ath5k/reg.h               |   27 +-
4972  drivers/net/wireless/ath/ath5k/reset.c             |  230 +-
4973  drivers/net/wireless/ath/ath5k/rfbuffer.h          |   59 +-
4974  drivers/net/wireless/ath/ath5k/rfgain.h            |   22 +-
4975  drivers/net/wireless/ath/ath6kl/Makefile           |    2 +-
4976  drivers/net/wireless/ath/ath6kl/bmi.c              |    7 +-
4977  drivers/net/wireless/ath/ath6kl/bmi.h              |    2 +
4978  drivers/net/wireless/ath/ath6kl/cfg80211.c         | 1431 ++++--
4979  drivers/net/wireless/ath/ath6kl/cfg80211.h         |   30 +-
4980  drivers/net/wireless/ath/ath6kl/common.h           |   16 +-
4981  drivers/net/wireless/ath/ath6kl/core.h             |  202 +-
4982  drivers/net/wireless/ath/ath6kl/debug.c            |  849 +++-
4983  drivers/net/wireless/ath/ath6kl/debug.h            |   34 +-
4984  drivers/net/wireless/ath/ath6kl/hif-ops.h          |   49 +-
4985  .../net/wireless/ath/ath6kl/{htc_hif.c => hif.c}   |  150 +-
4986  drivers/net/wireless/ath/ath6kl/hif.h              |   61 +-
4987  drivers/net/wireless/ath/ath6kl/htc.c              |  725 ++-
4988  drivers/net/wireless/ath/ath6kl/htc.h              |   18 +-
4989  drivers/net/wireless/ath/ath6kl/htc_hif.h          |   92 -
4990  drivers/net/wireless/ath/ath6kl/init.c             |  675 +-
4991  drivers/net/wireless/ath/ath6kl/main.c             |  668 +--
4992  drivers/net/wireless/ath/ath6kl/sdio.c             |  335 +-
4993  drivers/net/wireless/ath/ath6kl/target.h           |    3 +
4994  drivers/net/wireless/ath/ath6kl/txrx.c             |  221 +-
4995  drivers/net/wireless/ath/ath6kl/wmi.c              |  688 ++-
4996  drivers/net/wireless/ath/ath6kl/wmi.h              |  243 +-
4997  drivers/net/wireless/ath/ath9k/Kconfig             |    1 +
4998  drivers/net/wireless/ath/ath9k/Makefile            |    4 +-
4999  drivers/net/wireless/ath/ath9k/ar9002_calib.c      |    2 +-
5000  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   47 +-
5001  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |  143 +-
5002  drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |   10 +-
5003  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   36 +-
5004  drivers/net/wireless/ath/ath9k/ar9003_mci.c        | 1464 +++++
5005  drivers/net/wireless/ath/ath9k/ar9003_mci.h        |  102 +
5006  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    4 +-
5007  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    5 +
5008  .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h   |   60 +-
5009  drivers/net/wireless/ath/ath9k/ath9k.h             |    7 +-
5010  drivers/net/wireless/ath/ath9k/btcoex.c            |  109 +-
5011  drivers/net/wireless/ath/ath9k/btcoex.h            |   41 +-
5012  drivers/net/wireless/ath/ath9k/debug.c             |   13 +-
5013  drivers/net/wireless/ath/ath9k/eeprom.h            |    3 +-
5014  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |    6 +-
5015  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |    3 +-
5016  drivers/net/wireless/ath/ath9k/eeprom_def.c        |    6 +-
5017  drivers/net/wireless/ath/ath9k/gpio.c              |    9 +-
5018  drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |    2 +
5019  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |    5 +-
5020  drivers/net/wireless/ath/ath9k/hw.c                |  188 +-
5021  drivers/net/wireless/ath/ath9k/hw.h                |  199 +-
5022  drivers/net/wireless/ath/ath9k/init.c              |   38 +
5023  drivers/net/wireless/ath/ath9k/mac.c               |   17 +-
5024  drivers/net/wireless/ath/ath9k/main.c              |  225 +-
5025  drivers/net/wireless/ath/ath9k/mci.c               |  673 ++
5026  drivers/net/wireless/ath/ath9k/mci.h               |  138 +
5027  drivers/net/wireless/ath/ath9k/pci.c               |   21 +-
5028  drivers/net/wireless/ath/ath9k/recv.c              |   34 +-
5029  drivers/net/wireless/ath/ath9k/reg.h               |  321 +-
5030  drivers/net/wireless/ath/ath9k/xmit.c              |   20 +-
5031  drivers/net/wireless/ath/carl9170/main.c           |   12 +-
5032  drivers/net/wireless/ath/carl9170/tx.c             |    4 +-
5033  drivers/net/wireless/brcm80211/brcmfmac/Makefile   |    3 +-
5034  drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h  |   32 -
5035  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |  148 +-
5036  .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |  211 +-
5037  drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |   49 +-
5038  drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |   19 +-
5039  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |    6 +-
5040  .../net/wireless/brcm80211/brcmfmac/dhd_common.c   |   20 +-
5041  .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |  378 +-
5042  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1019 +---
5043  .../net/wireless/brcm80211/brcmfmac/sdio_chip.c    |  622 ++
5044  .../net/wireless/brcm80211/brcmfmac/sdio_chip.h    |  136 +
5045  .../net/wireless/brcm80211/brcmfmac/sdio_host.h    |   30 +-
5046  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c  |   50 +-
5047  .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.h  |    9 -
5048  drivers/net/wireless/brcm80211/brcmsmac/aiutils.c  |   14 +-
5049  drivers/net/wireless/brcm80211/brcmsmac/aiutils.h  |   76 -
5050  drivers/net/wireless/brcm80211/brcmsmac/ampdu.c    |    6 +-
5051  drivers/net/wireless/brcm80211/brcmsmac/channel.c  |  118 -
5052  drivers/net/wireless/brcm80211/brcmsmac/dma.c      |  246 +-
5053  drivers/net/wireless/brcm80211/brcmsmac/dma.h      |    3 +-
5054  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |  162 +-
5055  .../net/wireless/brcm80211/brcmsmac/mac80211_if.h  |    2 +
5056  drivers/net/wireless/brcm80211/brcmsmac/main.c     |  706 +--
5057  drivers/net/wireless/brcm80211/brcmsmac/main.h     |   25 +-
5058  .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  |   12 +-
5059  .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h  |    5 -
5060  .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c    |   38 +-
5061  drivers/net/wireless/brcm80211/brcmsmac/pmu.c      |    1 +
5062  drivers/net/wireless/brcm80211/brcmsmac/pub.h      |   38 +-
5063  drivers/net/wireless/brcm80211/brcmsmac/rate.h     |    5 +-
5064  drivers/net/wireless/brcm80211/brcmsmac/srom.c     |  469 +--
5065  drivers/net/wireless/brcm80211/brcmsmac/srom.h     |    5 -
5066  drivers/net/wireless/brcm80211/brcmutil/utils.c    |  218 +-
5067  .../net/wireless/brcm80211/include/brcmu_utils.h   |   30 +-
5068  drivers/net/wireless/brcm80211/include/defs.h      |    1 -
5069  drivers/net/wireless/brcm80211/include/soc.h       |   12 +-
5070  drivers/net/wireless/hostap/hostap_cs.c            |    3 +
5071  drivers/net/wireless/hostap/hostap_ioctl.c         |    4 +-
5072  drivers/net/wireless/ipw2x00/ipw2100.c             |    7 +-
5073  drivers/net/wireless/ipw2x00/ipw2200.c             |   15 +-
5074  drivers/net/wireless/ipw2x00/libipw.h              |    8 -
5075  drivers/net/wireless/iwlegacy/3945-debug.c         |  505 ++
5076  drivers/net/wireless/iwlegacy/3945-mac.c           | 3977 ++++++++++++
5077  drivers/net/wireless/iwlegacy/3945-rs.c            |  995 +++
5078  drivers/net/wireless/iwlegacy/3945.c               | 2751 ++++++++
5079  drivers/net/wireless/iwlegacy/3945.h               |  626 ++
5080  .../iwlegacy/{iwl-4965-calib.c => 4965-calib.c}    |  613 +-
5081  drivers/net/wireless/iwlegacy/4965-debug.c         |  746 +++
5082  drivers/net/wireless/iwlegacy/4965-mac.c           | 6536 ++++++++++++++++++++
5083  drivers/net/wireless/iwlegacy/4965-rs.c            | 2860 +++++++++
5084  drivers/net/wireless/iwlegacy/4965.c               | 2421 ++++++++
5085  drivers/net/wireless/iwlegacy/4965.h               | 1309 ++++
5086  drivers/net/wireless/iwlegacy/Kconfig              |   43 +-
5087  drivers/net/wireless/iwlegacy/Makefile             |   24 +-
5088  .../iwlegacy/{iwl-commands.h => commands.h}        | 1134 ++--
5089  drivers/net/wireless/iwlegacy/common.c             | 5706 +++++++++++++++++
5090  drivers/net/wireless/iwlegacy/common.h             | 3424 ++++++++++
5091  drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} |   93 +-
5092  drivers/net/wireless/iwlegacy/debug.c              | 1411 +++++
5093  drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c   |  523 --
5094  drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h   |   60 -
5095  drivers/net/wireless/iwlegacy/iwl-3945-fh.h        |  187 -
5096  drivers/net/wireless/iwlegacy/iwl-3945-hw.h        |  291 -
5097  drivers/net/wireless/iwlegacy/iwl-3945-led.c       |   63 -
5098  drivers/net/wireless/iwlegacy/iwl-3945-led.h       |   32 -
5099  drivers/net/wireless/iwlegacy/iwl-3945-rs.c        |  996 ---
5100  drivers/net/wireless/iwlegacy/iwl-3945.c           | 2741 --------
5101  drivers/net/wireless/iwlegacy/iwl-3945.h           |  308 -
5102  drivers/net/wireless/iwlegacy/iwl-4965-calib.h     |   75 -
5103  drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c   |  774 ---
5104  drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h   |   59 -
5105  drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c    |  154 -
5106  drivers/net/wireless/iwlegacy/iwl-4965-hw.h        |  811 ---
5107  drivers/net/wireless/iwlegacy/iwl-4965-led.c       |   73 -
5108  drivers/net/wireless/iwlegacy/iwl-4965-led.h       |   33 -
5109  drivers/net/wireless/iwlegacy/iwl-4965-lib.c       | 1194 ----
5110  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        | 2871 ---------
5111  drivers/net/wireless/iwlegacy/iwl-4965-rx.c        |  215 -
5112  drivers/net/wireless/iwlegacy/iwl-4965-sta.c       |  721 ---
5113  drivers/net/wireless/iwlegacy/iwl-4965-tx.c        | 1378 -----
5114  drivers/net/wireless/iwlegacy/iwl-4965-ucode.c     |  166 -
5115  drivers/net/wireless/iwlegacy/iwl-4965.c           | 2183 -------
5116  drivers/net/wireless/iwlegacy/iwl-4965.h           |  282 -
5117  drivers/net/wireless/iwlegacy/iwl-core.c           | 2661 --------
5118  drivers/net/wireless/iwlegacy/iwl-core.h           |  636 --
5119  drivers/net/wireless/iwlegacy/iwl-debug.h          |  198 -
5120  drivers/net/wireless/iwlegacy/iwl-debugfs.c        | 1314 ----
5121  drivers/net/wireless/iwlegacy/iwl-dev.h            | 1364 ----
5122  drivers/net/wireless/iwlegacy/iwl-devtrace.c       |   42 -
5123  drivers/net/wireless/iwlegacy/iwl-devtrace.h       |  210 -
5124  drivers/net/wireless/iwlegacy/iwl-eeprom.c         |  553 --
5125  drivers/net/wireless/iwlegacy/iwl-eeprom.h         |  344 -
5126  drivers/net/wireless/iwlegacy/iwl-fh.h             |  513 --
5127  drivers/net/wireless/iwlegacy/iwl-hcmd.c           |  271 -
5128  drivers/net/wireless/iwlegacy/iwl-helpers.h        |  196 -
5129  drivers/net/wireless/iwlegacy/iwl-io.h             |  545 --
5130  drivers/net/wireless/iwlegacy/iwl-led.c            |  205 -
5131  drivers/net/wireless/iwlegacy/iwl-led.h            |   56 -
5132  drivers/net/wireless/iwlegacy/iwl-legacy-rs.h      |  456 --
5133  drivers/net/wireless/iwlegacy/iwl-power.c          |  165 -
5134  drivers/net/wireless/iwlegacy/iwl-power.h          |   55 -
5135  drivers/net/wireless/iwlegacy/iwl-rx.c             |  282 -
5136  drivers/net/wireless/iwlegacy/iwl-scan.c           |  550 --
5137  drivers/net/wireless/iwlegacy/iwl-spectrum.h       |    4 +-
5138  drivers/net/wireless/iwlegacy/iwl-sta.c            |  540 +-
5139  drivers/net/wireless/iwlegacy/iwl-sta.h            |  148 -
5140  drivers/net/wireless/iwlegacy/iwl-tx.c             |  659 --
5141  drivers/net/wireless/iwlegacy/iwl3945-base.c       | 4016 ------------
5142  drivers/net/wireless/iwlegacy/iwl4965-base.c       | 3281 ----------
5143  .../net/wireless/iwlegacy/{iwl-prph.h => prph.h}   |  133 +-
5144  drivers/net/wireless/iwlwifi/Makefile              |    6 +-
5145  drivers/net/wireless/iwlwifi/iwl-1000.c            |    9 -
5146  drivers/net/wireless/iwlwifi/iwl-2000.c            |   34 -
5147  drivers/net/wireless/iwlwifi/iwl-5000.c            |   16 +-
5148  drivers/net/wireless/iwlwifi/iwl-6000.c            |   32 +-
5149  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   68 +-
5150  drivers/net/wireless/iwlwifi/iwl-agn-calib.h       |    3 +-
5151  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |  383 ++-
5152  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |    8 +-
5153  drivers/net/wireless/iwlwifi/iwl-agn-rx.c          |   66 +-
5154  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   19 +-
5155  drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |   78 +-
5156  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |   23 +-
5157  drivers/net/wireless/iwlwifi/iwl-agn.c             | 1818 +-----
5158  drivers/net/wireless/iwlwifi/iwl-agn.h             |   51 +-
5159  drivers/net/wireless/iwlwifi/iwl-cfg.h             |    6 -
5160  drivers/net/wireless/iwlwifi/iwl-commands.h        |   27 +-
5161  drivers/net/wireless/iwlwifi/iwl-core.c            |  322 +-
5162  drivers/net/wireless/iwlwifi/iwl-core.h            |   19 +-
5163  drivers/net/wireless/iwlwifi/iwl-csr.h             |    4 +-
5164  drivers/net/wireless/iwlwifi/iwl-debug.h           |  102 +-
5165  drivers/net/wireless/iwlwifi/iwl-debugfs.c         |   11 +-
5166  drivers/net/wireless/iwlwifi/iwl-dev.h             |   97 +-
5167  drivers/net/wireless/iwlwifi/iwl-devtrace.c        |    2 +-
5168  drivers/net/wireless/iwlwifi/iwl-devtrace.h        |   23 +-
5169  drivers/net/wireless/iwlwifi/iwl-eeprom.c          |  142 +-
5170  drivers/net/wireless/iwlwifi/iwl-io.c              |    2 +-
5171  drivers/net/wireless/iwlwifi/iwl-mac80211.c        | 1639 +++++
5172  drivers/net/wireless/iwlwifi/iwl-pci.c             |   20 +-
5173  drivers/net/wireless/iwlwifi/iwl-scan.c            |   50 +-
5174  drivers/net/wireless/iwlwifi/iwl-shared.h          |   78 +-
5175  .../iwlwifi/{iwl-sv-open.c => iwl-testmode.c}      |  209 +-
5176  drivers/net/wireless/iwlwifi/iwl-testmode.h        |   52 +-
5177  drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h  |   40 +-
5178  drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c   |   12 +-
5179  drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c   |   56 +-
5180  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      |   47 +-
5181  drivers/net/wireless/iwlwifi/iwl-trans.h           |   43 +-
5182  .../iwlwifi/{iwl-agn-ucode.c => iwl-ucode.c}       |  351 +-
5183  drivers/net/wireless/iwmc3200wifi/cfg80211.c       |   15 +-
5184  drivers/net/wireless/libertas/cfg.c                |   25 +-
5185  drivers/net/wireless/libertas/ethtool.c            |    7 +-
5186  drivers/net/wireless/libertas/if_spi.c             |    1 -
5187  drivers/net/wireless/mac80211_hwsim.c              |    2 +
5188  drivers/net/wireless/mwifiex/11n_rxreorder.c       |   18 +-
5189  drivers/net/wireless/mwifiex/Kconfig               |    4 +-
5190  drivers/net/wireless/mwifiex/cfg80211.c            |    7 +-
5191  drivers/net/wireless/mwifiex/cfp.c                 |   38 +-
5192  drivers/net/wireless/mwifiex/fw.h                  |    3 +-
5193  drivers/net/wireless/mwifiex/init.c                |    4 +-
5194  drivers/net/wireless/mwifiex/join.c                |   96 +-
5195  drivers/net/wireless/mwifiex/main.h                |    3 +-
5196  drivers/net/wireless/mwifiex/pcie.c                |   11 +-
5197  drivers/net/wireless/mwifiex/scan.c                |    7 +-
5198  drivers/net/wireless/mwifiex/sdio.c                |   21 +-
5199  drivers/net/wireless/mwifiex/sdio.h                |    1 +
5200  drivers/net/wireless/mwifiex/sta_cmdresp.c         |    2 +-
5201  drivers/net/wireless/mwifiex/sta_ioctl.c           |    4 +-
5202  drivers/net/wireless/mwifiex/sta_rx.c              |   12 +-
5203  drivers/net/wireless/orinoco/scan.c                |   16 +-
5204  drivers/net/wireless/p54/p54spi.c                  |    7 +-
5205  drivers/net/wireless/p54/txrx.c                    |    4 +-
5206  drivers/net/wireless/prism54/isl_ioctl.c           |  333 -
5207  drivers/net/wireless/prism54/isl_ioctl.h           |    2 -
5208  drivers/net/wireless/prism54/islpci_dev.c          |    5 +-
5209  drivers/net/wireless/ray_cs.c                      |    4 +-
5210  drivers/net/wireless/rayctl.h                      |    4 +-
5211  drivers/net/wireless/rndis_wlan.c                  |  109 +-
5212  drivers/net/wireless/rt2x00/rt2800lib.c            |    6 +-
5213  drivers/net/wireless/rt2x00/rt2x00dev.c            |    4 +-
5214  drivers/net/wireless/rtlwifi/base.c                |    6 +-
5215  drivers/net/wireless/rtlwifi/base.h                |    2 +-
5216  drivers/net/wireless/rtlwifi/pci.c                 |   10 +-
5217  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |   62 +-
5218  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h  |   23 +-
5219  drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |    9 +-
5220  drivers/net/wireless/rtlwifi/rtl8192cu/mac.c       |    1 +
5221  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c        |   36 +-
5222  drivers/net/wireless/rtlwifi/rtl8192cu/trx.c       |    2 +-
5223  drivers/net/wireless/rtlwifi/usb.c                 |   55 +-
5224  drivers/net/wireless/rtlwifi/wifi.h                |    7 +-
5225  drivers/net/wireless/wl1251/spi.c                  |    1 -
5226  drivers/net/wireless/wl12xx/Kconfig                |   10 -
5227  drivers/net/wireless/wl12xx/Makefile               |    3 -
5228  drivers/net/wireless/wl12xx/acx.c                  |  146 +-
5229  drivers/net/wireless/wl12xx/acx.h                  |   83 +-
5230  drivers/net/wireless/wl12xx/boot.c                 |   15 +
5231  drivers/net/wireless/wl12xx/cmd.c                  |  368 +-
5232  drivers/net/wireless/wl12xx/cmd.h                  |   50 +-
5233  drivers/net/wireless/wl12xx/conf.h                 |    4 +
5234  drivers/net/wireless/wl12xx/debug.h                |  101 +
5235  drivers/net/wireless/wl12xx/debugfs.c              |  141 +-
5236  drivers/net/wireless/wl12xx/event.c                |  214 +-
5237  drivers/net/wireless/wl12xx/event.h                |    3 -
5238  drivers/net/wireless/wl12xx/init.c                 |  458 +-
5239  drivers/net/wireless/wl12xx/init.h                 |    7 +-
5240  drivers/net/wireless/wl12xx/io.c                   |   12 +-
5241  drivers/net/wireless/wl12xx/io.h                   |   23 +-
5242  drivers/net/wireless/wl12xx/main.c                 | 1967 ++++---
5243  drivers/net/wireless/wl12xx/ps.c                   |   56 +-
5244  drivers/net/wireless/wl12xx/ps.h                   |    9 +-
5245  drivers/net/wireless/wl12xx/reg.h                  |    2 +-
5246  drivers/net/wireless/wl12xx/rx.c                   |   34 +-
5247  drivers/net/wireless/wl12xx/scan.c                 |  102 +-
5248  drivers/net/wireless/wl12xx/scan.h                 |    8 +-
5249  drivers/net/wireless/wl12xx/sdio.c                 |  259 +-
5250  drivers/net/wireless/wl12xx/sdio_test.c            |  543 --
5251  drivers/net/wireless/wl12xx/spi.c                  |  215 +-
5252  drivers/net/wireless/wl12xx/testmode.c             |   76 +-
5253  drivers/net/wireless/wl12xx/tx.c                   |  373 +-
5254  drivers/net/wireless/wl12xx/tx.h                   |   11 +-
5255  drivers/net/wireless/wl12xx/wl12xx.h               |  377 +-
5256  drivers/net/wireless/wl12xx/wl12xx_80211.h         |    5 -
5257  drivers/net/wireless/wl12xx/wl12xx_platform_data.c |    4 +-
5258  drivers/net/xen-netback/interface.c                |    3 +-
5259  drivers/net/xen-netback/netback.c                  |    6 +-
5260  drivers/net/xen-netfront.c                         |   12 +-
5261  drivers/nfc/pn533.c                                |    2 +-
5262  drivers/s390/kvm/kvm_virtio.c                      |    6 +
5263  drivers/s390/net/qeth_l2_main.c                    |   18 +-
5264  drivers/s390/net/qeth_l3_main.c                    |   19 +-
5265  drivers/scsi/cxgbi/cxgb3i/cxgb3i.c                 |    2 +-
5266  drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |    8 +-
5267  drivers/scsi/cxgbi/libcxgbi.c                      |   10 +-
5268  drivers/usb/gadget/f_phonet.c                      |   11 +-
5269  drivers/virtio/virtio_mmio.c                       |    6 +
5270  drivers/virtio/virtio_pci.c                        |    8 +
5271  fs/dlm/lowcomms.c                                  |    2 +-
5272  include/asm-generic/socket.h                       |    3 +
5273  include/linux/Kbuild                               |    1 +
5274  include/linux/atmdev.h                             |   10 -
5275  include/linux/can/platform/cc770.h                 |   33 +
5276  include/linux/cgroup_subsys.h                      |    8 +
5277  include/linux/dynamic_queue_limits.h               |   97 +
5278  include/linux/eeprom_93cx6.h                       |    8 +
5279  include/linux/errqueue.h                           |    7 +-
5280  include/linux/ethtool.h                            |   53 -
5281  include/linux/genetlink.h                          |   24 +
5282  include/linux/ieee80211.h                          |   23 +
5283  include/linux/if.h                                 |    1 +
5284  include/linux/if_ether.h                           |    1 +
5285  include/linux/if_team.h                            |  242 +
5286  include/linux/if_vlan.h                            |   80 +-
5287  include/linux/inet_diag.h                          |   42 +-
5288  include/linux/ipv6.h                               |    4 +-
5289  include/linux/lockd/lockd.h                        |    6 +-
5290  include/linux/mdio-bitbang.h                       |    2 +
5291  include/linux/mdio-gpio.h                          |    2 +
5292  include/linux/memcontrol.h                         |   23 +
5293  include/linux/mii.h                                |  200 +
5294  include/linux/mlx4/cmd.h                           |   51 +-
5295  include/linux/mlx4/device.h                        |   75 +-
5296  include/linux/mlx4/qp.h                            |   28 +
5297  include/linux/neighbour.h                          |    1 +
5298  include/linux/netdev_features.h                    |  146 +
5299  include/linux/netdevice.h                          |  308 +-
5300  include/linux/netfilter.h                          |   26 +-
5301  include/linux/netlink.h                            |    4 +-
5302  include/linux/nl80211.h                            |  163 +
5303  include/linux/openvswitch.h                        |  452 ++
5304  include/linux/phonet.h                             |    2 +
5305  include/linux/pkt_sched.h                          |   16 +-
5306  include/linux/skbuff.h                             |   68 +-
5307  include/linux/sock_diag.h                          |   23 +
5308  include/linux/sunrpc/clnt.h                        |    8 +-
5309  include/linux/virtio_config.h                      |   14 +
5310  include/linux/wl12xx.h                             |    5 +-
5311  include/net/atmclip.h                              |    7 -
5312  include/net/bluetooth/bluetooth.h                  |   34 +-
5313  include/net/bluetooth/hci.h                        |   60 +
5314  include/net/bluetooth/hci_core.h                   |  148 +-
5315  include/net/bluetooth/l2cap.h                      |  409 ++-
5316  include/net/bluetooth/mgmt.h                       |   92 +-
5317  include/net/caif/caif_dev.h                        |   21 +
5318  include/net/caif/caif_layer.h                      |    4 -
5319  include/net/caif/caif_spi.h                        |    4 +-
5320  include/net/caif/cfcnfg.h                          |   23 +-
5321  include/net/caif/cfserl.h                          |    4 +-
5322  include/net/cfg80211.h                             |  225 +-
5323  include/net/dsa.h                                  |  144 +-
5324  include/net/dst.h                                  |    6 +-
5325  include/net/flow.h                                 |    5 +-
5326  include/net/flow_keys.h                            |   16 +
5327  include/net/genetlink.h                            |    2 +
5328  include/net/icmp.h                                 |    4 +-
5329  include/net/ieee80211_radiotap.h                   |    8 -
5330  include/net/ieee802154.h                           |    6 +
5331  include/net/inet6_hashtables.h                     |    4 +-
5332  include/net/inet_connection_sock.h                 |    6 +-
5333  include/net/inet_sock.h                            |    6 +-
5334  include/net/inet_timewait_sock.h                   |   12 +-
5335  include/net/inetpeer.h                             |    2 +-
5336  include/net/ip.h                                   |    8 +-
5337  include/net/ip6_route.h                            |    4 +-
5338  include/net/ip_vs.h                                |    8 +-
5339  include/net/ipv6.h                                 |   22 +-
5340  include/net/mac80211.h                             |   57 +-
5341  include/net/ndisc.h                                |    9 -
5342  include/net/neighbour.h                            |   12 +-
5343  include/net/net_namespace.h                        |    2 +-
5344  include/net/netfilter/nf_tproxy_core.h             |    2 +-
5345  include/net/netns/ipv4.h                           |    1 +
5346  include/net/netns/mib.h                            |    6 +-
5347  include/net/netns/xfrm.h                           |    2 +-
5348  include/net/netprio_cgroup.h                       |   57 +
5349  include/net/nfc/nci.h                              |  171 +-
5350  include/net/nfc/nci_core.h                         |   13 +-
5351  include/net/protocol.h                             |   12 +-
5352  include/net/red.h                                  |  109 +-
5353  include/net/regulatory.h                           |    6 +
5354  include/net/sctp/sctp.h                            |    4 +-
5355  include/net/sctp/structs.h                         |    3 +-
5356  include/net/snmp.h                                 |    4 +-
5357  include/net/sock.h                                 |  265 +-
5358  include/net/tcp.h                                  |   21 +-
5359  include/net/tcp_memcontrol.h                       |   19 +
5360  include/net/udp.h                                  |   13 +-
5361  include/net/xfrm.h                                 |   12 +-
5362  init/Kconfig                                       |   11 +
5363  lib/Kconfig                                        |    3 +
5364  lib/Makefile                                       |    2 +
5365  lib/dynamic_queue_limits.c                         |  133 +
5366  lib/reciprocal_div.c                               |    2 +
5367  lib/vsprintf.c                                     |   19 +
5368  mm/memcontrol.c                                    |  191 +-
5369  net/8021q/vlan.c                                   |  126 +-
5370  net/8021q/vlan.h                                   |   43 +-
5371  net/8021q/vlan_core.c                              |  270 +-
5372  net/8021q/vlan_dev.c                               |  140 +-
5373  net/8021q/vlan_gvrp.c                              |    4 +-
5374  net/8021q/vlan_netlink.c                           |   10 +-
5375  net/8021q/vlanproc.c                               |   42 +-
5376  net/Kconfig                                        |   14 +
5377  net/Makefile                                       |    1 +
5378  net/atm/atm_misc.c                                 |    2 +-
5379  net/atm/br2684.c                                   |   38 +-
5380  net/atm/clip.c                                     |  159 +-
5381  net/atm/common.c                                   |   34 +-
5382  net/atm/common.h                                   |    1 +
5383  net/atm/pppoatm.c                                  |    4 +
5384  net/ax25/af_ax25.c                                 |   17 +-
5385  net/batman-adv/bat_sysfs.c                         |    4 +-
5386  net/batman-adv/bitarray.c                          |    2 +-
5387  net/batman-adv/gateway_client.c                    |  153 +-
5388  net/batman-adv/gateway_client.h                    |    5 +-
5389  net/batman-adv/gateway_common.c                    |    4 +-
5390  net/batman-adv/hash.c                              |    4 +-
5391  net/batman-adv/hash.h                              |   13 +-
5392  net/batman-adv/icmp_socket.c                       |   14 +-
5393  net/batman-adv/main.h                              |    2 +-
5394  net/batman-adv/originator.c                        |   13 +-
5395  net/batman-adv/originator.h                        |    2 +-
5396  net/batman-adv/routing.c                           |   21 +-
5397  net/batman-adv/soft-interface.c                    |   45 +-
5398  net/batman-adv/translation-table.c                 |  436 +-
5399  net/batman-adv/types.h                             |   14 +-
5400  net/batman-adv/vis.c                               |   23 +-
5401  net/bluetooth/bnep/core.c                          |   13 +-
5402  net/bluetooth/cmtp/core.c                          |   13 +-
5403  net/bluetooth/hci_conn.c                           |   71 +-
5404  net/bluetooth/hci_core.c                           |  430 +-
5405  net/bluetooth/hci_event.c                          |  345 +-
5406  net/bluetooth/hci_sysfs.c                          |   40 +-
5407  net/bluetooth/hidp/core.c                          |  157 +-
5408  net/bluetooth/l2cap_core.c                         | 1036 +++-
5409  net/bluetooth/l2cap_sock.c                         |  106 +-
5410  net/bluetooth/mgmt.c                               | 1088 +++--
5411  net/bluetooth/rfcomm/core.c                        |   65 +-
5412  net/bluetooth/rfcomm/sock.c                        |    2 +
5413  net/bluetooth/rfcomm/tty.c                         |   45 +-
5414  net/bluetooth/smp.c                                |   35 +-
5415  net/bridge/br_device.c                             |   14 +-
5416  net/bridge/br_fdb.c                                |  100 +-
5417  net/bridge/br_forward.c                            |    2 +-
5418  net/bridge/br_if.c                                 |    5 +-
5419  net/bridge/br_multicast.c                          |   45 +-
5420  net/bridge/br_netfilter.c                          |    2 +-
5421  net/bridge/br_private.h                            |    6 +-
5422  net/bridge/netfilter/ebt_ip6.c                     |    3 +-
5423  net/bridge/netfilter/ebt_log.c                     |    3 +-
5424  net/caif/Kconfig                                   |   11 +
5425  net/caif/Makefile                                  |    1 +
5426  net/caif/caif_dev.c                                |  273 +-
5427  net/caif/caif_usb.c                                |  208 +
5428  net/caif/cfcnfg.c                                  |   47 +-
5429  net/caif/cfpkt_skbuff.c                            |   15 +-
5430  net/caif/cfrfml.c                                  |    2 +-
5431  net/caif/cfserl.c                                  |    3 +-
5432  net/core/Makefile                                  |    6 +-
5433  net/core/dev.c                                     |  307 +-
5434  net/core/dst.c                                     |    2 +-
5435  net/core/ethtool.c                                 |  556 +--
5436  net/core/flow_dissector.c                          |  143 +
5437  net/core/neighbour.c                               |  209 +-
5438  net/core/net-sysfs.c                               |  279 +-
5439  net/core/netpoll.c                                 |   10 +-
5440  net/core/netprio_cgroup.c                          |  344 +
5441  net/core/pktgen.c                                  |   17 +-
5442  net/core/rtnetlink.c                               |   25 +-
5443  net/core/secure_seq.c                              |    4 +-
5444  net/core/skbuff.c                                  |   82 +-
5445  net/core/sock.c                                    |  181 +-
5446  net/core/sock_diag.c                               |  150 +
5447  net/core/sysctl_net_core.c                         |    9 +-
5448  net/dccp/dccp.h                                    |    2 +-
5449  net/dccp/diag.c                                    |   20 +-
5450  net/dccp/ipv4.c                                    |    5 +-
5451  net/dccp/ipv6.c                                    |   42 +-
5452  net/dccp/minisocks.c                               |    8 +-
5453  net/dccp/probe.c                                   |   14 +-
5454  net/decnet/dn_neigh.c                              |    4 +-
5455  net/decnet/dn_route.c                              |    8 +-
5456  net/dsa/Kconfig                                    |   38 +-
5457  net/dsa/Makefile                                   |   19 +-
5458  net/dsa/dsa.c                                      |   51 +-
5459  net/dsa/dsa_priv.h                                 |  127 +-
5460  net/dsa/tag_dsa.c                                  |   15 +-
5461  net/dsa/tag_edsa.c                                 |   15 +-
5462  net/dsa/tag_trailer.c                              |   15 +-
5463  net/econet/af_econet.c                             |    7 +-
5464  net/ieee802154/6lowpan.c                           |  374 ++-
5465  net/ieee802154/6lowpan.h                           |   23 +
5466  net/ieee802154/dgram.c                             |    7 +-
5467  net/ieee802154/raw.c                               |    7 +-
5468  net/ipv4/Kconfig                                   |    4 +
5469  net/ipv4/Makefile                                  |    2 +
5470  net/ipv4/af_inet.c                                 |   13 +-
5471  net/ipv4/arp.c                                     |   34 +-
5472  net/ipv4/igmp.c                                    |   17 +-
5473  net/ipv4/inet_connection_sock.c                    |   19 +-
5474  net/ipv4/inet_diag.c                               |  466 +-
5475  net/ipv4/ip_gre.c                                  |   14 +-
5476  net/ipv4/ip_output.c                               |   23 +-
5477  net/ipv4/ip_sockglue.c                             |   41 +-
5478  net/ipv4/ipconfig.c                                |   15 +-
5479  net/ipv4/ipip.c                                    |    2 +-
5480  net/ipv4/ipmr.c                                    |    4 +-
5481  net/ipv4/netfilter/ip_queue.c                      |    6 +-
5482  net/ipv4/proc.c                                    |   15 +-
5483  net/ipv4/raw.c                                     |   10 +-
5484  net/ipv4/route.c                                   |   12 +-
5485  net/ipv4/sysctl_net_ipv4.c                         |   69 +-
5486  net/ipv4/tcp.c                                     |   57 +-
5487  net/ipv4/tcp_cong.c                                |    2 +-
5488  net/ipv4/tcp_diag.c                                |   20 +-
5489  net/ipv4/tcp_input.c                               |   60 +-
5490  net/ipv4/tcp_ipv4.c                                |   15 +-
5491  net/ipv4/tcp_memcontrol.c                          |  272 +
5492  net/ipv4/tcp_minisocks.c                           |   12 +-
5493  net/ipv4/tcp_output.c                              |   27 +-
5494  net/ipv4/tcp_timer.c                               |    4 +-
5495  net/ipv4/tunnel4.c                                 |   10 +-
5496  net/ipv4/udp.c                                     |    9 +-
5497  net/ipv4/udp_diag.c                                |  201 +
5498  net/ipv4/xfrm4_tunnel.c                            |    6 +-
5499  net/ipv6/addrconf.c                                |   12 +-
5500  net/ipv6/af_inet6.c                                |   29 +-
5501  net/ipv6/ah6.c                                     |   12 +-
5502  net/ipv6/anycast.c                                 |    6 +-
5503  net/ipv6/datagram.c                                |   36 +-
5504  net/ipv6/exthdrs.c                                 |   18 +-
5505  net/ipv6/exthdrs_core.c                            |   11 +-
5506  net/ipv6/fib6_rules.c                              |    2 +-
5507  net/ipv6/icmp.c                                    |   25 +-
5508  net/ipv6/inet6_connection_sock.c                   |   12 +-
5509  net/ipv6/ip6_fib.c                                 |  206 +-
5510  net/ipv6/ip6_flowlabel.c                           |    2 +-
5511  net/ipv6/ip6_input.c                               |    3 +-
5512  net/ipv6/ip6_output.c                              |   35 +-
5513  net/ipv6/ip6_tunnel.c                              |   14 +-
5514  net/ipv6/ip6mr.c                                   |   12 +-
5515  net/ipv6/ipv6_sockglue.c                           |    8 +-
5516  net/ipv6/mcast.c                                   |   40 +-
5517  net/ipv6/mip6.c                                    |    4 +-
5518  net/ipv6/ndisc.c                                   |   35 +-
5519  net/ipv6/netfilter/ip6_queue.c                     |    5 +-
5520  net/ipv6/netfilter/ip6t_REJECT.c                   |   11 +-
5521  net/ipv6/proc.c                                    |   15 +-
5522  net/ipv6/raw.c                                     |   19 +-
5523  net/ipv6/reassembly.c                              |    4 +-
5524  net/ipv6/route.c                                   |  183 +-
5525  net/ipv6/sit.c                                     |   10 +-
5526  net/ipv6/syncookies.c                              |    8 +-
5527  net/ipv6/tcp_ipv6.c                                |   54 +-
5528  net/ipv6/udp.c                                     |   17 +-
5529  net/ipv6/xfrm6_mode_beet.c                         |    8 +-
5530  net/ipv6/xfrm6_mode_tunnel.c                       |    4 +-
5531  net/ipv6/xfrm6_output.c                            |    4 +-
5532  net/ipv6/xfrm6_policy.c                            |    4 +-
5533  net/ipv6/xfrm6_state.c                             |    4 +-
5534  net/irda/irttp.c                                   |    4 +-
5535  net/key/af_key.c                                   |   20 +-
5536  net/mac80211/Kconfig                               |   12 -
5537  net/mac80211/Makefile                              |    4 +-
5538  net/mac80211/agg-rx.c                              |   16 +-
5539  net/mac80211/agg-tx.c                              |   75 +-
5540  net/mac80211/cfg.c                                 |  187 +-
5541  net/mac80211/debugfs.c                             |   37 +-
5542  net/mac80211/debugfs_netdev.c                      |    3 +
5543  net/mac80211/debugfs_sta.c                         |    4 +-
5544  net/mac80211/driver-ops.h                          |   90 +-
5545  net/mac80211/driver-trace.h                        |   11 -
5546  net/mac80211/ht.c                                  |   90 +-
5547  net/mac80211/ibss.c                                |  104 +-
5548  net/mac80211/ieee80211_i.h                         |  113 +-
5549  net/mac80211/iface.c                               |   61 +-
5550  net/mac80211/key.c                                 |    9 +-
5551  net/mac80211/main.c                                |   91 +-
5552  net/mac80211/mesh.c                                |   71 +-
5553  net/mac80211/mesh.h                                |    9 +
5554  net/mac80211/mesh_hwmp.c                           |  195 +-
5555  net/mac80211/mesh_pathtbl.c                        |   59 +-
5556  net/mac80211/mesh_plink.c                          |   51 +-
5557  net/mac80211/mlme.c                                |  120 +-
5558  net/mac80211/offchannel.c                          |   13 +-
5559  net/mac80211/pm.c                                  |    2 +-
5560  net/mac80211/rc80211_minstrel.c                    |    7 +-
5561  net/mac80211/rc80211_minstrel_ht.c                 |   62 +-
5562  net/mac80211/rx.c                                  |  190 +-
5563  net/mac80211/scan.c                                |  199 +-
5564  net/mac80211/sta_info.c                            |    4 -
5565  net/mac80211/sta_info.h                            |   13 +-
5566  net/mac80211/status.c                              |   87 +-
5567  net/mac80211/tx.c                                  |  375 +-
5568  net/mac80211/util.c                                |  306 +-
5569  net/mac80211/wep.c                                 |    5 +-
5570  net/mac80211/wme.c                                 |   38 +-
5571  net/mac80211/wme.h                                 |    3 +
5572  net/mac80211/work.c                                |  153 +-
5573  net/mac80211/wpa.c                                 |   34 +-
5574  net/netfilter/core.c                               |   13 +-
5575  net/netfilter/ipset/ip_set_getport.c               |    4 +-
5576  net/netfilter/ipset/ip_set_hash_ip.c               |    2 +-
5577  net/netfilter/ipset/ip_set_hash_net.c              |    2 +-
5578  net/netfilter/ipvs/ip_vs_core.c                    |    2 +-
5579  net/netfilter/ipvs/ip_vs_sync.c                    |    6 +-
5580  net/netfilter/ipvs/ip_vs_xmit.c                    |   10 +-
5581  net/netfilter/nf_conntrack_h323_main.c             |    4 +-
5582  net/netfilter/xt_AUDIT.c                           |    3 +-
5583  net/netfilter/xt_TCPMSS.c                          |    5 +-
5584  net/netfilter/xt_TCPOPTSTRIP.c                     |    3 +-
5585  net/netfilter/xt_TEE.c                             |    9 +-
5586  net/netfilter/xt_addrtype.c                        |    2 +-
5587  net/netfilter/xt_hashlimit.c                       |    3 +-
5588  net/netfilter/xt_socket.c                          |    4 +-
5589  net/netlabel/netlabel_addrlist.c                   |    8 +-
5590  net/netlabel/netlabel_addrlist.h                   |    2 +-
5591  net/netlabel/netlabel_domainhash.c                 |   20 +-
5592  net/netlabel/netlabel_domainhash.h                 |    2 +-
5593  net/netlabel/netlabel_kapi.c                       |   22 +-
5594  net/netlabel/netlabel_mgmt.c                       |   10 +-
5595  net/netlabel/netlabel_unlabeled.c                  |   30 +-
5596  net/netlink/genetlink.c                            |   21 +
5597  net/netrom/af_netrom.c                             |    3 +-
5598  net/netrom/nr_route.c                              |   11 +-
5599  net/nfc/core.c                                     |   60 +-
5600  net/nfc/nci/core.c                                 |  102 +-
5601  net/nfc/nci/data.c                                 |   35 +-
5602  net/nfc/nci/lib.c                                  |    8 +-
5603  net/nfc/nci/ntf.c                                  |  187 +-
5604  net/nfc/nci/rsp.c                                  |  137 +-
5605  net/nfc/netlink.c                                  |   32 +-
5606  net/nfc/nfc.h                                      |    7 -
5607  net/nfc/rawsock.c                                  |   28 +-
5608  net/openvswitch/Kconfig                            |   28 +
5609  net/openvswitch/Makefile                           |   14 +
5610  net/openvswitch/actions.c                          |  415 ++
5611  net/openvswitch/datapath.c                         | 1912 ++++++
5612  net/openvswitch/datapath.h                         |  125 +
5613  net/openvswitch/dp_notify.c                        |   66 +
5614  net/openvswitch/flow.c                             | 1346 ++++
5615  net/openvswitch/flow.h                             |  199 +
5616  net/openvswitch/vport-internal_dev.c               |  241 +
5617  net/openvswitch/vport-internal_dev.h               |   28 +
5618  net/openvswitch/vport-netdev.c                     |  198 +
5619  net/openvswitch/vport-netdev.h                     |   42 +
5620  net/openvswitch/vport.c                            |  398 ++
5621  net/openvswitch/vport.h                            |  205 +
5622  net/packet/af_packet.c                             |   21 +-
5623  net/phonet/pep.c                                   |  106 +-
5624  net/rfkill/core.c                                  |    4 +-
5625  net/rfkill/rfkill-gpio.c                           |   13 +-
5626  net/rfkill/rfkill-regulator.c                      |   12 +-
5627  net/rxrpc/ar-key.c                                 |    6 +-
5628  net/sched/cls_flow.c                               |  182 +-
5629  net/sched/sch_choke.c                              |  121 +-
5630  net/sched/sch_generic.c                            |    9 +-
5631  net/sched/sch_gred.c                               |   22 +-
5632  net/sched/sch_multiq.c                             |    6 +-
5633  net/sched/sch_netem.c                              |   68 +
5634  net/sched/sch_red.c                                |   30 +-
5635  net/sched/sch_sfb.c                                |   17 +-
5636  net/sched/sch_sfq.c                                |   65 +-
5637  net/sched/sch_teql.c                               |    8 +-
5638  net/sctp/input.c                                   |    2 +-
5639  net/sctp/ipv6.c                                    |   40 +-
5640  net/sctp/protocol.c                                |    2 +-
5641  net/sctp/sm_make_chunk.c                           |    4 +-
5642  net/sctp/sm_sideeffect.c                           |    8 +-
5643  net/sctp/socket.c                                  |    6 +-
5644  net/sctp/transport.c                               |   16 +
5645  net/socket.c                                       |   20 +
5646  net/sunrpc/addr.c                                  |    8 +-
5647  net/sunrpc/svc.c                                   |    8 +-
5648  net/sunrpc/svc_xprt.c                              |    8 +-
5649  net/sunrpc/svcauth_unix.c                          |    8 +-
5650  net/sunrpc/svcsock.c                               |    4 +-
5651  net/wireless/Kconfig                               |    7 +-
5652  net/wireless/chan.c                                |   12 +-
5653  net/wireless/core.c                                |    4 +
5654  net/wireless/core.h                                |   14 +-
5655  net/wireless/mesh.c                                |    2 +
5656  net/wireless/mlme.c                                |   72 +-
5657  net/wireless/nl80211.c                             |  614 ++-
5658  net/wireless/nl80211.h                             |    5 +
5659  net/wireless/reg.c                                 |   39 +
5660  net/wireless/reg.h                                 |    1 +
5661  net/wireless/scan.c                                |  117 +-
5662  net/wireless/sme.c                                 |    7 +-
5663  net/wireless/util.c                                |  186 +-
5664  net/wireless/wext-compat.c                         |   12 +
5665  net/xfrm/xfrm_policy.c                             |   12 +-
5666  net/xfrm/xfrm_state.c                              |   12 +-
5667  net/xfrm/xfrm_user.c                               |   12 +-
5668  security/lsm_audit.c                               |    7 +-
5669  security/selinux/hooks.c                           |   11 +-
5670  security/selinux/netnode.c                         |    2 +-
5671  1074 files changed, 93909 insertions(+), 60815 deletions(-)
5672  create mode 100644 Documentation/cgroups/net_prio.txt
5673  create mode 100644 Documentation/devicetree/bindings/net/calxeda-xgmac.txt
5674  create mode 100644 Documentation/devicetree/bindings/net/can/cc770.txt
5675  create mode 100644 Documentation/networking/openvswitch.txt
5676  create mode 100644 Documentation/networking/team.txt
5677  delete mode 100644 drivers/net/bonding/bond_ipv6.c
5678  create mode 100644 drivers/net/can/cc770/Kconfig
5679  create mode 100644 drivers/net/can/cc770/Makefile
5680  create mode 100644 drivers/net/can/cc770/cc770.c
5681  create mode 100644 drivers/net/can/cc770/cc770.h
5682  create mode 100644 drivers/net/can/cc770/cc770_isa.c
5683  create mode 100644 drivers/net/can/cc770/cc770_platform.c
5684  create mode 100644 drivers/net/dsa/Kconfig
5685  create mode 100644 drivers/net/dsa/Makefile
5686  rename {net => drivers/net}/dsa/mv88e6060.c (96%)
5687  rename {net => drivers/net}/dsa/mv88e6123_61_65.c (96%)
5688  rename {net => drivers/net}/dsa/mv88e6131.c (96%)
5689  rename {net => drivers/net}/dsa/mv88e6xxx.c (93%)
5690  rename {net => drivers/net}/dsa/mv88e6xxx.h (95%)
5691  create mode 100644 drivers/net/ethernet/calxeda/Kconfig
5692  create mode 100644 drivers/net/ethernet/calxeda/Makefile
5693  create mode 100644 drivers/net/ethernet/calxeda/xgmac.c
5694  create mode 100644 drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
5695  create mode 100644 drivers/net/team/Kconfig
5696  create mode 100644 drivers/net/team/Makefile
5697  create mode 100644 drivers/net/team/team.c
5698  create mode 100644 drivers/net/team/team_mode_activebackup.c
5699  create mode 100644 drivers/net/team/team_mode_roundrobin.c
5700  rename drivers/net/wireless/ath/ath6kl/{htc_hif.c => hif.c} (80%)
5701  delete mode 100644 drivers/net/wireless/ath/ath6kl/htc_hif.h
5702  create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.c
5703  create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mci.h
5704  create mode 100644 drivers/net/wireless/ath/ath9k/mci.c
5705  create mode 100644 drivers/net/wireless/ath/ath9k/mci.h
5706  delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/bcmchip.h
5707  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
5708  create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.h
5709  create mode 100644 drivers/net/wireless/iwlegacy/3945-debug.c
5710  create mode 100644 drivers/net/wireless/iwlegacy/3945-mac.c
5711  create mode 100644 drivers/net/wireless/iwlegacy/3945-rs.c
5712  create mode 100644 drivers/net/wireless/iwlegacy/3945.c
5713  create mode 100644 drivers/net/wireless/iwlegacy/3945.h
5714  rename drivers/net/wireless/iwlegacy/{iwl-4965-calib.c => 4965-calib.c} (55%)
5715  create mode 100644 drivers/net/wireless/iwlegacy/4965-debug.c
5716  create mode 100644 drivers/net/wireless/iwlegacy/4965-mac.c
5717  create mode 100644 drivers/net/wireless/iwlegacy/4965-rs.c
5718  create mode 100644 drivers/net/wireless/iwlegacy/4965.c
5719  create mode 100644 drivers/net/wireless/iwlegacy/4965.h
5720  rename drivers/net/wireless/iwlegacy/{iwl-commands.h => commands.h} (79%)
5721  create mode 100644 drivers/net/wireless/iwlegacy/common.c
5722  create mode 100644 drivers/net/wireless/iwlegacy/common.h
5723  rename drivers/net/wireless/iwlegacy/{iwl-csr.h => csr.h} (84%)
5724  create mode 100644 drivers/net/wireless/iwlegacy/debug.c
5725  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
5726  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-debugfs.h
5727  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-fh.h
5728  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-hw.h
5729  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.c
5730  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-led.h
5731  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945-rs.c
5732  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.c
5733  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-3945.h
5734  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-calib.h
5735  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
5736  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-debugfs.h
5737  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-eeprom.c
5738  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-hw.h
5739  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.c
5740  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-led.h
5741  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-lib.c
5742  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rs.c
5743  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-rx.c
5744  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-sta.c
5745  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-tx.c
5746  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965-ucode.c
5747  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.c
5748  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-4965.h
5749  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.c
5750  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-core.h
5751  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debug.h
5752  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-debugfs.c
5753  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-dev.h
5754  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.c
5755  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-devtrace.h
5756  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.c
5757  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-eeprom.h
5758  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-fh.h
5759  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-hcmd.c
5760  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-helpers.h
5761  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-io.h
5762  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.c
5763  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-led.h
5764  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-legacy-rs.h
5765  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.c
5766  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-power.h
5767  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-rx.c
5768  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-scan.c
5769  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-sta.h
5770  delete mode 100644 drivers/net/wireless/iwlegacy/iwl-tx.c
5771  delete mode 100644 drivers/net/wireless/iwlegacy/iwl3945-base.c
5772  delete mode 100644 drivers/net/wireless/iwlegacy/iwl4965-base.c
5773  rename drivers/net/wireless/iwlegacy/{iwl-prph.h => prph.h} (83%)
5774  create mode 100644 drivers/net/wireless/iwlwifi/iwl-mac80211.c
5775  rename drivers/net/wireless/iwlwifi/{iwl-sv-open.c => iwl-testmode.c} (78%)
5776  rename drivers/net/wireless/iwlwifi/{iwl-agn-ucode.c => iwl-ucode.c} (64%)
5777  create mode 100644 drivers/net/wireless/wl12xx/debug.h
5778  delete mode 100644 drivers/net/wireless/wl12xx/sdio_test.c
5779  create mode 100644 include/linux/can/platform/cc770.h
5780  create mode 100644 include/linux/dynamic_queue_limits.h
5781  create mode 100644 include/linux/if_team.h
5782  create mode 100644 include/linux/netdev_features.h
5783  create mode 100644 include/linux/openvswitch.h
5784  create mode 100644 include/linux/sock_diag.h
5785  create mode 100644 include/net/flow_keys.h
5786  create mode 100644 include/net/netprio_cgroup.h
5787  create mode 100644 include/net/tcp_memcontrol.h
5788  create mode 100644 lib/dynamic_queue_limits.c
5789  create mode 100644 net/caif/caif_usb.c
5790  create mode 100644 net/core/flow_dissector.c
5791  create mode 100644 net/core/netprio_cgroup.c
5792  create mode 100644 net/core/sock_diag.c
5793  create mode 100644 net/ipv4/tcp_memcontrol.c
5794  create mode 100644 net/ipv4/udp_diag.c
5795  create mode 100644 net/openvswitch/Kconfig
5796  create mode 100644 net/openvswitch/Makefile
5797  create mode 100644 net/openvswitch/actions.c
5798  create mode 100644 net/openvswitch/datapath.c
5799  create mode 100644 net/openvswitch/datapath.h
5800  create mode 100644 net/openvswitch/dp_notify.c
5801  create mode 100644 net/openvswitch/flow.c
5802  create mode 100644 net/openvswitch/flow.h
5803  create mode 100644 net/openvswitch/vport-internal_dev.c
5804  create mode 100644 net/openvswitch/vport-internal_dev.h
5805  create mode 100644 net/openvswitch/vport-netdev.c
5806  create mode 100644 net/openvswitch/vport-netdev.h
5807  create mode 100644 net/openvswitch/vport.c
5808  create mode 100644 net/openvswitch/vport.h
5809 Merging wireless-next/master (d66be82 b43: N-PHY: check for bustype before touching BCMA CC PLLs)
5810 $ git merge wireless-next/master
5811 Resolved 'drivers/net/wireless/iwlwifi/iwl-agn.c' using previous resolution.
5812 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
5813 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c
5814 Automatic merge failed; fix conflicts and then commit the result.
5815 $ git commit -v -a
5816 [master a6eeade] Merge remote-tracking branch 'wireless-next/master'
5817 $ git diff -M --stat --summary HEAD^..
5818  drivers/bcma/bcma_private.h                        |    3 +
5819  drivers/bcma/host_pci.c                            |   37 +
5820  drivers/bcma/main.c                                |   16 +
5821  drivers/bcma/sprom.c                               |   61 +
5822  drivers/net/wireless/ath/ath.h                     |    6 +
5823  drivers/net/wireless/ath/ath9k/Kconfig             |   22 +
5824  drivers/net/wireless/ath/ath9k/Makefile            |    2 +
5825  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   59 +-
5826  drivers/net/wireless/ath/ath9k/ath9k.h             |    9 +-
5827  drivers/net/wireless/ath/ath9k/debug.c             |    5 +-
5828  drivers/net/wireless/ath/ath9k/debug.h             |    2 +
5829  drivers/net/wireless/ath/ath9k/dfs.c               |  215 ++++
5830  drivers/net/wireless/ath/ath9k/dfs.h               |   43 +
5831  drivers/net/wireless/ath/ath9k/dfs_debug.c         |   81 ++
5832  drivers/net/wireless/ath/ath9k/dfs_debug.h         |   57 +
5833  drivers/net/wireless/ath/ath9k/hw-ops.h            |    9 +
5834  drivers/net/wireless/ath/ath9k/hw.c                |   27 +
5835  drivers/net/wireless/ath/ath9k/hw.h                |    1 +
5836  drivers/net/wireless/ath/ath9k/init.c              |   17 +-
5837  drivers/net/wireless/ath/ath9k/main.c              |    2 +-
5838  drivers/net/wireless/ath/ath9k/mci.c               |    8 +-
5839  drivers/net/wireless/ath/ath9k/mci.h               |    4 -
5840  drivers/net/wireless/ath/ath9k/xmit.c              |  236 ++--
5841  drivers/net/wireless/ath/regd.c                    |   77 ++-
5842  drivers/net/wireless/b43/phy_n.c                   |  312 +++++-
5843  drivers/net/wireless/b43/phy_n.h                   |    8 +
5844  drivers/net/wireless/b43/radio_2056.c              |   25 +-
5845  drivers/net/wireless/b43/radio_2056.h              |    1 +
5846  drivers/net/wireless/b43/tables_nphy.c             |   77 ++-
5847  drivers/net/wireless/b43/tables_nphy.h             |   31 +-
5848  drivers/net/wireless/brcm80211/Kconfig             |    3 +-
5849  drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c   |    3 +-
5850  .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c |   25 +-
5851  drivers/net/wireless/brcm80211/brcmfmac/dhd.h      |    2 +-
5852  drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c  |    6 +-
5853  drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c |    2 +
5854  .../net/wireless/brcm80211/brcmfmac/sdio_chip.c    |   74 +-
5855  .../net/wireless/brcm80211/brcmfmac/sdio_host.h    |    1 +
5856  drivers/net/wireless/brcm80211/brcmsmac/aiutils.c  | 1239 ++++----------------
5857  drivers/net/wireless/brcm80211/brcmsmac/aiutils.h  |  148 +--
5858  drivers/net/wireless/brcm80211/brcmsmac/ampdu.c    |    7 +-
5859  drivers/net/wireless/brcm80211/brcmsmac/d11.h      |    3 +
5860  drivers/net/wireless/brcm80211/brcmsmac/dma.c      |  229 ++--
5861  drivers/net/wireless/brcm80211/brcmsmac/dma.h      |    9 +-
5862  .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |  166 +--
5863  .../net/wireless/brcm80211/brcmsmac/mac80211_if.h  |    2 -
5864  drivers/net/wireless/brcm80211/brcmsmac/main.c     |  702 ++++++------
5865  drivers/net/wireless/brcm80211/brcmsmac/main.h     |    4 +-
5866  drivers/net/wireless/brcm80211/brcmsmac/nicpci.c   |  241 ++--
5867  drivers/net/wireless/brcm80211/brcmsmac/nicpci.h   |   11 +-
5868  drivers/net/wireless/brcm80211/brcmsmac/otp.c      |   76 +-
5869  .../net/wireless/brcm80211/brcmsmac/phy/phy_cmn.c  |  229 ++--
5870  .../net/wireless/brcm80211/brcmsmac/phy/phy_hal.h  |    4 +-
5871  .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h  |    6 +-
5872  .../net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c  |   69 +-
5873  .../net/wireless/brcm80211/brcmsmac/phy/phy_n.c    |   84 +-
5874  drivers/net/wireless/brcm80211/brcmsmac/pmu.c      |  270 ++---
5875  drivers/net/wireless/brcm80211/brcmsmac/pmu.h      |    5 +-
5876  drivers/net/wireless/brcm80211/brcmsmac/pub.h      |    6 +-
5877  drivers/net/wireless/brcm80211/brcmsmac/srom.c     |   50 +-
5878  drivers/net/wireless/brcm80211/brcmsmac/srom.h     |    2 +-
5879  drivers/net/wireless/brcm80211/brcmsmac/types.h    |   54 +-
5880  .../net/wireless/brcm80211/include/chipcommon.h    |    2 +
5881  drivers/net/wireless/iwlwifi/Kconfig               |   30 +-
5882  drivers/net/wireless/iwlwifi/Makefile              |    2 +-
5883  drivers/net/wireless/iwlwifi/iwl-5000.c            |    8 +-
5884  drivers/net/wireless/iwlwifi/iwl-6000.c            |    4 +-
5885  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   18 +-
5886  drivers/net/wireless/iwlwifi/iwl-agn-calib.h       |    5 -
5887  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |   34 +-
5888  drivers/net/wireless/iwlwifi/iwl-agn-rs.c          |   16 +-
5889  drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |    3 +-
5890  drivers/net/wireless/iwlwifi/iwl-agn-rx.c          |    2 +-
5891  drivers/net/wireless/iwlwifi/iwl-agn-sta.c         |    4 +-
5892  drivers/net/wireless/iwlwifi/iwl-agn-tx.c          |    5 +-
5893  drivers/net/wireless/iwlwifi/iwl-agn.c             |   27 +-
5894  drivers/net/wireless/iwlwifi/iwl-agn.h             |    6 +-
5895  drivers/net/wireless/iwlwifi/iwl-commands.h        |   84 +-
5896  drivers/net/wireless/iwlwifi/iwl-debugfs.c         |    4 +-
5897  drivers/net/wireless/iwlwifi/iwl-dev.h             |   30 +-
5898  drivers/net/wireless/iwlwifi/iwl-eeprom.c          |   60 +-
5899  drivers/net/wireless/iwlwifi/iwl-eeprom.h          |    7 +-
5900  drivers/net/wireless/iwlwifi/iwl-mac80211.c        |   26 +-
5901  drivers/net/wireless/iwlwifi/iwl-shared.h          |   15 +-
5902  drivers/net/wireless/iwlwifi/iwl-testmode.c        |   49 +-
5903  drivers/net/wireless/iwlwifi/iwl-testmode.h        |   18 +-
5904  drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c   |   21 +-
5905  drivers/net/wireless/iwlwifi/iwl-trans-pcie.c      |    1 +
5906  drivers/net/wireless/iwlwifi/iwl-trans.h           |   18 +
5907  drivers/net/wireless/iwlwifi/iwl-ucode.c           |   32 +-
5908  drivers/net/wireless/mwifiex/cfg80211.c            |  194 +---
5909  drivers/net/wireless/mwifiex/cfg80211.h            |    1 -
5910  drivers/net/wireless/mwifiex/init.c                |   40 +
5911  drivers/net/wireless/mwifiex/main.c                |   13 +-
5912  drivers/net/wireless/mwifiex/main.h                |   18 +-
5913  drivers/net/wireless/mwifiex/pcie.c                |   20 +-
5914  drivers/net/wireless/mwifiex/scan.c                |   13 +-
5915  drivers/net/wireless/mwifiex/sdio.c                |   22 +-
5916  drivers/net/wireless/mwifiex/sta_event.c           |   23 +-
5917  drivers/net/wireless/mwifiex/sta_ioctl.c           |    4 +-
5918  drivers/net/wireless/mwifiex/txrx.c                |    5 +-
5919  drivers/net/wireless/rt2x00/rt2x00mac.c            |    2 +-
5920  drivers/net/wireless/rtlwifi/base.c                |    3 +-
5921  drivers/net/wireless/rtlwifi/pci.c                 |   26 +-
5922  drivers/net/wireless/rtlwifi/ps.c                  |   21 +-
5923  drivers/net/wireless/rtlwifi/wifi.h                |    6 +-
5924  drivers/net/wireless/wl12xx/acx.c                  |   26 -
5925  drivers/net/wireless/wl12xx/acx.h                  |    8 -
5926  drivers/net/wireless/wl12xx/debugfs.c              |   16 +-
5927  drivers/net/wireless/wl12xx/init.c                 |   47 +-
5928  drivers/net/wireless/wl12xx/init.h                 |    1 -
5929  drivers/net/wireless/wl12xx/main.c                 |   19 +-
5930  drivers/net/wireless/wl12xx/rx.c                   |    8 +-
5931  drivers/net/wireless/wl12xx/testmode.c             |    1 +
5932  drivers/net/wireless/wl12xx/tx.c                   |    9 +-
5933  drivers/net/wireless/wl12xx/wl12xx.h               |    7 -
5934  drivers/nfc/pn533.c                                |  168 +++-
5935  drivers/ssb/pci.c                                  |   23 +
5936  include/linux/bcma/bcma.h                          |   55 +-
5937  include/linux/bcma/bcma_driver_chipcommon.h        |    1 +
5938  include/linux/ieee80211.h                          |    9 +
5939  include/linux/nfc.h                                |   29 +-
5940  include/linux/nl80211.h                            |    6 +-
5941  include/linux/ssb/ssb.h                            |    9 +
5942  include/linux/ssb/ssb_regs.h                       |   17 +
5943  include/net/cfg80211.h                             |   33 +-
5944  include/net/nfc/nfc.h                              |   21 +-
5945  net/mac80211/agg-tx.c                              |    6 +-
5946  net/mac80211/cfg.c                                 |  102 ++-
5947  net/mac80211/debugfs_netdev.c                      |    2 +
5948  net/mac80211/ht.c                                  |    2 +-
5949  net/mac80211/ibss.c                                |  156 ++-
5950  net/mac80211/ieee80211_i.h                         |   31 +-
5951  net/mac80211/iface.c                               |    5 +-
5952  net/mac80211/main.c                                |   11 +-
5953  net/mac80211/mesh_plink.c                          |    7 +-
5954  net/mac80211/mlme.c                                |    9 +-
5955  net/mac80211/rx.c                                  |    4 +-
5956  net/mac80211/sta_info.c                            |  356 +++----
5957  net/mac80211/sta_info.h                            |   39 +-
5958  net/mac80211/status.c                              |   15 +-
5959  net/mac80211/tx.c                                  |   32 +-
5960  net/mac80211/util.c                                |    3 +-
5961  net/nfc/Kconfig                                    |    1 +
5962  net/nfc/Makefile                                   |    1 +
5963  net/nfc/core.c                                     |  143 +++-
5964  net/nfc/llcp/Kconfig                               |    7 +
5965  net/nfc/llcp/commands.c                            |  399 +++++++
5966  net/nfc/llcp/llcp.c                                |  973 +++++++++++++++
5967  net/nfc/llcp/llcp.h                                |  193 +++
5968  net/nfc/llcp/sock.c                                |  675 +++++++++++
5969  net/nfc/nci/core.c                                 |    2 +-
5970  net/nfc/nci/data.c                                 |    2 +-
5971  net/nfc/nci/ntf.c                                  |    2 +-
5972  net/nfc/nci/rsp.c                                  |    2 +-
5973  net/nfc/netlink.c                                  |  148 +++-
5974  net/nfc/nfc.h                                      |   63 +
5975  net/nfc/rawsock.c                                  |   11 +-
5976  net/wireless/core.h                                |    6 +-
5977  net/wireless/nl80211.c                             |  250 +++--
5978  net/wireless/reg.c                                 |   16 +-
5979  net/wireless/sme.c                                 |   61 +-
5980  net/wireless/util.c                                |    6 +-
5981  163 files changed, 6675 insertions(+), 3706 deletions(-)
5982  create mode 100644 drivers/net/wireless/ath/ath9k/dfs.c
5983  create mode 100644 drivers/net/wireless/ath/ath9k/dfs.h
5984  create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.c
5985  create mode 100644 drivers/net/wireless/ath/ath9k/dfs_debug.h
5986  create mode 100644 net/nfc/llcp/Kconfig
5987  create mode 100644 net/nfc/llcp/commands.c
5988  create mode 100644 net/nfc/llcp/llcp.c
5989  create mode 100644 net/nfc/llcp/llcp.h
5990  create mode 100644 net/nfc/llcp/sock.c
5991 Merging bluetooth/master (5a13b09 Bluetooth: trivial: correct check for LMP version)
5992 $ git merge bluetooth/master
5993 Already up-to-date.
5994 Merging mtd/master (7148b79 mtd: pxa2xx-flash.c: It used to fall back to provided table.)
5995 $ git merge mtd/master
5996 Merge made by the 'recursive' strategy.
5997  drivers/mtd/maps/pxa2xx-flash.c        |    2 +-
5998  drivers/mtd/nand/gpmi-nand/gpmi-nand.c |    2 +-
5999  drivers/mtd/nand/ndfc.c                |    2 +-
6000  3 files changed, 3 insertions(+), 3 deletions(-)
6001 Merging l2-mtd/master (a469923 mtd: document that MEMWRITE ioctl is NAND-specific)
6002 $ git merge l2-mtd/master
6003 Resolved 'drivers/mtd/bcm63xxpart.c' using previous resolution.
6004 Auto-merging drivers/mtd/nand/ndfc.c
6005 Auto-merging drivers/mtd/maps/pxa2xx-flash.c
6006 Auto-merging drivers/mtd/bcm63xxpart.c
6007 CONFLICT (content): Merge conflict in drivers/mtd/bcm63xxpart.c
6008 Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c
6009 Automatic merge failed; fix conflicts and then commit the result.
6010 $ git commit -v -a
6011 [master 05b26ab] Merge remote-tracking branch 'l2-mtd/master'
6012 $ git diff -M --stat --summary HEAD^..
6013  .../ABI/testing/sysfs-devices-platform-docg3       |   34 +
6014  arch/mips/bcm63xx/boards/board_bcm963xx.c          |    3 +
6015  drivers/mtd/Kconfig                                |    8 +
6016  drivers/mtd/Makefile                               |    1 +
6017  .../mtd/{maps/bcm963xx-flash.c => bcm63xxpart.c}   |  190 +--
6018  drivers/mtd/chips/cfi_cmdset_0020.c                |    5 +-
6019  drivers/mtd/devices/Kconfig                        |    9 +
6020  drivers/mtd/devices/docg3.c                        | 1466 +++++++++++++++++---
6021  drivers/mtd/devices/docg3.h                        |   65 +-
6022  drivers/mtd/devices/m25p80.c                       |    1 -
6023  drivers/mtd/devices/mtd_dataflash.c                |    1 -
6024  drivers/mtd/devices/sst25l.c                       |    1 -
6025  drivers/mtd/maps/Kconfig                           |    9 -
6026  drivers/mtd/maps/Makefile                          |    1 -
6027  drivers/mtd/maps/bfin-async-flash.c                |   12 +-
6028  drivers/mtd/maps/gpio-addr-flash.c                 |   12 +-
6029  drivers/mtd/maps/ixp2000.c                         |   12 +-
6030  drivers/mtd/maps/ixp4xx.c                          |   14 +-
6031  drivers/mtd/maps/latch-addr-flash.c                |   12 +-
6032  drivers/mtd/maps/physmap.c                         |    5 +-
6033  drivers/mtd/maps/physmap_of.c                      |   13 +-
6034  drivers/mtd/maps/pxa2xx-flash.c                    |   13 +-
6035  drivers/mtd/maps/rbtx4939-flash.c                  |   13 +-
6036  drivers/mtd/maps/sa1100-flash.c                    |   13 +-
6037  drivers/mtd/maps/sun_uflash.c                      |   13 +-
6038  drivers/mtd/mtd_blkdevs.c                          |    3 +-
6039  drivers/mtd/mtdoops.c                              |    5 +-
6040  drivers/mtd/nand/Kconfig                           |    2 +-
6041  drivers/mtd/nand/ams-delta.c                       |   12 +-
6042  drivers/mtd/nand/bcm_umi_nand.c                    |   13 +-
6043  drivers/mtd/nand/davinci_nand.c                    |    4 +-
6044  drivers/mtd/nand/fsl_elbc_nand.c                   |   47 +-
6045  drivers/mtd/nand/fsl_upm.c                         |   12 +-
6046  drivers/mtd/nand/jz4740_nand.c                     |   12 +-
6047  drivers/mtd/nand/mpc5121_nfc.c                     |   14 +-
6048  drivers/mtd/nand/nand_base.c                       |    7 +-
6049  drivers/mtd/nand/nand_ids.c                        |    4 +-
6050  drivers/mtd/nand/ndfc.c                            |   13 +-
6051  drivers/mtd/nand/nomadik_nand.c                    |   14 +-
6052  drivers/mtd/nand/nuc900_nand.c                     |   13 +-
6053  drivers/mtd/nand/omap2.c                           |   15 +-
6054  drivers/mtd/nand/pasemi_nand.c                     |   12 +-
6055  drivers/mtd/nand/plat_nand.c                       |   13 +-
6056  drivers/mtd/nand/pxa3xx_nand.c                     |   12 +-
6057  drivers/mtd/nand/sharpsl.c                         |   12 +-
6058  drivers/mtd/nand/socrates_nand.c                   |   13 +-
6059  drivers/mtd/nand/tmio_nand.c                       |   13 +-
6060  drivers/mtd/onenand/generic.c                      |   16 +-
6061  drivers/mtd/onenand/samsung.c                      |   13 +-
6062  drivers/mtd/tests/mtd_stresstest.c                 |    7 +
6063  fs/jffs2/fs.c                                      |    1 -
6064  include/linux/mtd/cfi.h                            |   16 +-
6065  include/linux/mtd/cfi_endian.h                     |   76 +-
6066  include/linux/mtd/map.h                            |    1 +
6067  include/linux/mtd/nand.h                           |    1 +
6068  include/linux/mtd/physmap.h                        |    1 +
6069  include/mtd/mtd-abi.h                              |    3 +-
6070  57 files changed, 1531 insertions(+), 795 deletions(-)
6071  create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-docg3
6072  rename drivers/mtd/{maps/bcm963xx-flash.c => bcm63xxpart.c} (54%)
6073 Merging crypto/master (741e8c2 crypto: convert drivers/crypto/* to use module_platform_driver())
6074 $ git merge crypto/master
6075 Auto-merging drivers/crypto/mv_cesa.c
6076 Removing crypto/serpent.c
6077 Auto-merging crypto/crypto_user.c
6078 Merge made by the 'recursive' strategy.
6079  arch/x86/crypto/Makefile                     |    4 +
6080  arch/x86/crypto/serpent-sse2-i586-asm_32.S   |  638 ++++++
6081  arch/x86/crypto/serpent-sse2-x86_64-asm_64.S |  761 +++++++
6082  arch/x86/crypto/serpent_sse2_glue.c          | 1110 ++++++++++
6083  arch/x86/crypto/twofish_glue_3way.c          |  250 +++
6084  arch/x86/include/asm/serpent.h               |   63 +
6085  crypto/Kconfig                               |   38 +-
6086  crypto/Makefile                              |    2 +-
6087  crypto/algapi.c                              |   29 +
6088  crypto/ansi_cprng.c                          |    8 +
6089  crypto/crypto_user.c                         |    2 +-
6090  crypto/lrw.c                                 |  156 +-
6091  crypto/serpent.c                             |  587 -----
6092  crypto/serpent_generic.c                     |  684 ++++++
6093  crypto/tcrypt.c                              |  310 +++
6094  crypto/tcrypt.h                              |    2 +
6095  crypto/testmgr.c                             |  150 ++
6096  crypto/testmgr.h                             | 3029 ++++++++++++++++++++++++--
6097  crypto/twofish_common.c                      |   13 +-
6098  crypto/xts.c                                 |   79 +-
6099  drivers/char/hw_random/atmel-rng.c           |   12 +-
6100  drivers/char/hw_random/n2-drv.c              |   13 +-
6101  drivers/char/hw_random/octeon-rng.c          |   13 +-
6102  drivers/char/hw_random/pasemi-rng.c          |   12 +-
6103  drivers/char/hw_random/picoxcell-rng.c       |   12 +-
6104  drivers/char/hw_random/ppc4xx-rng.c          |   12 +-
6105  drivers/char/hw_random/timeriomem-rng.c      |   13 +-
6106  drivers/crypto/amcc/crypto4xx_core.c         |   13 +-
6107  drivers/crypto/caam/caamalg.c                |   57 +
6108  drivers/crypto/caam/compat.h                 |    1 +
6109  drivers/crypto/caam/ctrl.c                   |   13 +-
6110  drivers/crypto/mv_cesa.c                     |   12 +-
6111  drivers/crypto/picoxcell_crypto.c            |   12 +-
6112  drivers/crypto/s5p-sss.c                     |   13 +-
6113  drivers/crypto/talitos.c                     |  490 ++++-
6114  drivers/crypto/talitos.h                     |   45 +-
6115  include/crypto/algapi.h                      |    1 +
6116  include/crypto/lrw.h                         |   43 +
6117  include/crypto/serpent.h                     |   27 +
6118  include/crypto/twofish.h                     |    2 +
6119  include/crypto/xts.h                         |   27 +
6120  41 files changed, 7738 insertions(+), 1020 deletions(-)
6121  create mode 100644 arch/x86/crypto/serpent-sse2-i586-asm_32.S
6122  create mode 100644 arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
6123  create mode 100644 arch/x86/crypto/serpent_sse2_glue.c
6124  create mode 100644 arch/x86/include/asm/serpent.h
6125  delete mode 100644 crypto/serpent.c
6126  create mode 100644 crypto/serpent_generic.c
6127  create mode 100644 include/crypto/lrw.h
6128  create mode 100644 include/crypto/serpent.h
6129  create mode 100644 include/crypto/xts.h
6130 Merging sound/for-next (1b7ac7c Merge branch 'fix/hda' into for-next)
6131 $ git merge sound/for-next
6132 Resolved 'arch/arm/mach-s3c64xx/mach-crag6410.c' using previous resolution.
6133 Auto-merging sound/soc/txx9/txx9aclc.c
6134 Auto-merging sound/soc/samsung/tobermory.c
6135 Auto-merging sound/soc/samsung/dma.c
6136 Auto-merging sound/soc/nuc900/nuc900-ac97.c
6137 Auto-merging sound/soc/mxs/mxs-saif.c
6138 Auto-merging sound/soc/kirkwood/kirkwood-dma.c
6139 Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c
6140 Auto-merging sound/soc/ep93xx/ep93xx-pcm.c
6141 Removing sound/soc/codecs/wm8994-tables.c
6142 Auto-merging sound/soc/codecs/sigmadsp.c
6143 Auto-merging sound/soc/au1x/db1200.c
6144 Removing sound/pci/hda/alc262_quirks.c
6145 Removing include/linux/sigma.h
6146 Auto-merging arch/arm/mach-tegra/board-seaboard.c
6147 Auto-merging arch/arm/mach-tegra/board-harmony.c
6148 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
6149 CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c
6150 Auto-merging MAINTAINERS
6151 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
6152 Automatic merge failed; fix conflicts and then commit the result.
6153 $ git commit -v -a
6154 [master 6840a23] Merge remote-tracking branch 'sound/for-next'
6155 $ git diff -M --stat --summary HEAD^..
6156  .../devicetree/bindings/sound/tegra20-das.txt      |   12 +
6157  .../devicetree/bindings/sound/tegra20-i2s.txt      |   17 +
6158  Documentation/devicetree/bindings/sound/wm8903.txt |   50 +
6159  Documentation/devicetree/bindings/sound/wm8994.txt |   18 +
6160  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
6161  Documentation/sound/alsa/HD-Audio-Models.txt       |   15 +-
6162  MAINTAINERS                                        |    1 +
6163  arch/arm/mach-s3c64xx/mach-crag6410.c              |    6 +-
6164  arch/arm/mach-shmobile/board-ap4evb.c              |   15 +-
6165  arch/arm/mach-shmobile/board-mackerel.c            |   14 +-
6166  arch/arm/mach-tegra/board-harmony.c                |    8 +-
6167  arch/arm/mach-tegra/board-seaboard.c               |    8 +-
6168  arch/sh/boards/mach-se/7724/setup.c                |   14 +-
6169  drivers/base/regmap/Kconfig                        |    3 +
6170  drivers/base/regmap/Makefile                       |    1 +
6171  drivers/base/regmap/internal.h                     |    3 +-
6172  drivers/base/regmap/regcache-lzo.c                 |    2 +-
6173  drivers/base/regmap/regcache.c                     |   28 +-
6174  drivers/base/regmap/regmap-irq.c                   |  302 ++
6175  drivers/base/regmap/regmap.c                       |   45 +-
6176  drivers/firmware/Kconfig                           |   12 -
6177  drivers/firmware/Makefile                          |    1 -
6178  drivers/mfd/Kconfig                                |    1 +
6179  drivers/mfd/Makefile                               |    2 +-
6180  drivers/mfd/wm8994-core.c                          |  142 +-
6181  drivers/mfd/wm8994-irq.c                           |  206 +--
6182  drivers/mfd/wm8994-regmap.c                        | 1238 ++++++++
6183  drivers/mfd/wm8994.h                               |   25 +
6184  include/linux/mfd/wm8994/core.h                    |    7 +-
6185  include/linux/mfd/wm8994/pdata.h                   |   31 +-
6186  include/linux/mfd/wm8994/registers.h               |  112 +
6187  include/linux/regmap.h                             |   53 +-
6188  include/linux/sigma.h                              |   55 -
6189  include/sound/sh_fsi.h                             |   12 +
6190  include/sound/soc-dapm.h                           |    5 +
6191  include/sound/soc.h                                |   11 +-
6192  include/sound/sta32x.h                             |   35 +
6193  include/sound/wm8903.h                             |    7 +-
6194  sound/arm/pxa2xx-ac97.c                            |   13 +-
6195  sound/drivers/ml403-ac97cr.c                       |   13 +-
6196  sound/mips/hal2.c                                  |   13 +-
6197  sound/mips/sgio2audio.c                            |   13 +-
6198  sound/pci/asihpi/hpicmn.c                          |    2 +-
6199  sound/pci/ctxfi/ctsrc.c                            |    2 +-
6200  sound/pci/hda/alc262_quirks.c                      |  875 ------
6201  sound/pci/hda/alc880_quirks.c                      |  193 --
6202  sound/pci/hda/alc882_quirks.c                      | 2933 +------------------
6203  sound/pci/hda/hda_codec.c                          |    6 +
6204  sound/pci/hda/hda_codec.h                          |    3 -
6205  sound/pci/hda/hda_intel.c                          |   99 +-
6206  sound/pci/hda/patch_hdmi.c                         |   20 +-
6207  sound/pci/hda/patch_realtek.c                      |  607 +++-
6208  sound/pci/hda/patch_sigmatel.c                     |   16 +-
6209  sound/pci/sis7019.c                                |   29 +-
6210  sound/sh/sh_dac_audio.c                            |   13 +-
6211  sound/soc/Kconfig                                  |   15 -
6212  sound/soc/atmel/atmel-pcm.c                        |   12 +-
6213  sound/soc/atmel/atmel_ssc_dai.c                    |   14 +-
6214  sound/soc/au1x/ac97c.c                             |    2 +-
6215  sound/soc/au1x/db1000.c                            |   13 +-
6216  sound/soc/au1x/db1200.c                            |   13 +-
6217  sound/soc/au1x/dbdma2.c                            |   15 +-
6218  sound/soc/au1x/dma.c                               |   15 +-
6219  sound/soc/au1x/i2sc.c                              |   13 +-
6220  sound/soc/au1x/psc-ac97.c                          |    2 +-
6221  sound/soc/au1x/psc-i2s.c                           |   15 +-
6222  sound/soc/blackfin/bf5xx-ac97-pcm.c                |   12 +-
6223  sound/soc/blackfin/bf5xx-ac97.c                    |   13 +-
6224  sound/soc/blackfin/bf5xx-i2s-pcm.c                 |   12 +-
6225  sound/soc/blackfin/bf5xx-i2s.c                     |   15 +-
6226  sound/soc/blackfin/bf5xx-tdm-pcm.c                 |   12 +-
6227  sound/soc/blackfin/bf5xx-tdm.c                     |   14 +-
6228  sound/soc/blackfin/bfin-eval-adau1373.c            |   12 +-
6229  sound/soc/blackfin/bfin-eval-adau1701.c            |   12 +-
6230  sound/soc/blackfin/bfin-eval-adav80x.c             |   12 +-
6231  sound/soc/codecs/88pm860x-codec.c                  |   16 +-
6232  sound/soc/codecs/Kconfig                           |   25 +-
6233  sound/soc/codecs/Makefile                          |   22 +-
6234  sound/soc/codecs/ac97.c                            |   16 +-
6235  sound/soc/codecs/ad1836.c                          |    4 +-
6236  sound/soc/codecs/ad193x.c                          |  190 +-
6237  sound/soc/codecs/ad193x.h                          |   17 +-
6238  sound/soc/codecs/ad1980.c                          |   12 +-
6239  sound/soc/codecs/ad73311.c                         |   12 +-
6240  sound/soc/codecs/adau1373.c                        |    2 +-
6241  sound/soc/codecs/adau1701.c                        |    2 +-
6242  sound/soc/codecs/adav80x.c                         |    2 +-
6243  sound/soc/codecs/ads117x.c                         |   12 +-
6244  sound/soc/codecs/ak4104.c                          |    2 +-
6245  sound/soc/codecs/ak4535.c                          |    5 +-
6246  sound/soc/codecs/ak4641.c                          |    7 +-
6247  sound/soc/codecs/ak4642.c                          |  142 +-
6248  sound/soc/codecs/ak4671.c                          |    2 +-
6249  sound/soc/codecs/alc5623.c                         |    5 +-
6250  sound/soc/codecs/alc5632.c                         | 1159 +++++++
6251  sound/soc/codecs/alc5632.h                         |  251 ++
6252  sound/soc/codecs/cq93vc.c                          |   14 +-
6253  sound/soc/codecs/cs4270.c                          |    5 +-
6254  sound/soc/codecs/cs4271.c                          |    4 +-
6255  sound/soc/codecs/cs42l51.c                         |   16 +-
6256  sound/soc/codecs/cs42l73.c                         | 1453 +++++++++
6257  sound/soc/codecs/cs42l73.h                         |  227 ++
6258  sound/soc/codecs/cx20442.c                         |   12 +-
6259  sound/soc/codecs/da7210.c                          |    7 +-
6260  sound/soc/codecs/dfbmcs320.c                       |   12 +-
6261  sound/soc/codecs/dmic.c                            |   12 +-
6262  sound/soc/codecs/jz4740.c                          |   16 +-
6263  sound/soc/codecs/max98088.c                        |    7 +-
6264  sound/soc/codecs/max98095.c                        |    9 +-
6265  sound/soc/codecs/max9850.c                         |    4 +-
6266  sound/soc/codecs/pcm3008.c                         |   14 +-
6267  sound/soc/codecs/rt5631.c                          |    5 +-
6268  sound/soc/codecs/sgtl5000.c                        |    5 +-
6269  .../sigma.c => sound/soc/codecs/sigmadsp.c         |  121 +-
6270  sound/soc/codecs/sigmadsp.h                        |   21 +
6271  sound/soc/codecs/sn95031.c                         |   22 +-
6272  sound/soc/codecs/spdif_transciever.c               |   13 +-
6273  sound/soc/codecs/ssm2602.c                         |    5 +-
6274  sound/soc/codecs/sta32x.c                          |   89 +-
6275  sound/soc/codecs/stac9766.c                        |   21 +-
6276  sound/soc/codecs/tlv320aic23.c                     |    6 +-
6277  sound/soc/codecs/tlv320aic26.c                     |    2 +-
6278  sound/soc/codecs/tlv320aic32x4.c                   |    5 +-
6279  sound/soc/codecs/tlv320aic3x.c                     |   52 +-
6280  sound/soc/codecs/tlv320dac33.c                     |    5 +-
6281  sound/soc/codecs/twl4030.c                         |   18 +-
6282  sound/soc/codecs/twl6040.c                         |   16 +-
6283  sound/soc/codecs/uda134x.c                         |   17 +-
6284  sound/soc/codecs/uda1380.c                         |   36 +-
6285  sound/soc/codecs/wl1273.c                          |   14 +-
6286  sound/soc/codecs/wm1250-ev1.c                      |   10 +-
6287  sound/soc/codecs/wm2000.c                          |  227 +-
6288  sound/soc/codecs/wm2000.h                          |    7 -
6289  sound/soc/codecs/wm5100-tables.c                   | 1489 ++++-----
6290  sound/soc/codecs/wm5100.c                          |  406 ++--
6291  sound/soc/codecs/wm5100.h                          |    7 +-
6292  sound/soc/codecs/wm8350.c                          |   63 +-
6293  sound/soc/codecs/wm8400.c                          |   60 +-
6294  sound/soc/codecs/wm8510.c                          |   30 +-
6295  sound/soc/codecs/wm8523.c                          |    5 +-
6296  sound/soc/codecs/wm8580.c                          |   29 +-
6297  sound/soc/codecs/wm8711.c                          |   10 +-
6298  sound/soc/codecs/wm8727.c                          |   14 +-
6299  sound/soc/codecs/wm8728.c                          |    9 +-
6300  sound/soc/codecs/wm8731.c                          |   10 +-
6301  sound/soc/codecs/wm8737.c                          |    5 +-
6302  sound/soc/codecs/wm8741.c                          |   43 +-
6303  sound/soc/codecs/wm8750.c                          |   40 +-
6304  sound/soc/codecs/wm8753.c                          |   31 +-
6305  sound/soc/codecs/wm8770.c                          |   18 +-
6306  sound/soc/codecs/wm8776.c                          |   35 +-
6307  sound/soc/codecs/wm8782.c                          |   12 +-
6308  sound/soc/codecs/wm8804.c                          |   11 +-
6309  sound/soc/codecs/wm8900.c                          |   35 +-
6310  sound/soc/codecs/wm8903.c                          |  646 +++--
6311  sound/soc/codecs/wm8904.c                          |    9 +-
6312  sound/soc/codecs/wm8940.c                          |   11 +-
6313  sound/soc/codecs/wm8955.c                          |    7 +-
6314  sound/soc/codecs/wm8958-dsp2.c                     |    3 +-
6315  sound/soc/codecs/wm8960.c                          |   84 +-
6316  sound/soc/codecs/wm8961.c                          |   13 +-
6317  sound/soc/codecs/wm8962.c                          | 1627 ++++++-----
6318  sound/soc/codecs/wm8971.c                          |    9 +-
6319  sound/soc/codecs/wm8974.c                          |    9 +-
6320  sound/soc/codecs/wm8978.c                          |    5 +-
6321  sound/soc/codecs/wm8983.c                          |    7 +-
6322  sound/soc/codecs/wm8985.c                          |    7 +-
6323  sound/soc/codecs/wm8988.c                          |    9 +-
6324  sound/soc/codecs/wm8990.c                          |   11 +-
6325  sound/soc/codecs/wm8991.c                          |    9 +-
6326  sound/soc/codecs/wm8993.c                          |    6 +-
6327  sound/soc/codecs/wm8994-tables.c                   | 3147 --------------------
6328  sound/soc/codecs/wm8994.c                          |  649 +++--
6329  sound/soc/codecs/wm8994.h                          |   21 +-
6330  sound/soc/codecs/wm8995.c                          |  731 ++++-
6331  sound/soc/codecs/wm8996.c                          |  919 ++++---
6332  sound/soc/codecs/wm9081.c                          |  369 ++-
6333  sound/soc/codecs/wm9090.c                          |    9 +-
6334  sound/soc/codecs/wm9705.c                          |   16 +-
6335  sound/soc/codecs/wm9712.c                          |   19 +-
6336  sound/soc/codecs/wm9713.c                          |   21 +-
6337  sound/soc/codecs/wm_hubs.c                         |    8 +-
6338  sound/soc/davinci/davinci-i2s.c                    |   14 +-
6339  sound/soc/davinci/davinci-mcasp.c                  |   14 +-
6340  sound/soc/davinci/davinci-pcm.c                    |   12 +-
6341  sound/soc/davinci/davinci-vcif.c                   |   14 +-
6342  sound/soc/ep93xx/edb93xx.c                         |   12 +-
6343  sound/soc/ep93xx/ep93xx-ac97.c                     |   14 +-
6344  sound/soc/ep93xx/ep93xx-i2s.c                      |   15 +-
6345  sound/soc/ep93xx/ep93xx-pcm.c                      |   13 +-
6346  sound/soc/ep93xx/simone.c                          |   12 +-
6347  sound/soc/ep93xx/snappercl15.c                     |   13 +-
6348  sound/soc/fsl/fsl_dma.c                            |   15 +-
6349  sound/soc/fsl/fsl_ssi.c                            |   17 +-
6350  sound/soc/fsl/mpc5200_dma.c                        |   12 +-
6351  sound/soc/fsl/mpc5200_psc_ac97.c                   |   20 +-
6352  sound/soc/fsl/mpc5200_psc_i2s.c                    |   18 +-
6353  sound/soc/fsl/mpc8610_hpcd.c                       |   13 +-
6354  sound/soc/fsl/p1022_ds.c                           |   49 +-
6355  sound/soc/imx/imx-pcm-dma-mx2.c                    |   12 +-
6356  sound/soc/imx/imx-pcm-fiq.c                        |   12 +-
6357  sound/soc/imx/imx-ssi.c                            |   15 +-
6358  sound/soc/jz4740/jz4740-i2s.c                      |   14 +-
6359  sound/soc/jz4740/jz4740-pcm.c                      |   12 +-
6360  sound/soc/kirkwood/kirkwood-dma.c                  |   12 +-
6361  sound/soc/kirkwood/kirkwood-i2s.c                  |   14 +-
6362  sound/soc/mid-x86/Kconfig                          |    1 -
6363  sound/soc/mid-x86/mfld_machine.c                   |   14 +-
6364  sound/soc/mid-x86/sst_platform.c                   |  144 +-
6365  sound/soc/mid-x86/sst_platform.h                   |   82 +-
6366  sound/soc/mxs/mxs-pcm.c                            |   12 +-
6367  sound/soc/mxs/mxs-saif.c                           |   14 +-
6368  sound/soc/mxs/mxs-sgtl5000.c                       |   12 +-
6369  sound/soc/nuc900/nuc900-ac97.c                     |   15 +-
6370  sound/soc/nuc900/nuc900-pcm.c                      |   12 +-
6371  sound/soc/omap/Kconfig                             |    5 +
6372  sound/soc/omap/Makefile                            |    2 +
6373  sound/soc/omap/ams-delta.c                         |    2 +-
6374  sound/soc/omap/omap-dmic.c                         |  546 ++++
6375  sound/soc/omap/omap-dmic.h                         |   69 +
6376  sound/soc/omap/omap-hdmi.c                         |   14 +-
6377  sound/soc/omap/omap-mcbsp.c                        |   14 +-
6378  sound/soc/omap/omap-mcpdm.c                        |   19 +-
6379  sound/soc/omap/omap-pcm.c                          |   12 +-
6380  sound/soc/omap/omap4-hdmi-card.c                   |   12 +-
6381  sound/soc/omap/rx51.c                              |    2 +-
6382  sound/soc/omap/sdp4430.c                           |   85 +-
6383  sound/soc/pxa/e740_wm9705.c                        |   20 +-
6384  sound/soc/pxa/e750_wm9705.c                        |   14 +-
6385  sound/soc/pxa/e800_wm9712.c                        |   20 +-
6386  sound/soc/pxa/hx4700.c                             |   13 +-
6387  sound/soc/pxa/mioa701_wm9713.c                     |   13 +-
6388  sound/soc/pxa/palm27x.c                            |   13 +-
6389  sound/soc/pxa/pxa-ssp.c                            |   14 +-
6390  sound/soc/pxa/pxa2xx-ac97.c                        |   18 +-
6391  sound/soc/pxa/pxa2xx-i2s.c                         |    2 +-
6392  sound/soc/pxa/pxa2xx-pcm.c                         |   12 +-
6393  sound/soc/s6000/s6000-i2s.c                        |   14 +-
6394  sound/soc/s6000/s6000-pcm.c                        |   12 +-
6395  sound/soc/samsung/Kconfig                          |   18 +-
6396  sound/soc/samsung/Makefile                         |    8 +-
6397  sound/soc/samsung/ac97.c                           |   16 +-
6398  sound/soc/samsung/dma.c                            |   12 +-
6399  sound/soc/samsung/i2s.c                            |   36 +-
6400  sound/soc/samsung/idma.c                           |   14 +-
6401  sound/soc/samsung/idma.h                           |    2 +-
6402  sound/soc/samsung/littlemill.c                     |  252 ++
6403  sound/soc/samsung/lowland.c                        |  236 ++
6404  sound/soc/samsung/pcm.c                            |   14 +-
6405  sound/soc/samsung/s3c2412-i2s.c                    |   14 +-
6406  sound/soc/samsung/s3c24xx-i2s.c                    |   14 +-
6407  sound/soc/samsung/s3c24xx_simtec_hermes.c          |   16 +-
6408  sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c     |   18 +-
6409  sound/soc/samsung/s3c24xx_uda134x.c                |   14 +-
6410  sound/soc/samsung/smdk_wm8580pcm.c                 |   14 +-
6411  sound/soc/samsung/smdk_wm8994pcm.c                 |   14 +-
6412  sound/soc/samsung/spdif.c                          |   14 +-
6413  sound/soc/samsung/speyside.c                       |   22 +-
6414  .../soc/samsung/{speyside_wm8962.c => tobermory.c} |   77 +-
6415  sound/soc/sh/dma-sh7760.c                          |   12 +-
6416  sound/soc/sh/fsi-ak4642.c                          |  127 +-
6417  sound/soc/sh/fsi-hdmi.c                            |   13 +-
6418  sound/soc/sh/fsi.c                                 |   36 +-
6419  sound/soc/sh/hac.c                                 |   14 +-
6420  sound/soc/sh/siu_dai.c                             |   15 +-
6421  sound/soc/sh/ssi.c                                 |   14 +-
6422  sound/soc/soc-cache.c                              |  765 -----
6423  sound/soc/soc-core.c                               |   62 +-
6424  sound/soc/soc-dapm.c                               |   87 +
6425  sound/soc/soc-pcm.c                                |   18 +-
6426  sound/soc/tegra/tegra_das.c                        |   66 +-
6427  sound/soc/tegra/tegra_i2s.c                        |  164 +-
6428  sound/soc/tegra/tegra_i2s.h                        |    1 +
6429  sound/soc/tegra/tegra_pcm.c                        |   13 +-
6430  sound/soc/tegra/tegra_spdif.c                      |   14 +-
6431  sound/soc/tegra/tegra_wm8903.c                     |   66 +-
6432  sound/soc/tegra/trimslice.c                        |   40 +-
6433  sound/soc/txx9/txx9aclc-ac97.c                     |   13 +-
6434  sound/soc/txx9/txx9aclc.c                          |   12 +-
6435  sound/sparc/cs4231.c                               |   13 +-
6436  sound/sparc/dbri.c                                 |   14 +-
6437  sound/usb/quirks-table.h                           |   10 +
6438  282 files changed, 12585 insertions(+), 14238 deletions(-)
6439  create mode 100644 Documentation/devicetree/bindings/sound/tegra20-das.txt
6440  create mode 100644 Documentation/devicetree/bindings/sound/tegra20-i2s.txt
6441  create mode 100644 Documentation/devicetree/bindings/sound/wm8903.txt
6442  create mode 100644 Documentation/devicetree/bindings/sound/wm8994.txt
6443  create mode 100644 drivers/base/regmap/regmap-irq.c
6444  create mode 100644 drivers/mfd/wm8994-regmap.c
6445  create mode 100644 drivers/mfd/wm8994.h
6446  delete mode 100644 include/linux/sigma.h
6447  create mode 100644 include/sound/sta32x.h
6448  delete mode 100644 sound/pci/hda/alc262_quirks.c
6449  create mode 100644 sound/soc/codecs/alc5632.c
6450  create mode 100644 sound/soc/codecs/alc5632.h
6451  create mode 100644 sound/soc/codecs/cs42l73.c
6452  create mode 100644 sound/soc/codecs/cs42l73.h
6453  rename drivers/firmware/sigma.c => sound/soc/codecs/sigmadsp.c (53%)
6454  create mode 100644 sound/soc/codecs/sigmadsp.h
6455  delete mode 100644 sound/soc/codecs/wm8994-tables.c
6456  create mode 100644 sound/soc/omap/omap-dmic.c
6457  create mode 100644 sound/soc/omap/omap-dmic.h
6458  create mode 100644 sound/soc/samsung/littlemill.c
6459  create mode 100644 sound/soc/samsung/lowland.c
6460  rename sound/soc/samsung/{speyside_wm8962.c => tobermory.c} (69%)
6461 Merging sound-asoc/for-next (00c6516 ASoC: Staticise mfld_msic_dailink)
6462 $ git merge sound-asoc/for-next
6463 Merge made by the 'recursive' strategy.
6464  drivers/mfd/wm8994-core.c        |   14 ++++++++++++++
6465  sound/soc/codecs/wm8993.c        |   29 +++--------------------------
6466  sound/soc/codecs/wm8995.c        |    1 +
6467  sound/soc/codecs/wm8996.c        |   18 ++++++++++++------
6468  sound/soc/codecs/wm9081.c        |    1 -
6469  sound/soc/codecs/wm9090.c        |   13 +------------
6470  sound/soc/mid-x86/mfld_machine.c |    2 +-
6471  sound/soc/mid-x86/sst_platform.c |    4 ++--
6472  sound/soc/samsung/idma.c         |    2 +-
6473  sound/soc/samsung/pcm.c          |   12 ++++++------
6474  sound/soc/sh/fsi.c               |    4 ----
6475  sound/soc/sh/sh7760-ac97.c       |    4 ----
6476  sound/soc/sh/siu_dai.c           |    6 ------
6477  13 files changed, 41 insertions(+), 69 deletions(-)
6478 Merging cpufreq/next (21f2e3c [CPUFREQ] Remove wall variable from cpufreq_gov_dbs_init())
6479 $ git merge cpufreq/next
6480 Removing arch/arm/plat-omap/cpu-omap.c
6481 Auto-merging arch/arm/plat-omap/Makefile
6482 Merge made by the 'recursive' strategy.
6483  arch/arm/plat-omap/Makefile          |    1 -
6484  arch/arm/plat-omap/cpu-omap.c        |  171 -----------------
6485  drivers/cpufreq/Makefile             |    1 +
6486  drivers/cpufreq/cpufreq_ondemand.c   |    3 +-
6487  drivers/cpufreq/exynos4210-cpufreq.c |  340 +++++++++++-----------------------
6488  drivers/cpufreq/omap-cpufreq.c       |  274 +++++++++++++++++++++++++++
6489  drivers/cpufreq/s3c64xx-cpufreq.c    |   35 +++--
6490  7 files changed, 403 insertions(+), 422 deletions(-)
6491  delete mode 100644 arch/arm/plat-omap/cpu-omap.c
6492  create mode 100644 drivers/cpufreq/omap-cpufreq.c
6493 Merging quilt/rr (2570633 kernel/params: replace DEBUGP with pr_debug)
6494 $ git merge quilt/rr
6495 Auto-merging tools/lguest/lguest.c
6496 Auto-merging drivers/net/virtio_net.c
6497 Merge made by the 'recursive' strategy.
6498  drivers/block/virtio_blk.c                         |    2 +-
6499  drivers/char/hw_random/virtio-rng.c                |    2 +-
6500  drivers/char/virtio_console.c                      |    6 +-
6501  drivers/lguest/Makefile                            |    2 +-
6502  drivers/lguest/segments.c                          |   28 ++-
6503  drivers/net/virtio_net.c                           |   12 +-
6504  drivers/virtio/virtio_balloon.c                    |   13 +-
6505  drivers/virtio/virtio_ring.c                       |  213 +++++++++++++++++--
6506  include/linux/virtio.h                             |   70 +------
6507  kernel/module.c                                    |  104 ++++------
6508  kernel/params.c                                    |   14 +-
6509  net/9p/trans_virtio.c                              |    6 +-
6510  {Documentation/virtual => tools}/lguest/.gitignore |    0
6511  {Documentation/virtual => tools}/lguest/Makefile   |    0
6512  {Documentation/virtual => tools}/lguest/extract    |    0
6513  {Documentation/virtual => tools}/lguest/lguest.c   |    2 +-
6514  {Documentation/virtual => tools}/lguest/lguest.txt |    0
6515  tools/virtio/linux/virtio.h                        |   21 +--
6516  tools/virtio/virtio_test.c                         |    3 +-
6517  19 files changed, 294 insertions(+), 204 deletions(-)
6518  rename {Documentation/virtual => tools}/lguest/.gitignore (100%)
6519  rename {Documentation/virtual => tools}/lguest/Makefile (100%)
6520  rename {Documentation/virtual => tools}/lguest/extract (100%)
6521  rename {Documentation/virtual => tools}/lguest/lguest.c (99%)
6522  rename {Documentation/virtual => tools}/lguest/lguest.txt (100%)
6523 Merging input/next (246835f Input: wacom - add LED support for Cintiq 24HD)
6524 $ git merge input/next
6525 Resolved 'drivers/input/keyboard/samsung-keypad.c' using previous resolution.
6526 Auto-merging drivers/input/tablet/wacom_wac.c
6527 Auto-merging drivers/input/mouse/synaptics.c
6528 Auto-merging drivers/input/keyboard/samsung-keypad.c
6529 CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c
6530 Automatic merge failed; fix conflicts and then commit the result.
6531 $ git commit -v -a
6532 [master c770dec] Merge remote-tracking branch 'input/next'
6533 $ git diff -M --stat --summary HEAD^..
6534  Documentation/ABI/testing/sysfs-driver-wacom |   17 +-
6535  Documentation/input/alps.txt                 |  188 +++++
6536  Documentation/input/gpio-tilt.txt            |  103 +++
6537  arch/arm/plat-samsung/include/plat/keypad.h  |   27 +-
6538  drivers/input/input-polldev.c                |    8 +-
6539  drivers/input/keyboard/Kconfig               |   21 +-
6540  drivers/input/keyboard/Makefile              |    1 +
6541  drivers/input/keyboard/adp5520-keys.c        |   13 +-
6542  drivers/input/keyboard/amikbd.c              |   15 +-
6543  drivers/input/keyboard/atkbd.c               |   40 +-
6544  drivers/input/keyboard/bf54x-keys.c          |   16 +-
6545  drivers/input/keyboard/davinci_keyscan.c     |   13 +-
6546  drivers/input/keyboard/ep93xx_keypad.c       |   14 +-
6547  drivers/input/keyboard/gpio_keys_polled.c    |   14 +-
6548  drivers/input/keyboard/imx_keypad.c          |   14 +-
6549  drivers/input/keyboard/jornada680_kbd.c      |   14 +-
6550  drivers/input/keyboard/jornada720_kbd.c      |   14 +-
6551  drivers/input/keyboard/lm8323.c              |   11 +-
6552  drivers/input/keyboard/matrix_keypad.c       |   14 +-
6553  drivers/input/keyboard/nomadik-ske-keypad.c  |   15 +-
6554  drivers/input/keyboard/omap-keypad.c         |   15 +-
6555  drivers/input/keyboard/omap4-keypad.c        |   13 +-
6556  drivers/input/keyboard/opencores-kbd.c       |   13 +-
6557  drivers/input/keyboard/pmic8xxx-keypad.c     |   13 +-
6558  drivers/input/keyboard/pxa27x_keypad.c       |   14 +-
6559  drivers/input/keyboard/pxa930_rotary.c       |   13 +-
6560  drivers/input/keyboard/samsung-keypad.c      |   28 +-
6561  drivers/input/keyboard/sh_keysc.c            |   14 +-
6562  drivers/input/keyboard/spear-keyboard.c      |   13 +-
6563  drivers/input/keyboard/stmpe-keypad.c        |   13 +-
6564  drivers/input/keyboard/tc3589x-keypad.c      |   13 +-
6565  drivers/input/keyboard/tca8418_keypad.c      |  430 +++++++++++
6566  drivers/input/keyboard/tegra-kbc.c           |   13 +-
6567  drivers/input/keyboard/tnetv107x-keypad.c    |   14 +-
6568  drivers/input/keyboard/twl4030_keypad.c      |   13 +-
6569  drivers/input/keyboard/w90p910_keypad.c      |   14 +-
6570  drivers/input/misc/88pm860x_onkey.c          |   13 +-
6571  drivers/input/misc/Kconfig                   |   25 +
6572  drivers/input/misc/Makefile                  |    2 +
6573  drivers/input/misc/ab8500-ponkey.c           |   13 +-
6574  drivers/input/misc/adxl34x-spi.c             |    1 -
6575  drivers/input/misc/adxl34x.c                 |   16 +-
6576  drivers/input/misc/ati_remote2.c             |   19 +-
6577  drivers/input/misc/bfin_rotary.c             |   13 +-
6578  drivers/input/misc/cobalt_btns.c             |   14 +-
6579  drivers/input/misc/dm355evm_keys.c           |   13 +-
6580  drivers/input/misc/gp2ap002a00f.c            |  299 ++++++++
6581  drivers/input/misc/gpio_tilt_polled.c        |  213 ++++++
6582  drivers/input/misc/ixp4xx-beeper.c           |   13 +-
6583  drivers/input/misc/max8925_onkey.c           |   13 +-
6584  drivers/input/misc/mc13783-pwrbutton.c       |   14 +-
6585  drivers/input/misc/pcap_keys.c               |   14 +-
6586  drivers/input/misc/pcf50633-input.c          |   13 +-
6587  drivers/input/misc/pcspkr.c                  |   14 +-
6588  drivers/input/misc/pm8xxx-vibrator.c         |   13 +-
6589  drivers/input/misc/pmic8xxx-pwrkey.c         |   13 +-
6590  drivers/input/misc/pwm-beeper.c              |   13 +-
6591  drivers/input/misc/rb532_button.c            |   14 +-
6592  drivers/input/misc/rotary_encoder.c          |   14 +-
6593  drivers/input/misc/sgi_btns.c                |   13 +-
6594  drivers/input/misc/twl4030-pwrbutton.c       |   15 +-
6595  drivers/input/misc/twl4030-vibra.c           |   14 +-
6596  drivers/input/misc/twl6040-vibra.c           |   13 +-
6597  drivers/input/misc/wm831x-on.c               |   13 +-
6598  drivers/input/mouse/alps.c                   | 1036 ++++++++++++++++++++++++--
6599  drivers/input/mouse/alps.h                   |   19 +
6600  drivers/input/mouse/amimouse.c               |   16 +-
6601  drivers/input/mouse/elantech.c               |   80 ++-
6602  drivers/input/mouse/elantech.h               |    2 +
6603  drivers/input/mouse/gpio_mouse.c             |   13 +-
6604  drivers/input/mouse/hgpk.c                   |   18 +-
6605  drivers/input/mouse/logips2pp.c              |    9 +-
6606  drivers/input/mouse/psmouse-base.c           |   36 +-
6607  drivers/input/mouse/psmouse.h                |    3 +
6608  drivers/input/mouse/pxa930_trkball.c         |   14 +-
6609  drivers/input/mouse/sentelic.c               |   43 +-
6610  drivers/input/mouse/synaptics.c              |  197 ++++--
6611  drivers/input/mouse/synaptics.h              |    5 +
6612  drivers/input/mouse/trackpoint.c             |   17 +-
6613  drivers/input/serio/altera_ps2.c             |   13 +-
6614  drivers/input/serio/at32psif.c               |   14 +-
6615  drivers/input/serio/i8042.c                  |   23 +-
6616  drivers/input/serio/rpckbd.c                 |   14 +-
6617  drivers/input/serio/xilinx_ps2.c             |   14 +-
6618  drivers/input/tablet/aiptek.c                |   34 +-
6619  drivers/input/tablet/wacom_sys.c             |  101 +++-
6620  drivers/input/tablet/wacom_wac.c             |  187 +++++-
6621  drivers/input/tablet/wacom_wac.h             |    5 +-
6622  drivers/input/touchscreen/88pm860x-ts.c      |   13 +-
6623  drivers/input/touchscreen/Kconfig            |   16 +
6624  drivers/input/touchscreen/Makefile           |    1 +
6625  drivers/input/touchscreen/ad7877.c           |   17 +-
6626  drivers/input/touchscreen/ad7879-i2c.c       |   31 +-
6627  drivers/input/touchscreen/ad7879-spi.c       |   27 +-
6628  drivers/input/touchscreen/ad7879.c           |   23 +-
6629  drivers/input/touchscreen/ad7879.h           |    4 +-
6630  drivers/input/touchscreen/ads7846.c          |    9 +-
6631  drivers/input/touchscreen/atmel-wm97xx.c     |   13 +-
6632  drivers/input/touchscreen/atmel_tsadcc.c     |   15 +-
6633  drivers/input/touchscreen/da9034-ts.c        |   13 +-
6634  drivers/input/touchscreen/egalax_ts.c        |  303 ++++++++
6635  drivers/input/touchscreen/htcpen.c           |    7 +-
6636  drivers/input/touchscreen/intel-mid-touch.c  |   13 +-
6637  drivers/input/touchscreen/jornada720_ts.c    |   14 +-
6638  drivers/input/touchscreen/lpc32xx_ts.c       |   13 +-
6639  drivers/input/touchscreen/mainstone-wm97xx.c |   14 +-
6640  drivers/input/touchscreen/mc13783_ts.c       |   13 +-
6641  drivers/input/touchscreen/migor_ts.c         |  117 ++--
6642  drivers/input/touchscreen/pcap_ts.c          |   14 +-
6643  drivers/input/touchscreen/s3c2410_ts.c       |   14 +-
6644  drivers/input/touchscreen/stmpe-ts.c         |   15 +-
6645  drivers/input/touchscreen/tnetv107x-ts.c     |   14 +-
6646  drivers/input/touchscreen/tps6507x-ts.c      |   13 +-
6647  drivers/input/touchscreen/ucb1400_ts.c       |   14 +-
6648  drivers/input/touchscreen/usbtouchscreen.c   |   36 +
6649  drivers/input/touchscreen/w90p910_ts.c       |   14 +-
6650  drivers/input/touchscreen/wm831x-ts.c        |   13 +-
6651  drivers/input/touchscreen/zylonite-wm97xx.c  |   14 +-
6652  include/linux/input/gp2ap002a00f.h           |   22 +
6653  include/linux/input/gpio_tilt.h              |   73 ++
6654  include/linux/input/samsung-keypad.h         |   43 ++
6655  include/linux/input/tca8418_keypad.h         |   44 ++
6656  122 files changed, 3636 insertions(+), 1371 deletions(-)
6657  create mode 100644 Documentation/input/alps.txt
6658  create mode 100644 Documentation/input/gpio-tilt.txt
6659  create mode 100644 drivers/input/keyboard/tca8418_keypad.c
6660  create mode 100644 drivers/input/misc/gp2ap002a00f.c
6661  create mode 100644 drivers/input/misc/gpio_tilt_polled.c
6662  create mode 100644 drivers/input/touchscreen/egalax_ts.c
6663  create mode 100644 include/linux/input/gp2ap002a00f.h
6664  create mode 100644 include/linux/input/gpio_tilt.h
6665  create mode 100644 include/linux/input/samsung-keypad.h
6666  create mode 100644 include/linux/input/tca8418_keypad.h
6667 Merging input-mt/next (02f8c6a Linux 3.0)
6668 $ git merge input-mt/next
6669 Already up-to-date.
6670 Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.)
6671 $ git merge lsm/for-next
6672 Already up-to-date.
6673 Merging block/for-next (954adda Merge branch 'for-3.3/core' into for-next)
6674 $ git merge block/for-next
6675 Merge made by the 'recursive' strategy.
6676  block/blk-cgroup.c                |   11 +-
6677  block/blk-core.c                  |  217 ++-
6678  block/blk-exec.c                  |    8 +-
6679  block/blk-ioc.c                   |  480 ++++-
6680  block/blk-sysfs.c                 |   12 +-
6681  block/blk-throttle.c              |    4 +-
6682  block/blk.h                       |   58 +-
6683  block/bsg.c                       |    4 +-
6684  block/cfq-iosched.c               |  612 ++-----
6685  block/deadline-iosched.c          |    4 +-
6686  block/elevator.c                  |  217 ++--
6687  block/genhd.c                     |    2 +-
6688  block/noop-iosched.c              |    4 +-
6689  drivers/block/Kconfig             |    2 +
6690  drivers/block/Makefile            |    1 +
6691  drivers/block/cciss.c             |    6 +-
6692  drivers/block/loop.c              |    4 +-
6693  drivers/block/mtip32xx/Kconfig    |    9 +
6694  drivers/block/mtip32xx/Makefile   |    5 +
6695  drivers/block/mtip32xx/mtip32xx.c | 3627 +++++++++++++++++++++++++++++++++++++
6696  drivers/block/mtip32xx/mtip32xx.h |  422 +++++
6697  drivers/block/sx8.c               |   12 +-
6698  drivers/scsi/scsi_scan.c          |    2 +-
6699  fs/ioprio.c                       |   24 +-
6700  include/linux/blkdev.h            |   26 +-
6701  include/linux/elevator.h          |   41 +-
6702  include/linux/iocontext.h         |  136 +-
6703  kernel/fork.c                     |    8 +-
6704  28 files changed, 5044 insertions(+), 914 deletions(-)
6705  create mode 100644 drivers/block/mtip32xx/Kconfig
6706  create mode 100644 drivers/block/mtip32xx/Makefile
6707  create mode 100644 drivers/block/mtip32xx/mtip32xx.c
6708  create mode 100644 drivers/block/mtip32xx/mtip32xx.h
6709 $ git reset --hard HEAD^
6710 HEAD is now at c770dec Merge remote-tracking branch 'input/next'
6711 Merging refs/next/20111215/block
6712 $ git merge refs/next/20111215/block
6713 Merge made by the 'recursive' strategy.
6714  block/blk-core.c                  |   14 +-
6715  block/cfq-iosched.c               |   16 +-
6716  drivers/block/Kconfig             |    2 +
6717  drivers/block/Makefile            |    1 +
6718  drivers/block/cciss.c             |    6 +-
6719  drivers/block/loop.c              |    4 +-
6720  drivers/block/mtip32xx/Kconfig    |    9 +
6721  drivers/block/mtip32xx/Makefile   |    5 +
6722  drivers/block/mtip32xx/mtip32xx.c | 3627 +++++++++++++++++++++++++++++++++++++
6723  drivers/block/mtip32xx/mtip32xx.h |  422 +++++
6724  include/linux/blkdev.h            |    3 -
6725  11 files changed, 4089 insertions(+), 20 deletions(-)
6726  create mode 100644 drivers/block/mtip32xx/Kconfig
6727  create mode 100644 drivers/block/mtip32xx/Makefile
6728  create mode 100644 drivers/block/mtip32xx/mtip32xx.c
6729  create mode 100644 drivers/block/mtip32xx/mtip32xx.h
6730 Merging quilt/device-mapper (94956ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
6731 $ git merge quilt/device-mapper
6732 Already up-to-date.
6733 Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
6734 $ git merge embedded/master
6735 Already up-to-date.
6736 Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
6737 $ git merge firmware/master
6738 Already up-to-date.
6739 Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning)
6740 $ git merge pcmcia/master
6741 Already up-to-date.
6742 Merging battery/master (00a159a max8925_power: Check at probe time if power to set online)
6743 $ git merge battery/master
6744 Auto-merging drivers/power/power_supply_sysfs.c
6745 Auto-merging drivers/power/max8998_charger.c
6746 Auto-merging drivers/power/max8997_charger.c
6747 Auto-merging drivers/power/max8903_charger.c
6748 Auto-merging drivers/power/max17042_battery.c
6749 Auto-merging drivers/power/ds2780_battery.c
6750 Merge made by the 'recursive' strategy.
6751  .../bindings/power_supply/olpc_battery.txt         |    5 +
6752  .../bindings/power_supply/ti_bq20z75.txt           |   23 +++
6753  drivers/mfd/max8925-core.c                         |   15 --
6754  drivers/power/bq20z75.c                            |   77 +++++++
6755  drivers/power/bq27x00_battery.c                    |  210 +++++++++++++-------
6756  drivers/power/collie_battery.c                     |   53 ++----
6757  drivers/power/ds2760_battery.c                     |    6 +-
6758  drivers/power/ds2780_battery.c                     |    2 +-
6759  drivers/power/max17042_battery.c                   |   94 ++++++---
6760  drivers/power/max8903_charger.c                    |    2 +-
6761  drivers/power/max8925_power.c                      |   63 ++++---
6762  drivers/power/max8997_charger.c                    |    3 +-
6763  drivers/power/max8998_charger.c                    |    2 +
6764  drivers/power/olpc_battery.c                       |   81 +++++---
6765  drivers/power/pda_power.c                          |   74 ++++++-
6766  drivers/power/power_supply_sysfs.c                 |    4 +-
6767  drivers/power/tosa_battery.c                       |   66 ++-----
6768  drivers/power/wm831x_power.c                       |   44 +++--
6769  drivers/power/wm97xx_battery.c                     |    2 +-
6770  drivers/power/z2_battery.c                         |    4 +-
6771  include/linux/mfd/max8925.h                        |    7 +-
6772  include/linux/pda_power.h                          |    2 +
6773  22 files changed, 542 insertions(+), 297 deletions(-)
6774  create mode 100644 Documentation/devicetree/bindings/power_supply/olpc_battery.txt
6775  create mode 100644 Documentation/devicetree/bindings/power_supply/ti_bq20z75.txt
6776 Merging mmc/mmc-next (ed94591 mmc: core: Fixup delayed work clock gating patch)
6777 $ git merge mmc/mmc-next
6778 Resolved 'drivers/mmc/card/block.c' using previous resolution.
6779 Auto-merging include/linux/mmc/card.h
6780 Auto-merging drivers/mmc/host/sh_mmcif.c
6781 Auto-merging drivers/mmc/host/sdhci-s3c.c
6782 Auto-merging drivers/mmc/host/sdhci-cns3xxx.c
6783 Auto-merging drivers/mmc/host/mxs-mmc.c
6784 Auto-merging drivers/mmc/host/mxcmmc.c
6785 Auto-merging drivers/mmc/host/mmci.c
6786 Auto-merging drivers/mmc/host/at91_mci.c
6787 Auto-merging drivers/mmc/core/mmc.c
6788 Auto-merging drivers/mmc/core/core.c
6789 Auto-merging drivers/mmc/card/block.c
6790 CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
6791 Auto-merging arch/arm/plat-samsung/include/plat/sdhci.h
6792 Automatic merge failed; fix conflicts and then commit the result.
6793 $ git commit -v -a
6794 [master 75a671b] Merge remote-tracking branch 'mmc/mmc-next'
6795 $ git diff -M --stat --summary HEAD^..
6796  Documentation/mmc/mmc-dev-attrs.txt        |   10 +
6797  Documentation/mmc/mmc-dev-parts.txt        |   13 +
6798  arch/arm/plat-samsung/include/plat/sdhci.h |    1 +
6799  arch/arm/plat-samsung/platformdata.c       |    2 +
6800  drivers/mmc/card/block.c                   |  230 ++++++++++++++-----
6801  drivers/mmc/card/mmc_test.c                |    1 +
6802  drivers/mmc/core/bus.c                     |    2 +-
6803  drivers/mmc/core/core.c                    |   51 ++++-
6804  drivers/mmc/core/core.h                    |    3 +
6805  drivers/mmc/core/debugfs.c                 |    2 +
6806  drivers/mmc/core/host.c                    |   53 ++++-
6807  drivers/mmc/core/mmc.c                     |   26 ++-
6808  drivers/mmc/core/sd.c                      |   18 ++-
6809  drivers/mmc/core/sdio.c                    |  340 +++++++++++++++++++++++++--
6810  drivers/mmc/core/sdio_io.c                 |    8 +-
6811  drivers/mmc/core/sdio_ops.c                |   14 +-
6812  drivers/mmc/host/at91_mci.c                |    8 +-
6813  drivers/mmc/host/bfin_sdh.c                |   12 +-
6814  drivers/mmc/host/cb710-mmc.c               |   13 +-
6815  drivers/mmc/host/jz4740_mmc.c              |   12 +-
6816  drivers/mmc/host/mmc_spi.c                 |    1 -
6817  drivers/mmc/host/mmci.c                    |    1 +
6818  drivers/mmc/host/msm_sdcc.c                |   19 +--
6819  drivers/mmc/host/mxcmmc.c                  |   13 +-
6820  drivers/mmc/host/mxs-mmc.c                 |   13 +-
6821  drivers/mmc/host/pxamci.c                  |   13 +-
6822  drivers/mmc/host/s3cmci.c                  |   13 +-
6823  drivers/mmc/host/sdhci-cns3xxx.c           |   17 +--
6824  drivers/mmc/host/sdhci-dove.c              |   17 +--
6825  drivers/mmc/host/sdhci-esdhc-imx.c         |   17 +--
6826  drivers/mmc/host/sdhci-esdhc.h             |    2 +-
6827  drivers/mmc/host/sdhci-of-esdhc.c          |   17 +--
6828  drivers/mmc/host/sdhci-of-hlwd.c           |   17 +--
6829  drivers/mmc/host/sdhci-pci.c               |   64 +++---
6830  drivers/mmc/host/sdhci-pltfm.c             |   18 +-
6831  drivers/mmc/host/sdhci-pltfm.h             |    6 +-
6832  drivers/mmc/host/sdhci-pxav2.c             |   17 +--
6833  drivers/mmc/host/sdhci-pxav3.c             |   17 +--
6834  drivers/mmc/host/sdhci-s3c.c               |   37 ++--
6835  drivers/mmc/host/sdhci-spear.c             |   52 ++++-
6836  drivers/mmc/host/sdhci-tegra.c             |   17 +--
6837  drivers/mmc/host/sdhci.c                   |   16 +-
6838  drivers/mmc/host/sdhci.h                   |    2 +-
6839  drivers/mmc/host/sh_mmcif.c                |   17 +--
6840  drivers/mmc/host/sh_mobile_sdhi.c          |   13 +-
6841  drivers/mmc/host/tifm_sd.c                 |   16 +-
6842  drivers/mmc/host/tmio_mmc.c                |   14 +-
6843  drivers/mmc/host/tmio_mmc.h                |    4 +-
6844  include/linux/amba/mmci.h                  |    2 +
6845  include/linux/mmc/card.h                   |   20 ++-
6846  include/linux/mmc/core.h                   |    2 +
6847  include/linux/mmc/host.h                   |    7 +-
6848  include/linux/mmc/mmc.h                    |    6 +
6849  include/linux/mmc/sdio.h                   |   29 +++-
6850  54 files changed, 896 insertions(+), 459 deletions(-)
6851 Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack())
6852 $ git merge kgdb/kgdb-next
6853 Merge made by the 'recursive' strategy.
6854 Merging slab/for-next (a1450d6 Merge branch 'slab/urgent' into for-next)
6855 $ git merge slab/for-next
6856 Merge made by the 'recursive' strategy.
6857  Documentation/kernel-parameters.txt |    6 +++
6858  Documentation/vm/slub.txt           |    2 +-
6859  mm/slab.c                           |   39 ++++++++++++------
6860  mm/slub.c                           |   75 +++++++++++++++++++++-------------
6861  4 files changed, 80 insertions(+), 42 deletions(-)
6862 Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
6863 $ git merge uclinux/for-next
6864 Already up-to-date.
6865 Merging md/for-next (91a2f19 md/raid1: Mark device replaceable when we see a write error.)
6866 $ git merge md/for-next
6867 Merge made by the 'recursive' strategy.
6868  Documentation/md.txt      |   22 ++-
6869  drivers/md/bitmap.c       |    2 +-
6870  drivers/md/md.c           |   97 ++++++--
6871  drivers/md/md.h           |   82 ++++---
6872  drivers/md/multipath.c    |    7 +-
6873  drivers/md/raid1.c        |  171 ++++++++++----
6874  drivers/md/raid1.h        |    7 +-
6875  drivers/md/raid10.c       |  580 ++++++++++++++++++++++++++++++++++++---------
6876  drivers/md/raid10.h       |   61 +++--
6877  drivers/md/raid5.c        |  570 +++++++++++++++++++++++++++++++++-----------
6878  drivers/md/raid5.h        |   98 +++++----
6879  include/linux/raid/md_p.h |    7 +-
6880  include/linux/raid/pq.h   |    2 +-
6881  13 files changed, 1272 insertions(+), 434 deletions(-)
6882 Merging mfd/for-next (0b34804 mfd: Add device tree probe support for mc13xxx)
6883 $ git merge mfd/for-next
6884 Auto-merging drivers/mfd/Kconfig
6885 Auto-merging arch/arm/mach-sa1100/simpad.c
6886 Auto-merging arch/arm/mach-sa1100/shannon.c
6887 Auto-merging arch/arm/mach-sa1100/lart.c
6888 Auto-merging arch/arm/mach-sa1100/generic.c
6889 Auto-merging arch/arm/mach-sa1100/collie.c
6890 Auto-merging arch/arm/mach-sa1100/cerf.c
6891 Auto-merging arch/arm/mach-sa1100/assabet.c
6892 Merge made by the 'recursive' strategy.
6893  Documentation/devicetree/bindings/mfd/mc13xxx.txt |   53 ++
6894  arch/arm/mach-sa1100/assabet.c                    |   12 +
6895  arch/arm/mach-sa1100/cerf.c                       |   11 +
6896  arch/arm/mach-sa1100/collie.c                     |   18 +-
6897  arch/arm/mach-sa1100/generic.c                    |    7 +-
6898  arch/arm/mach-sa1100/include/mach/mcp.h           |    2 +
6899  arch/arm/mach-sa1100/lart.c                       |   10 +
6900  arch/arm/mach-sa1100/shannon.c                    |   11 +
6901  arch/arm/mach-sa1100/simpad.c                     |   18 +-
6902  drivers/mfd/88pm860x-i2c.c                        |  240 +++++----
6903  drivers/mfd/Kconfig                               |    1 +
6904  drivers/mfd/intel_msic.c                          |   12 +-
6905  drivers/mfd/jz4740-adc.c                          |   12 +-
6906  drivers/mfd/mc13xxx-core.c                        |  111 +++--
6907  drivers/mfd/mcp-core.c                            |   44 ++-
6908  drivers/mfd/mcp-sa11x0.c                          |  182 ++++---
6909  drivers/mfd/pcf50633-adc.c                        |   12 +-
6910  drivers/mfd/stmpe.c                               |   36 +-
6911  drivers/mfd/t7l66xb.c                             |   16 +-
6912  drivers/mfd/tc6387xb.c                            |   14 +-
6913  drivers/mfd/ti-ssp.c                              |   12 +-
6914  drivers/mfd/tps65910.c                            |    2 +-
6915  drivers/mfd/tps65912-spi.c                        |    1 -
6916  drivers/mfd/twl4030-audio.c                       |   12 +-
6917  drivers/mfd/twl4030-irq.c                         |   21 +-
6918  drivers/mfd/twl4030-madc.c                        |   14 +-
6919  drivers/mfd/twl6040-core.c                        |   13 +-
6920  drivers/mfd/ucb1x00-core.c                        |   48 ++-
6921  drivers/mfd/ucb1x00-ts.c                          |    2 +-
6922  drivers/mfd/wm831x-core.c                         |    2 -
6923  drivers/mfd/wm831x-i2c.c                          |    3 +-
6924  drivers/mfd/wm831x-spi.c                          |    4 +-
6925  drivers/mfd/wm8350-core.c                         |    2 +
6926  drivers/mfd/wm8350-i2c.c                          |    4 +-
6927  drivers/misc/Kconfig                              |    8 +
6928  drivers/misc/Makefile                             |    1 +
6929  drivers/misc/max8997-muic.c                       |  634 +++++++++++++++++++++
6930  include/linux/mfd/88pm860x.h                      |    3 +-
6931  include/linux/mfd/max8997.h                       |   58 ++-
6932  include/linux/mfd/mc13xxx.h                       |    8 +
6933  include/linux/mfd/mcp.h                           |    7 +-
6934  include/linux/mfd/stmpe.h                         |    7 +
6935  include/linux/mfd/ucb1x00.h                       |    5 +-
6936  include/linux/mod_devicetable.h                   |   11 +
6937  scripts/mod/file2alias.c                          |   13 +
6938  45 files changed, 1353 insertions(+), 364 deletions(-)
6939  create mode 100644 Documentation/devicetree/bindings/mfd/mc13xxx.txt
6940  create mode 100644 drivers/misc/max8997-muic.c
6941 Merging hdlc/hdlc-next (4a6908a Linux 2.6.28)
6942 $ git merge hdlc/hdlc-next
6943 Already up-to-date.
6944 Merging drm/drm-next (32faa34 drm/Merge branch 'drm-ttm-glisse' of ../drm-radeon-next into drm-core-next)
6945 $ git merge drm/drm-next
6946 Resolved 'drivers/gpu/drm/nouveau/nouveau_sgdma.c' using previous resolution.
6947 Auto-merging include/drm/drm_mode.h
6948 Auto-merging include/drm/drmP.h
6949 Auto-merging drivers/xen/swiotlb-xen.c
6950 Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
6951 Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
6952 Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
6953 Auto-merging drivers/gpu/drm/radeon/radeon_device.c
6954 Auto-merging drivers/gpu/drm/radeon/radeon.h
6955 Auto-merging drivers/gpu/drm/nouveau/nouveau_sgdma.c
6956 CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_sgdma.c
6957 Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c
6958 Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h
6959 Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.c
6960 Auto-merging drivers/gpu/drm/nouveau/nouveau_display.c
6961 Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c
6962 Auto-merging drivers/gpu/drm/i915/intel_display.c
6963 Auto-merging drivers/gpu/drm/i915/i915_drv.c
6964 Auto-merging drivers/gpu/drm/drm_drv.c
6965 Auto-merging drivers/gpu/drm/drm_crtc_helper.c
6966 Auto-merging drivers/gpu/drm/drm_crtc.c
6967 Auto-merging drivers/gpu/drm/Kconfig
6968 Automatic merge failed; fix conflicts and then commit the result.
6969 $ git commit -v -a
6970 [master 14aad7e] Merge remote-tracking branch 'drm/drm-next'
6971 $ git diff -M --stat --summary HEAD^..
6972  drivers/gpu/drm/Kconfig                      |    3 +
6973  drivers/gpu/drm/Makefile                     |    1 +
6974  drivers/gpu/drm/drm_crtc.c                   |  441 ++++++++-
6975  drivers/gpu/drm/drm_crtc_helper.c            |   10 +-
6976  drivers/gpu/drm/drm_drv.c                    |    4 +
6977  drivers/gpu/drm/drm_fb_helper.c              |    7 +
6978  drivers/gpu/drm/drm_fops.c                   |    2 +-
6979  drivers/gpu/drm/gma500/Kconfig               |   26 +
6980  drivers/gpu/drm/gma500/Makefile              |   39 +
6981  drivers/gpu/drm/gma500/accel_2d.c            |  364 +++++++
6982  drivers/gpu/drm/gma500/backlight.c           |   49 +
6983  drivers/gpu/drm/gma500/cdv_device.c          |  350 ++++++
6984  drivers/gpu/drm/gma500/cdv_device.h          |   36 +
6985  drivers/gpu/drm/gma500/cdv_intel_crt.c       |  326 ++++++
6986  drivers/gpu/drm/gma500/cdv_intel_display.c   | 1508 ++++++++++++++++++++++++++
6987  drivers/gpu/drm/gma500/cdv_intel_hdmi.c      |  376 +++++++
6988  drivers/gpu/drm/gma500/cdv_intel_lvds.c      |  721 ++++++++++++
6989  drivers/gpu/drm/gma500/framebuffer.c         |  831 ++++++++++++++
6990  drivers/gpu/drm/gma500/framebuffer.h         |   47 +
6991  drivers/gpu/drm/gma500/gem.c                 |  292 +++++
6992  drivers/gpu/drm/gma500/gem_glue.c            |   89 ++
6993  drivers/gpu/drm/gma500/gem_glue.h            |    2 +
6994  drivers/gpu/drm/gma500/gtt.c                 |  553 ++++++++++
6995  drivers/gpu/drm/gma500/gtt.h                 |   64 ++
6996  drivers/gpu/drm/gma500/intel_bios.c          |  303 ++++++
6997  drivers/gpu/drm/gma500/intel_bios.h          |  430 ++++++++
6998  drivers/gpu/drm/gma500/intel_i2c.c           |  169 +++
6999  drivers/gpu/drm/gma500/intel_opregion.c      |   81 ++
7000  drivers/gpu/drm/gma500/mid_bios.c            |  249 +++++
7001  drivers/gpu/drm/gma500/mid_bios.h            |   21 +
7002  drivers/gpu/drm/gma500/mmu.c                 |  858 +++++++++++++++
7003  drivers/gpu/drm/gma500/oaktrail.h            |  252 +++++
7004  drivers/gpu/drm/gma500/oaktrail_crtc.c       |  604 +++++++++++
7005  drivers/gpu/drm/gma500/oaktrail_device.c     |  512 +++++++++
7006  drivers/gpu/drm/gma500/oaktrail_hdmi.c       |  852 +++++++++++++++
7007  drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c   |  328 ++++++
7008  drivers/gpu/drm/gma500/oaktrail_lvds.c       |  423 ++++++++
7009  drivers/gpu/drm/gma500/power.c               |  316 ++++++
7010  drivers/gpu/drm/gma500/power.h               |   67 ++
7011  drivers/gpu/drm/gma500/psb_device.c          |  321 ++++++
7012  drivers/gpu/drm/gma500/psb_drv.c             |  708 ++++++++++++
7013  drivers/gpu/drm/gma500/psb_drv.h             |  928 ++++++++++++++++
7014  drivers/gpu/drm/gma500/psb_intel_display.c   | 1431 ++++++++++++++++++++++++
7015  drivers/gpu/drm/gma500/psb_intel_display.h   |   28 +
7016  drivers/gpu/drm/gma500/psb_intel_drv.h       |  228 ++++
7017  drivers/gpu/drm/gma500/psb_intel_lvds.c      |  854 +++++++++++++++
7018  drivers/gpu/drm/gma500/psb_intel_modes.c     |   77 ++
7019  drivers/gpu/drm/gma500/psb_intel_reg.h       | 1235 +++++++++++++++++++++
7020  drivers/gpu/drm/gma500/psb_intel_sdvo.c      | 1293 ++++++++++++++++++++++
7021  drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h |  338 ++++++
7022  drivers/gpu/drm/gma500/psb_irq.c             |  564 ++++++++++
7023  drivers/gpu/drm/gma500/psb_irq.h             |   45 +
7024  drivers/gpu/drm/gma500/psb_lid.c             |   88 ++
7025  drivers/gpu/drm/gma500/psb_reg.h             |  582 ++++++++++
7026  drivers/gpu/drm/i810/i810_drv.c              |   23 +-
7027  drivers/gpu/drm/i915/i915_drv.c              |   31 +-
7028  drivers/gpu/drm/i915/intel_display.c         |   41 +-
7029  drivers/gpu/drm/i915/intel_drv.h             |    2 +-
7030  drivers/gpu/drm/i915/intel_fb.c              |   11 +-
7031  drivers/gpu/drm/mga/mga_drv.c                |   29 +-
7032  drivers/gpu/drm/nouveau/nouveau_bo.c         |   98 ++-
7033  drivers/gpu/drm/nouveau/nouveau_debugfs.c    |    1 +
7034  drivers/gpu/drm/nouveau/nouveau_display.c    |    6 +-
7035  drivers/gpu/drm/nouveau/nouveau_drv.c        |   31 +-
7036  drivers/gpu/drm/nouveau/nouveau_drv.h        |    5 +-
7037  drivers/gpu/drm/nouveau/nouveau_fb.h         |    2 +-
7038  drivers/gpu/drm/nouveau/nouveau_fbcon.c      |   13 +-
7039  drivers/gpu/drm/nouveau/nouveau_mem.c        |    6 +
7040  drivers/gpu/drm/nouveau/nouveau_sgdma.c      |  179 +---
7041  drivers/gpu/drm/r128/r128_drv.c              |   30 +-
7042  drivers/gpu/drm/radeon/radeon.h              |    1 -
7043  drivers/gpu/drm/radeon/radeon_device.c       |    6 +
7044  drivers/gpu/drm/radeon/radeon_display.c      |    8 +-
7045  drivers/gpu/drm/radeon/radeon_drv.c          |   60 +-
7046  drivers/gpu/drm/radeon/radeon_fb.c           |   20 +-
7047  drivers/gpu/drm/radeon/radeon_gart.c         |   29 +-
7048  drivers/gpu/drm/radeon/radeon_mode.h         |    2 +-
7049  drivers/gpu/drm/radeon/radeon_object.c       |    8 +-
7050  drivers/gpu/drm/radeon/radeon_ttm.c          |  302 +++---
7051  drivers/gpu/drm/savage/savage_drv.c          |   23 +-
7052  drivers/gpu/drm/sis/sis_drv.c                |   23 +-
7053  drivers/gpu/drm/tdfx/tdfx_drv.c              |   23 +-
7054  drivers/gpu/drm/ttm/Makefile                 |    4 +
7055  drivers/gpu/drm/ttm/ttm_agp_backend.c        |   88 +-
7056  drivers/gpu/drm/ttm/ttm_bo.c                 |   90 +-
7057  drivers/gpu/drm/ttm/ttm_bo_util.c            |   32 +-
7058  drivers/gpu/drm/ttm/ttm_bo_vm.c              |    9 +-
7059  drivers/gpu/drm/ttm/ttm_memory.c             |    2 +
7060  drivers/gpu/drm/ttm/ttm_page_alloc.c         |  184 +++-
7061  drivers/gpu/drm/ttm/ttm_page_alloc_dma.c     | 1137 +++++++++++++++++++
7062  drivers/gpu/drm/ttm/ttm_tt.c                 |  322 +-----
7063  drivers/gpu/drm/via/via_drv.c                |   23 +-
7064  drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c       |   71 +-
7065  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c          |   30 +-
7066  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c          |   22 +-
7067  drivers/gpu/drm/vmwgfx/vmwgfx_kms.h          |    1 +
7068  drivers/gpu/drm/vmwgfx/vmwgfx_resource.c     |   35 +-
7069  drivers/staging/gma500/framebuffer.c         |   39 +-
7070  drivers/staging/gma500/psb_drv.c             |   23 +-
7071  drivers/xen/swiotlb-xen.c                    |    2 +-
7072  include/drm/drm.h                            |    4 +
7073  include/drm/drmP.h                           |    2 +-
7074  include/drm/drm_crtc.h                       |  208 ++++-
7075  include/drm/drm_crtc_helper.h                |    2 +-
7076  include/drm/drm_fourcc.h                     |  130 +++
7077  include/drm/drm_mode.h                       |   74 ++-
7078  include/drm/gma_drm.h                        |   91 ++
7079  include/drm/ttm/ttm_bo_api.h                 |   24 +-
7080  include/drm/ttm/ttm_bo_driver.h              |  201 ++--
7081  include/drm/ttm/ttm_page_alloc.h             |   77 +-
7082  include/linux/swiotlb.h                      |    2 +-
7083  lib/swiotlb.c                                |    5 +-
7084  112 files changed, 23030 insertions(+), 1243 deletions(-)
7085  create mode 100644 drivers/gpu/drm/gma500/Kconfig
7086  create mode 100644 drivers/gpu/drm/gma500/Makefile
7087  create mode 100644 drivers/gpu/drm/gma500/accel_2d.c
7088  create mode 100644 drivers/gpu/drm/gma500/backlight.c
7089  create mode 100644 drivers/gpu/drm/gma500/cdv_device.c
7090  create mode 100644 drivers/gpu/drm/gma500/cdv_device.h
7091  create mode 100644 drivers/gpu/drm/gma500/cdv_intel_crt.c
7092  create mode 100644 drivers/gpu/drm/gma500/cdv_intel_display.c
7093  create mode 100644 drivers/gpu/drm/gma500/cdv_intel_hdmi.c
7094  create mode 100644 drivers/gpu/drm/gma500/cdv_intel_lvds.c
7095  create mode 100644 drivers/gpu/drm/gma500/framebuffer.c
7096  create mode 100644 drivers/gpu/drm/gma500/framebuffer.h
7097  create mode 100644 drivers/gpu/drm/gma500/gem.c
7098  create mode 100644 drivers/gpu/drm/gma500/gem_glue.c
7099  create mode 100644 drivers/gpu/drm/gma500/gem_glue.h
7100  create mode 100644 drivers/gpu/drm/gma500/gtt.c
7101  create mode 100644 drivers/gpu/drm/gma500/gtt.h
7102  create mode 100644 drivers/gpu/drm/gma500/intel_bios.c
7103  create mode 100644 drivers/gpu/drm/gma500/intel_bios.h
7104  create mode 100644 drivers/gpu/drm/gma500/intel_i2c.c
7105  create mode 100644 drivers/gpu/drm/gma500/intel_opregion.c
7106  create mode 100644 drivers/gpu/drm/gma500/mid_bios.c
7107  create mode 100644 drivers/gpu/drm/gma500/mid_bios.h
7108  create mode 100644 drivers/gpu/drm/gma500/mmu.c
7109  create mode 100644 drivers/gpu/drm/gma500/oaktrail.h
7110  create mode 100644 drivers/gpu/drm/gma500/oaktrail_crtc.c
7111  create mode 100644 drivers/gpu/drm/gma500/oaktrail_device.c
7112  create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi.c
7113  create mode 100644 drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c
7114  create mode 100644 drivers/gpu/drm/gma500/oaktrail_lvds.c
7115  create mode 100644 drivers/gpu/drm/gma500/power.c
7116  create mode 100644 drivers/gpu/drm/gma500/power.h
7117  create mode 100644 drivers/gpu/drm/gma500/psb_device.c
7118  create mode 100644 drivers/gpu/drm/gma500/psb_drv.c
7119  create mode 100644 drivers/gpu/drm/gma500/psb_drv.h
7120  create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.c
7121  create mode 100644 drivers/gpu/drm/gma500/psb_intel_display.h
7122  create mode 100644 drivers/gpu/drm/gma500/psb_intel_drv.h
7123  create mode 100644 drivers/gpu/drm/gma500/psb_intel_lvds.c
7124  create mode 100644 drivers/gpu/drm/gma500/psb_intel_modes.c
7125  create mode 100644 drivers/gpu/drm/gma500/psb_intel_reg.h
7126  create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo.c
7127  create mode 100644 drivers/gpu/drm/gma500/psb_intel_sdvo_regs.h
7128  create mode 100644 drivers/gpu/drm/gma500/psb_irq.c
7129  create mode 100644 drivers/gpu/drm/gma500/psb_irq.h
7130  create mode 100644 drivers/gpu/drm/gma500/psb_lid.c
7131  create mode 100644 drivers/gpu/drm/gma500/psb_reg.h
7132  create mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
7133  create mode 100644 include/drm/drm_fourcc.h
7134  create mode 100644 include/drm/gma_drm.h
7135 Merging fbdev/fbdev-next (f940b88 video: s3c2410: fix checkpatch error and warnings)
7136 $ git merge fbdev/fbdev-next
7137 Removing include/linux/display.h
7138 Removing drivers/video/display/display-sysfs.c
7139 Removing drivers/video/display/Makefile
7140 Removing drivers/video/display/Kconfig
7141 Auto-merging drivers/video/Kconfig
7142 Auto-merging arch/arm/mach-shmobile/board-ap4evb.c
7143 Auto-merging arch/arm/mach-shmobile/board-ag5evm.c
7144 Auto-merging arch/arm/mach-at91/board-sam9rlek.c
7145 Auto-merging arch/arm/mach-at91/board-sam9m10g45ek.c
7146 Auto-merging arch/arm/mach-at91/board-sam9263ek.c
7147 Auto-merging arch/arm/mach-at91/board-sam9261ek.c
7148 Auto-merging arch/arm/mach-at91/board-neocore926.c
7149 Auto-merging arch/arm/mach-at91/board-cap9adk.c
7150 Merge made by the 'recursive' strategy.
7151  arch/arm/mach-at91/board-cap9adk.c                 |    2 +-
7152  arch/arm/mach-at91/board-neocore926.c              |    2 +-
7153  arch/arm/mach-at91/board-sam9261ek.c               |    4 +-
7154  arch/arm/mach-at91/board-sam9263ek.c               |    2 +-
7155  arch/arm/mach-at91/board-sam9m10g45ek.c            |    2 +-
7156  arch/arm/mach-at91/board-sam9rlek.c                |    2 +-
7157  arch/arm/mach-shmobile/board-ag5evm.c              |   41 +-
7158  arch/arm/mach-shmobile/board-ap4evb.c              |   28 +
7159  arch/arm/mach-shmobile/clock-sh7372.c              |    4 +-
7160  arch/arm/mach-shmobile/clock-sh73a0.c              |    4 +-
7161  drivers/video/Kconfig                              |    1 -
7162  drivers/video/Makefile                             |    2 +-
7163  drivers/video/amifb.c                              | 5012 ++++++++++----------
7164  drivers/video/atmel_lcdfb.c                        |   41 +-
7165  drivers/video/cirrusfb.c                           |  268 +-
7166  drivers/video/controlfb.c                          |    2 +-
7167  drivers/video/display/Kconfig                      |   24 -
7168  drivers/video/display/Makefile                     |    6 -
7169  drivers/video/display/display-sysfs.c              |  219 -
7170  drivers/video/mxsfb.c                              |   13 +-
7171  drivers/video/nuc900fb.c                           |   13 +-
7172  drivers/video/omap/lcd_mipid.c                     |    1 -
7173  drivers/video/omap2/displays/panel-acx565akm.c     |    1 -
7174  drivers/video/omap2/displays/panel-n8x0.c          |    1 -
7175  .../omap2/displays/panel-nec-nl8048hl11-01b.c      |    1 -
7176  .../video/omap2/displays/panel-tpo-td043mtea1.c    |    1 -
7177  drivers/video/pxa168fb.c                           |   12 +-
7178  drivers/video/pxa3xx-gcu.c                         |   15 +-
7179  drivers/video/s3c-fb.c                             |   91 +-
7180  drivers/video/s3c2410fb.c                          |   29 +-
7181  drivers/video/sbuslib.c                            |    2 +-
7182  drivers/video/sh7760fb.c                           |   13 +-
7183  drivers/video/sh_mipi_dsi.c                        |  218 +-
7184  drivers/video/sh_mobile_lcdcfb.c                   |   15 +-
7185  drivers/video/sh_mobile_meram.c                    |   13 +-
7186  drivers/video/sm501fb.c                            |   13 +-
7187  drivers/video/vt8500lcdfb.c                        |   13 +-
7188  drivers/video/w100fb.c                             |   13 +-
7189  drivers/video/wm8505fb.c                           |   13 +-
7190  drivers/video/wmt_ge_rops.c                        |   13 +-
7191  drivers/video/xilinxfb.c                           |   20 +-
7192  include/linux/display.h                            |   61 -
7193  include/linux/zorro_ids.h                          |    4 +-
7194  include/video/sh_mipi_dsi.h                        |   21 +-
7195  44 files changed, 2935 insertions(+), 3341 deletions(-)
7196  delete mode 100644 drivers/video/display/Kconfig
7197  delete mode 100644 drivers/video/display/Makefile
7198  delete mode 100644 drivers/video/display/display-sysfs.c
7199  delete mode 100644 include/linux/display.h
7200 Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value)
7201 $ git merge viafb/viafb-next
7202 Already up-to-date.
7203 Merging omap_dss2/for-next (3e28189 OMAPDSS: picodlp: add missing #include <linux/module.h>)
7204 $ git merge omap_dss2/for-next
7205 Already up-to-date.
7206 Merging regulator/for-next (47aed92 regulator: Update da9052-regulator for DT changes)
7207 $ git merge regulator/for-next
7208 Auto-merging sound/soc/codecs/sgtl5000.c
7209 Merge made by the 'recursive' strategy.
7210  .../bindings/regulator/fixed-regulator.txt         |   29 +
7211  .../devicetree/bindings/regulator/regulator.txt    |   54 ++
7212  Documentation/power/regulator/regulator.txt        |    2 +-
7213  drivers/regulator/88pm8607.c                       |    2 +-
7214  drivers/regulator/Kconfig                          |    8 +
7215  drivers/regulator/Makefile                         |    2 +
7216  drivers/regulator/aat2870-regulator.c              |    4 +-
7217  drivers/regulator/ab3100.c                         |    2 +-
7218  drivers/regulator/ab8500.c                         |    2 +-
7219  drivers/regulator/ad5398.c                         |    2 +-
7220  drivers/regulator/bq24022.c                        |    2 +-
7221  drivers/regulator/core.c                           |  126 +++-
7222  drivers/regulator/da903x.c                         |    2 +-
7223  drivers/regulator/da9052-regulator.c               |  600 ++++++++++++++++++++
7224  drivers/regulator/db8500-prcmu.c                   |    2 +-
7225  drivers/regulator/dummy.c                          |    2 +-
7226  drivers/regulator/fixed.c                          |   83 +++-
7227  drivers/regulator/gpio-regulator.c                 |    2 +-
7228  drivers/regulator/isl6271a-regulator.c             |    2 +-
7229  drivers/regulator/lp3971.c                         |    2 +-
7230  drivers/regulator/lp3972.c                         |    2 +-
7231  drivers/regulator/max1586.c                        |    2 +-
7232  drivers/regulator/max8649.c                        |  157 ++----
7233  drivers/regulator/max8660.c                        |    2 +-
7234  drivers/regulator/max8925-regulator.c              |    2 +-
7235  drivers/regulator/max8952.c                        |    2 +-
7236  drivers/regulator/max8997.c                        |    2 +-
7237  drivers/regulator/max8998.c                        |    2 +-
7238  drivers/regulator/mc13783-regulator.c              |    2 +-
7239  drivers/regulator/mc13892-regulator.c              |    2 +-
7240  drivers/regulator/of_regulator.c                   |   87 +++
7241  drivers/regulator/pcap-regulator.c                 |    2 +-
7242  drivers/regulator/pcf50633-regulator.c             |    2 +-
7243  drivers/regulator/tps6105x-regulator.c             |    3 +-
7244  drivers/regulator/tps65023-regulator.c             |   89 ++--
7245  drivers/regulator/tps6507x-regulator.c             |    2 +-
7246  drivers/regulator/tps6524x-regulator.c             |    2 +-
7247  drivers/regulator/tps6586x-regulator.c             |    2 +-
7248  drivers/regulator/tps65910-regulator.c             |   39 +-
7249  drivers/regulator/tps65912-regulator.c             |    2 +-
7250  drivers/regulator/twl-regulator.c                  |    2 +-
7251  drivers/regulator/userspace-consumer.c             |   13 +-
7252  drivers/regulator/virtual.c                        |   12 +-
7253  drivers/regulator/wm831x-dcdc.c                    |    8 +-
7254  drivers/regulator/wm831x-isink.c                   |    2 +-
7255  drivers/regulator/wm831x-ldo.c                     |    6 +-
7256  drivers/regulator/wm8350-regulator.c               |    2 +-
7257  drivers/regulator/wm8400-regulator.c               |    2 +-
7258  drivers/regulator/wm8994-regulator.c               |    2 +-
7259  include/linux/mfd/tps65910.h                       |   30 +-
7260  include/linux/regulator/driver.h                   |    4 +-
7261  include/linux/regulator/of_regulator.h             |   22 +
7262  sound/soc/codecs/sgtl5000.c                        |    2 +-
7263  53 files changed, 1155 insertions(+), 287 deletions(-)
7264  create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt
7265  create mode 100644 Documentation/devicetree/bindings/regulator/regulator.txt
7266  create mode 100644 drivers/regulator/da9052-regulator.c
7267  create mode 100644 drivers/regulator/of_regulator.c
7268  create mode 100644 include/linux/regulator/of_regulator.h
7269 Merging security/next (735e93c Security: tomoyo: add .gitignore file)
7270 $ git merge security/next
7271 Resolved 'lib/Makefile' using previous resolution.
7272 Auto-merging lib/Makefile
7273 CONFLICT (content): Merge conflict in lib/Makefile
7274 Auto-merging lib/Kconfig
7275 Automatic merge failed; fix conflicts and then commit the result.
7276 $ git commit -v -a
7277 [master 8c83ee36] Merge remote-tracking branch 'security/next'
7278 $ git diff -M --stat --summary HEAD^..
7279  Documentation/digsig.txt               |   96 ++
7280  Documentation/security/00-INDEX        |    2 +
7281  Documentation/security/LSM.txt         |   34 +
7282  Documentation/security/credentials.txt |    6 +-
7283  drivers/char/tpm/Kconfig               |    2 +
7284  drivers/char/tpm/tpm.c                 |  137 +++-
7285  drivers/char/tpm/tpm.h                 |    9 +-
7286  drivers/char/tpm/tpm_tis.c             |   84 +--
7287  include/linux/digsig.h                 |   64 ++
7288  include/linux/key-type.h               |    1 +
7289  include/linux/mpi.h                    |  146 ++++
7290  include/linux/security.h               |    2 +-
7291  lib/Kconfig                            |   25 +
7292  lib/Makefile                           |    3 +
7293  lib/digsig.c                           |  284 ++++++
7294  lib/mpi/Makefile                       |   32 +
7295  lib/mpi/generic_mpi-asm-defs.h         |    4 +
7296  lib/mpi/generic_mpih-add1.c            |   61 ++
7297  lib/mpi/generic_mpih-lshift.c          |   63 ++
7298  lib/mpi/generic_mpih-mul1.c            |   57 ++
7299  lib/mpi/generic_mpih-mul2.c            |   60 ++
7300  lib/mpi/generic_mpih-mul3.c            |   61 ++
7301  lib/mpi/generic_mpih-rshift.c          |   63 ++
7302  lib/mpi/generic_mpih-sub1.c            |   60 ++
7303  lib/mpi/longlong.h                     | 1478 ++++++++++++++++++++++++++++++++
7304  lib/mpi/mpi-add.c                      |  234 +++++
7305  lib/mpi/mpi-bit.c                      |  236 +++++
7306  lib/mpi/mpi-cmp.c                      |   68 ++
7307  lib/mpi/mpi-div.c                      |  333 +++++++
7308  lib/mpi/mpi-gcd.c                      |   59 ++
7309  lib/mpi/mpi-inline.c                   |   31 +
7310  lib/mpi/mpi-inline.h                   |  122 +++
7311  lib/mpi/mpi-internal.h                 |  261 ++++++
7312  lib/mpi/mpi-inv.c                      |  187 ++++
7313  lib/mpi/mpi-mpow.c                     |  134 +++
7314  lib/mpi/mpi-mul.c                      |  194 +++++
7315  lib/mpi/mpi-pow.c                      |  323 +++++++
7316  lib/mpi/mpi-scan.c                     |  136 +++
7317  lib/mpi/mpicoder.c                     |  365 ++++++++
7318  lib/mpi/mpih-cmp.c                     |   56 ++
7319  lib/mpi/mpih-div.c                     |  541 ++++++++++++
7320  lib/mpi/mpih-mul.c                     |  527 ++++++++++++
7321  lib/mpi/mpiutil.c                      |  208 +++++
7322  security/apparmor/audit.c              |    2 +-
7323  security/integrity/Kconfig             |   14 +
7324  security/integrity/Makefile            |    1 +
7325  security/integrity/digsig.c            |   48 +
7326  security/integrity/evm/evm.h           |   12 +
7327  security/integrity/evm/evm_crypto.c    |   81 ++-
7328  security/integrity/evm/evm_main.c      |   94 ++-
7329  security/integrity/integrity.h         |   21 +
7330  security/keys/key.c                    |    3 +
7331  security/selinux/selinuxfs.c           |   14 +-
7332  security/tomoyo/.gitignore             |    2 +
7333  security/tomoyo/common.h               |    2 +-
7334  55 files changed, 7014 insertions(+), 129 deletions(-)
7335  create mode 100644 Documentation/digsig.txt
7336  create mode 100644 Documentation/security/LSM.txt
7337  create mode 100644 include/linux/digsig.h
7338  create mode 100644 include/linux/mpi.h
7339  create mode 100644 lib/digsig.c
7340  create mode 100644 lib/mpi/Makefile
7341  create mode 100644 lib/mpi/generic_mpi-asm-defs.h
7342  create mode 100644 lib/mpi/generic_mpih-add1.c
7343  create mode 100644 lib/mpi/generic_mpih-lshift.c
7344  create mode 100644 lib/mpi/generic_mpih-mul1.c
7345  create mode 100644 lib/mpi/generic_mpih-mul2.c
7346  create mode 100644 lib/mpi/generic_mpih-mul3.c
7347  create mode 100644 lib/mpi/generic_mpih-rshift.c
7348  create mode 100644 lib/mpi/generic_mpih-sub1.c
7349  create mode 100644 lib/mpi/longlong.h
7350  create mode 100644 lib/mpi/mpi-add.c
7351  create mode 100644 lib/mpi/mpi-bit.c
7352  create mode 100644 lib/mpi/mpi-cmp.c
7353  create mode 100644 lib/mpi/mpi-div.c
7354  create mode 100644 lib/mpi/mpi-gcd.c
7355  create mode 100644 lib/mpi/mpi-inline.c
7356  create mode 100644 lib/mpi/mpi-inline.h
7357  create mode 100644 lib/mpi/mpi-internal.h
7358  create mode 100644 lib/mpi/mpi-inv.c
7359  create mode 100644 lib/mpi/mpi-mpow.c
7360  create mode 100644 lib/mpi/mpi-mul.c
7361  create mode 100644 lib/mpi/mpi-pow.c
7362  create mode 100644 lib/mpi/mpi-scan.c
7363  create mode 100644 lib/mpi/mpicoder.c
7364  create mode 100644 lib/mpi/mpih-cmp.c
7365  create mode 100644 lib/mpi/mpih-div.c
7366  create mode 100644 lib/mpi/mpih-mul.c
7367  create mode 100644 lib/mpi/mpiutil.c
7368  create mode 100644 security/integrity/digsig.c
7369  create mode 100644 security/tomoyo/.gitignore
7370 Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.)
7371 $ git merge selinux/master
7372 Already up-to-date.
7373 Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
7374 $ git merge lblnet/master
7375 Already up-to-date.
7376 Merging watchdog/linux-next (80fee40 watchdog: move coh901327 state holders)
7377 $ git merge watchdog/linux-next
7378 Merge made by the 'recursive' strategy.
7379  Documentation/watchdog/watchdog-kernel-api.txt |   10 +++++++++-
7380  drivers/watchdog/ar7_wdt.c                     |   17 ++---------------
7381  drivers/watchdog/bcm63xx_wdt.c                 |   13 +------------
7382  drivers/watchdog/coh901327_wdt.c               |    6 ++++--
7383  drivers/watchdog/cpu5wdt.c                     |    3 +--
7384  drivers/watchdog/cpwd.c                        |   13 +------------
7385  drivers/watchdog/davinci_wdt.c                 |   13 +------------
7386  drivers/watchdog/dw_wdt.c                      |   12 +-----------
7387  drivers/watchdog/eurotechwdt.c                 |    4 +---
7388  drivers/watchdog/ibmasr.c                      |    4 +---
7389  drivers/watchdog/indydog.c                     |    4 +---
7390  drivers/watchdog/iop_wdt.c                     |    5 +----
7391  drivers/watchdog/ixp2000_wdt.c                 |    3 +--
7392  drivers/watchdog/ixp4xx_wdt.c                  |    1 -
7393  drivers/watchdog/jz4740_wdt.c                  |   13 +------------
7394  drivers/watchdog/ks8695_wdt.c                  |    3 +--
7395  drivers/watchdog/max63xx_wdt.c                 |   13 +------------
7396  drivers/watchdog/mtx-1_wdt.c                   |   13 +------------
7397  drivers/watchdog/nuc900_wdt.c                  |   13 +------------
7398  drivers/watchdog/of_xilinx_wdt.c               |   13 +------------
7399  drivers/watchdog/omap_wdt.c                    |   16 ++--------------
7400  drivers/watchdog/orion_wdt.c                   |   16 ++--------------
7401  drivers/watchdog/pnx4008_wdt.c                 |   13 +------------
7402  drivers/watchdog/rc32434_wdt.c                 |   13 +------------
7403  drivers/watchdog/rdc321x_wdt.c                 |   13 +------------
7404  drivers/watchdog/riowd.c                       |   13 +------------
7405  drivers/watchdog/s3c2410_wdt.c                 |    2 ++
7406  drivers/watchdog/stmp3xxx_wdt.c                |   13 +------------
7407  drivers/watchdog/ts72xx_wdt.c                  |   12 +-----------
7408  drivers/watchdog/twl4030_wdt.c                 |   12 +-----------
7409  drivers/watchdog/wm831x_wdt.c                  |   16 ++--------------
7410  drivers/watchdog/wm8350_wdt.c                  |   12 +-----------
7411  include/linux/watchdog.h                       |   21 ++++++++++++++++-----
7412  33 files changed, 63 insertions(+), 285 deletions(-)
7413 Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block)
7414 $ git merge bdev/master
7415 Already up-to-date.
7416 Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
7417 $ git merge dwmw2-iommu/master
7418 Already up-to-date.
7419 Merging iommu/next (bf26934 Merge branches 'iommu/fixes', 'arm/omap', 'x86/amd', 'iommu/page-sizes' and 'iommu/group-id' into next)
7420 $ git merge iommu/next
7421 Recorded preimage for 'drivers/pci/hotplug/acpiphp_glue.c'
7422 Recorded preimage for 'include/linux/pci_regs.h'
7423 Auto-merging include/linux/pci_regs.h
7424 CONFLICT (content): Merge conflict in include/linux/pci_regs.h
7425 Auto-merging drivers/pci/hotplug/acpiphp_glue.c
7426 CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c
7427 Auto-merging drivers/pci/ats.c
7428 Auto-merging drivers/media/video/omap3isp/ispvideo.c
7429 Auto-merging Documentation/kernel-parameters.txt
7430 Automatic merge failed; fix conflicts and then commit the result.
7431 $ git commit -v -a
7432 Recorded resolution for 'drivers/pci/hotplug/acpiphp_glue.c'.
7433 Recorded resolution for 'include/linux/pci_regs.h'.
7434 [master 2142379] Merge remote-tracking branch 'iommu/next'
7435 $ git diff -M --stat --summary HEAD^..
7436  Documentation/kernel-parameters.txt     |    9 +-
7437  arch/arm/mach-omap2/devices.c           |    7 +
7438  arch/arm/plat-omap/include/plat/iommu.h |   31 +-
7439  arch/arm/plat-omap/include/plat/iovmm.h |   12 +-
7440  arch/ia64/include/asm/iommu.h           |    2 +
7441  arch/ia64/kernel/pci-dma.c              |    1 +
7442  arch/x86/include/asm/iommu.h            |    1 +
7443  arch/x86/kernel/pci-dma.c               |   11 +
7444  drivers/iommu/Kconfig                   |   13 +-
7445  drivers/iommu/Makefile                  |    1 +
7446  drivers/iommu/amd_iommu.c               |  881 ++++++++++++++++++++++++++--
7447  drivers/iommu/amd_iommu_init.c          |  113 ++++-
7448  drivers/iommu/amd_iommu_proto.h         |   24 +
7449  drivers/iommu/amd_iommu_types.h         |  108 ++++-
7450  drivers/iommu/amd_iommu_v2.c            |  994 +++++++++++++++++++++++++++++++
7451  drivers/iommu/intel-iommu.c             |   79 +++-
7452  drivers/iommu/iommu.c                   |  177 +++++-
7453  drivers/iommu/msm_iommu.c               |   25 +-
7454  drivers/iommu/omap-iommu.c              |   80 ++--
7455  drivers/iommu/omap-iovmm.c              |   48 +-
7456  drivers/media/video/omap3isp/isp.c      |   30 +-
7457  drivers/media/video/omap3isp/isp.h      |    2 -
7458  drivers/media/video/omap3isp/ispccdc.c  |   18 +-
7459  drivers/media/video/omap3isp/ispstat.c  |    8 +-
7460  drivers/media/video/omap3isp/ispvideo.c |    4 +-
7461  drivers/pci/ats.c                       |   70 ++--
7462  drivers/pci/hotplug/acpiphp_glue.c      |    2 +-
7463  include/linux/acpi.h                    |    4 +
7464  include/linux/amd-iommu.h               |  138 +++++-
7465  include/linux/iommu.h                   |   33 +-
7466  include/linux/pci_regs.h                |   30 +-
7467  virt/kvm/iommu.c                        |    8 +-
7468  32 files changed, 2707 insertions(+), 257 deletions(-)
7469  create mode 100644 drivers/iommu/amd_iommu_v2.c
7470 Merging cputime/cputime (c5927fe [S390] cputime: add sparse checking and cleanup)
7471 $ git merge cputime/cputime
7472 Auto-merging kernel/sched.c
7473 Auto-merging kernel/fork.c
7474 Auto-merging include/linux/sched.h
7475 Auto-merging fs/proc/stat.c
7476 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
7477 Merge made by the 'recursive' strategy.
7478  arch/ia64/include/asm/cputime.h        |   69 +++++++---------
7479  arch/powerpc/include/asm/cputime.h     |   70 ++++++----------
7480  arch/s390/include/asm/cputime.h        |  140 ++++++++++++++-----------------
7481  drivers/cpufreq/cpufreq_conservative.c |   29 +++----
7482  drivers/cpufreq/cpufreq_ondemand.c     |   33 ++++----
7483  drivers/cpufreq/cpufreq_stats.c        |    5 +-
7484  drivers/macintosh/rack-meter.c         |   11 +--
7485  fs/proc/array.c                        |    8 +-
7486  fs/proc/stat.c                         |   27 +++---
7487  fs/proc/uptime.c                       |    4 +-
7488  include/asm-generic/cputime.h          |   62 +++++++--------
7489  include/linux/sched.h                  |    4 +-
7490  kernel/acct.c                          |    4 +-
7491  kernel/cpu.c                           |    3 +-
7492  kernel/exit.c                          |   22 ++----
7493  kernel/fork.c                          |   14 +--
7494  kernel/itimer.c                        |   15 ++--
7495  kernel/posix-cpu-timers.c              |  132 ++++++++++++------------------
7496  kernel/sched.c                         |   80 ++++++++----------
7497  kernel/sched_stats.h                   |    6 +-
7498  kernel/signal.c                        |    6 +-
7499  kernel/sys.c                           |    6 +-
7500  kernel/tsacct.c                        |    2 +-
7501  23 files changed, 323 insertions(+), 429 deletions(-)
7502 Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.)
7503 $ git merge osd/linux-next
7504 Merge made by the 'recursive' strategy.
7505 Merging jc_docs/docs-next (5c050fb docs: update the development process document)
7506 $ git merge jc_docs/docs-next
7507 Already up-to-date.
7508 Merging nommu/master (0ce790e Linux 2.6.39-rc1)
7509 $ git merge nommu/master
7510 Already up-to-date.
7511 Merging trivial/for-next (cb54f25 btrfs: free-space-cache.c: remove extra semicolon.)
7512 $ git merge trivial/for-next
7513 Resolved 'arch/powerpc/platforms/40x/Kconfig' using previous resolution.
7514 Auto-merging net/ipv4/Kconfig
7515 Auto-merging mm/page_alloc.c
7516 Auto-merging lib/Kconfig
7517 Auto-merging kernel/irq/manage.c
7518 Auto-merging include/net/mac80211.h
7519 Auto-merging include/linux/security.h
7520 Auto-merging include/drm/drmP.h
7521 Auto-merging fs/ocfs2/file.c
7522 Auto-merging fs/nfsd/nfs4state.c
7523 Auto-merging fs/namespace.c
7524 Auto-merging fs/ext4/inode.c
7525 Auto-merging fs/btrfs/inode.c
7526 Auto-merging fs/btrfs/free-space-cache.c
7527 Auto-merging drivers/usb/gadget/Kconfig
7528 Auto-merging drivers/tty/serial/Kconfig
7529 Auto-merging drivers/spi/Kconfig
7530 Auto-merging drivers/scsi/qla4xxx/ql4_fw.h
7531 Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/sge.c
7532 Auto-merging drivers/mtd/nand/Kconfig
7533 Auto-merging drivers/gpio/Kconfig
7534 Auto-merging crypto/Kconfig
7535 Auto-merging arch/s390/Kconfig
7536 Auto-merging arch/powerpc/platforms/44x/Kconfig
7537 Auto-merging arch/powerpc/platforms/40x/Kconfig
7538 CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig
7539 Auto-merging arch/mips/Kconfig
7540 Auto-merging arch/arm/Kconfig
7541 Auto-merging MAINTAINERS
7542 Automatic merge failed; fix conflicts and then commit the result.
7543 $ git commit -v -a
7544 [master 7f4e8f0] Merge remote-tracking branch 'trivial/for-next'
7545 $ git diff -M --stat --summary HEAD^..
7546  Documentation/cpu-freq/governors.txt               |    4 +-
7547  Documentation/devices.txt                          |    2 +-
7548  Documentation/scsi/53c700.txt                      |   21 +----------
7549  MAINTAINERS                                        |   19 +++++----
7550  arch/arm/Kconfig                                   |    3 +-
7551  arch/arm/mach-pxa/colibri-pxa270-income.c          |    2 +-
7552  arch/arm/plat-omap/include/plat/serial.h           |    2 +-
7553  arch/cris/Kconfig.debug                            |    1 -
7554  arch/frv/Kconfig                                   |   10 -----
7555  arch/mips/Kconfig                                  |    5 --
7556  arch/mips/sgi-ip27/Kconfig                         |    6 ---
7557  arch/mips/sibyte/Kconfig                           |    1 -
7558  arch/powerpc/include/asm/io.h                      |    2 +-
7559  arch/powerpc/include/asm/keylargo.h                |    2 +-
7560  arch/powerpc/mm/numa.c                             |    2 +-
7561  arch/powerpc/platforms/40x/Kconfig                 |   40 --------------------
7562  arch/powerpc/platforms/44x/Kconfig                 |   18 +--------
7563  arch/powerpc/platforms/512x/Kconfig                |    1 -
7564  arch/s390/Kconfig                                  |    1 -
7565  arch/sparc/kernel/smp_64.c                         |    2 +-
7566  arch/x86/pci/pcbios.c                              |    2 +-
7567  crypto/Kconfig                                     |    2 -
7568  drivers/acpi/acpica/hwxface.c                      |    2 +-
7569  drivers/block/xen-blkback/xenbus.c                 |    2 +-
7570  drivers/char/ipmi/ipmi_bt_sm.c                     |    2 +-
7571  drivers/edac/i82975x_edac.c                        |   30 +++++++++-----
7572  drivers/edac/ppc4xx_edac.c                         |    2 +-
7573  drivers/gpio/Kconfig                               |    2 +-
7574  drivers/leds/Kconfig                               |    3 +-
7575  drivers/media/rc/ene_ir.c                          |    2 +-
7576  drivers/media/rc/ene_ir.h                          |    2 +-
7577  drivers/media/video/zoran/zoran_driver.c           |    2 +-
7578  drivers/message/fusion/lsi/mpi_ioc.h               |    2 +-
7579  drivers/mtd/nand/Kconfig                           |    1 -
7580  drivers/net/ethernet/chelsio/cxgb4vf/sge.c         |    2 +-
7581  drivers/net/ethernet/sis/sis900.h                  |    2 +-
7582  drivers/net/irda/nsc-ircc.c                        |    2 +-
7583  drivers/net/irda/via-ircc.c                        |    4 +-
7584  drivers/net/irda/w83977af_ir.c                     |    2 +-
7585  drivers/net/wimax/i2400m/i2400m.h                  |    2 +-
7586  drivers/net/wireless/rtlwifi/rtl8192de/hw.c        |    4 +-
7587  drivers/parisc/Kconfig                             |    7 ---
7588  drivers/parport/parport_mfc3.c                     |    2 +-
7589  drivers/scsi/aic7xxx/aicasm/aicasm.c               |    2 +-
7590  drivers/scsi/gdth.h                                |    2 +-
7591  drivers/scsi/ips.c                                 |    2 +-
7592  drivers/scsi/pmcraid.c                             |    2 +-
7593  drivers/scsi/qla4xxx/ql4_fw.h                      |    2 +-
7594  drivers/scsi/vmw_pvscsi.c                          |    2 +-
7595  drivers/spi/Kconfig                                |    3 +-
7596  .../comedi/drivers/addi-data/hwdrv_apci3200.c      |    2 +-
7597  drivers/staging/cxt1e1/libsbew.h                   |    2 +-
7598  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |    4 +-
7599  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |    2 +-
7600  drivers/staging/iio/industrialio-trigger.c         |    2 +-
7601  drivers/staging/sep/sep_driver.c                   |    2 +-
7602  drivers/staging/tidspbridge/Kconfig                |    2 +-
7603  drivers/staging/tidspbridge/rmgr/dbdcd.c           |    2 +-
7604  drivers/tty/serial/Kconfig                         |    2 +-
7605  drivers/usb/gadget/Kconfig                         |    1 -
7606  drivers/usb/host/hwa-hc.c                          |    2 +-
7607  drivers/usb/host/imx21-hcd.c                       |    2 +-
7608  drivers/usb/musb/cppi_dma.c                        |    2 +-
7609  drivers/usb/otg/fsl_otg.c                          |    2 +-
7610  drivers/uwb/i1480/dfu/usb.c                        |    2 +-
7611  drivers/video/bf54x-lq043fb.c                      |    2 +-
7612  drivers/video/bfin-t350mcqb-fb.c                   |    2 +-
7613  drivers/video/console/Kconfig                      |    2 -
7614  fs/btrfs/free-space-cache.c                        |    2 +-
7615  fs/btrfs/inode.c                                   |    2 +-
7616  fs/ext3/inode.c                                    |    2 +-
7617  fs/ext4/inode.c                                    |    4 +-
7618  fs/fat/inode.c                                     |   26 ++++++------
7619  fs/jbd/checkpoint.c                                |    2 +-
7620  fs/jbd2/checkpoint.c                               |    2 +-
7621  fs/namespace.c                                     |    2 -
7622  fs/nfsd/nfs4state.c                                |    2 +-
7623  fs/ocfs2/file.c                                    |    2 +-
7624  fs/qnx4/inode.c                                    |    7 ++-
7625  fs/xfs/xfs_buf.c                                   |    2 +-
7626  fs/xfs/xfs_file.c                                  |    6 +-
7627  fs/xfs/xfs_log_cil.c                               |    2 +-
7628  include/drm/drmP.h                                 |    2 +-
7629  include/linux/cordic.h                             |    4 +-
7630  include/linux/security.h                           |   26 ++++++------
7631  include/linux/types.h                              |    2 +-
7632  include/linux/wanrouter.h                          |    2 +-
7633  include/net/mac80211.h                             |    2 +-
7634  kernel/irq/manage.c                                |    2 +-
7635  kernel/time/Kconfig                                |    2 +-
7636  lib/Kconfig                                        |    7 +--
7637  lib/cordic.c                                       |    2 +-
7638  lib/decompress_bunzip2.c                           |    5 +-
7639  lib/decompress_unlzma.c                            |    2 +-
7640  mm/page_alloc.c                                    |    4 +-
7641  net/ipv4/Kconfig                                   |    2 -
7642  net/ipv4/ip_fragment.c                             |    2 +-
7643  net/ipv4/netfilter/nf_nat_core.c                   |    2 +-
7644  net/netfilter/ipvs/Kconfig                         |    1 -
7645  net/sctp/endpointola.c                             |    2 +-
7646  scripts/package/Makefile                           |    2 +-
7647  sound/aoa/codecs/Kconfig                           |    8 ----
7648  sound/core/Kconfig                                 |    1 -
7649  sound/oss/Kconfig                                  |    2 +-
7650  tools/power/x86/turbostat/turbostat.8              |    8 ++--
7651  105 files changed, 157 insertions(+), 277 deletions(-)
7652 Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path)
7653 $ git merge audit/for-next
7654 Already up-to-date.
7655 Merging pm/linux-next (87c1952 Merge branch 'pm-domains' into linux-next)
7656 $ git merge pm/linux-next
7657 Auto-merging net/sunrpc/sched.c
7658 Auto-merging kernel/fork.c
7659 Auto-merging kernel/exit.c
7660 Auto-merging kernel/cpu.c
7661 Auto-merging include/linux/sched.h
7662 Auto-merging fs/xfs/xfs_buf.c
7663 Auto-merging fs/nfs/nfs4proc.c
7664 Auto-merging fs/gfs2/quota.c
7665 Auto-merging fs/gfs2/log.c
7666 Auto-merging fs/fs-writeback.c
7667 Auto-merging fs/ext4/super.c
7668 Auto-merging arch/m68k/include/asm/thread_info.h
7669 Auto-merging arch/arm/mach-s3c64xx/pm.c
7670 Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
7671 Auto-merging arch/arm/mach-s3c64xx/Kconfig
7672 Auto-merging Documentation/feature-removal-schedule.txt
7673 Merge made by the 'recursive' strategy.
7674  Documentation/feature-removal-schedule.txt |   11 -
7675  Documentation/power/freezing-of-tasks.txt  |   39 ++-
7676  arch/alpha/include/asm/thread_info.h       |    2 -
7677  arch/arm/include/asm/thread_info.h         |    2 -
7678  arch/arm/mach-s3c64xx/Kconfig              |    1 +
7679  arch/arm/mach-s3c64xx/mach-crag6410.c      |    2 +-
7680  arch/arm/mach-s3c64xx/pm.c                 |  174 +++++++++-
7681  arch/arm/mach-shmobile/pm-sh7372.c         |   64 +++-
7682  arch/arm/plat-samsung/include/plat/pm.h    |    6 +
7683  arch/avr32/include/asm/thread_info.h       |    2 -
7684  arch/blackfin/include/asm/thread_info.h    |    2 -
7685  arch/cris/include/asm/thread_info.h        |    2 -
7686  arch/frv/include/asm/thread_info.h         |    2 -
7687  arch/h8300/include/asm/thread_info.h       |    2 -
7688  arch/ia64/include/asm/thread_info.h        |    2 -
7689  arch/m32r/include/asm/thread_info.h        |    2 -
7690  arch/m68k/include/asm/thread_info.h        |    1 -
7691  arch/microblaze/include/asm/thread_info.h  |    2 -
7692  arch/mips/include/asm/thread_info.h        |    2 -
7693  arch/mn10300/include/asm/thread_info.h     |    2 -
7694  arch/parisc/include/asm/thread_info.h      |    2 -
7695  arch/powerpc/include/asm/thread_info.h     |    2 -
7696  arch/s390/include/asm/thread_info.h        |    2 -
7697  arch/sh/include/asm/thread_info.h          |    2 -
7698  arch/sparc/include/asm/thread_info_32.h    |    2 -
7699  arch/sparc/include/asm/thread_info_64.h    |    2 -
7700  arch/um/include/asm/thread_info.h          |    2 -
7701  arch/unicore32/include/asm/thread_info.h   |    2 -
7702  arch/x86/include/asm/thread_info.h         |    2 -
7703  arch/xtensa/include/asm/thread_info.h      |    2 -
7704  drivers/acpi/sleep.c                       |   16 +
7705  drivers/base/firmware_class.c              |    4 +
7706  drivers/base/power/Makefile                |    2 +-
7707  drivers/base/power/domain.c                |  539 ++++++++++++++++++++--------
7708  drivers/base/power/domain_governor.c       |  156 ++++++++
7709  drivers/base/power/main.c                  |  147 ++------
7710  drivers/base/power/qos.c                   |   24 +-
7711  drivers/base/power/runtime.c               |  148 +++++++-
7712  drivers/bluetooth/btmrvl_main.c            |    2 -
7713  drivers/devfreq/devfreq.c                  |   15 +-
7714  drivers/dma/dmatest.c                      |   46 ++-
7715  drivers/mfd/twl6030-irq.c                  |    2 -
7716  drivers/net/irda/stir4200.c                |    2 +-
7717  drivers/platform/x86/thinkpad_acpi.c       |   15 +-
7718  drivers/staging/rts_pstor/rtsx.c           |    2 -
7719  drivers/usb/storage/usb.c                  |   13 +-
7720  fs/btrfs/async-thread.c                    |    2 +-
7721  fs/btrfs/disk-io.c                         |    8 +-
7722  fs/ext4/super.c                            |    3 +-
7723  fs/fs-writeback.c                          |    4 +-
7724  fs/gfs2/log.c                              |    4 +-
7725  fs/gfs2/quota.c                            |    4 +-
7726  fs/jbd/journal.c                           |    2 +-
7727  fs/jbd2/journal.c                          |    2 +-
7728  fs/jfs/jfs_logmgr.c                        |    2 +-
7729  fs/jfs/jfs_txnmgr.c                        |    4 +-
7730  fs/nfs/inode.c                             |    3 +-
7731  fs/nfs/nfs3proc.c                          |    3 +-
7732  fs/nfs/nfs4proc.c                          |    5 +-
7733  fs/nfs/proc.c                              |    3 +-
7734  fs/nilfs2/segment.c                        |    2 +-
7735  fs/xfs/xfs_buf.c                           |    2 +-
7736  include/linux/freezer.h                    |  157 ++++-----
7737  include/linux/kmod.h                       |    2 +
7738  include/linux/kthread.h                    |    1 +
7739  include/linux/pm.h                         |    2 +
7740  include/linux/pm_domain.h                  |  103 +++++-
7741  include/linux/pm_qos.h                     |    3 +
7742  include/linux/pm_runtime.h                 |    5 +
7743  include/linux/sched.h                      |    4 +-
7744  include/linux/suspend.h                    |   35 +-
7745  kernel/cgroup_freezer.c                    |   63 ++--
7746  kernel/cpu.c                               |    4 +-
7747  kernel/exit.c                              |    3 +-
7748  kernel/fork.c                              |    1 -
7749  kernel/freezer.c                           |  203 ++++++-----
7750  kernel/kexec.c                             |    4 +-
7751  kernel/kmod.c                              |   27 ++-
7752  kernel/kthread.c                           |   27 ++-
7753  kernel/power/hibernate.c                   |   92 ++----
7754  kernel/power/main.c                        |   10 +-
7755  kernel/power/power.h                       |    2 +
7756  kernel/power/process.c                     |   77 ++---
7757  kernel/power/suspend.c                     |   12 +-
7758  kernel/power/user.c                        |  120 +------
7759  mm/backing-dev.c                           |    8 +-
7760  mm/oom_kill.c                              |    2 +-
7761  net/sunrpc/sched.c                         |    3 +-
7762  88 files changed, 1566 insertions(+), 932 deletions(-)
7763  create mode 100644 drivers/base/power/domain_governor.c
7764 Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE')
7765 $ git merge apm/for-next
7766 Auto-merging arch/x86/Kconfig
7767 Merge made by the 'recursive' strategy.
7768  arch/x86/Kconfig |    2 +-
7769  1 files changed, 1 insertions(+), 1 deletions(-)
7770 Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared)
7771 $ git merge fsnotify/for-next
7772 Auto-merging include/linux/fsnotify_backend.h
7773 Auto-merging fs/notify/mark.c
7774 Auto-merging fs/notify/group.c
7775 Auto-merging fs/notify/fanotify/fanotify_user.c
7776 Auto-merging fs/nfsd/vfs.c
7777 Auto-merging fs/cachefiles/namei.c
7778 Merge made by the 'recursive' strategy.
7779  fs/cachefiles/namei.c              |    1 -
7780  fs/cachefiles/xattr.c              |    1 -
7781  fs/nfsd/vfs.c                      |    3 -
7782  fs/notify/dnotify/dnotify.c        |   15 +++---
7783  fs/notify/fanotify/fanotify.c      |   24 +++++----
7784  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
7785  fs/notify/group.c                  |    1 +
7786  fs/notify/mark.c                   |   36 +++++--------
7787  include/linux/fanotify.h           |    5 ++-
7788  include/linux/fsnotify_backend.h   |   14 ++++-
7789  10 files changed, 121 insertions(+), 80 deletions(-)
7790 Merging irda/for-next (94d57c4 enic: Update MAINTAINERS)
7791 $ git merge irda/for-next
7792 Already up-to-date.
7793 Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver)
7794 $ git merge edac/linux_next
7795 Already up-to-date.
7796 Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next)
7797 $ git merge edac-amd/for-next
7798 Merge made by the 'recursive' strategy.
7799  Documentation/edac.txt       |    4 ++--
7800  drivers/edac/amd64_edac.c    |   32 ++++++++++++++++++++++++++++----
7801  drivers/edac/edac_mc_sysfs.c |    4 ++--
7802  3 files changed, 32 insertions(+), 8 deletions(-)
7803 Merging devicetree/devicetree/next (ae97159 of_mdio: Don't phy_scan_fixups() twice)
7804 $ git merge devicetree/devicetree/next
7805 Already up-to-date.
7806 Merging spi/spi/next (940ab88 drivercore: Add helper macro for platform_driver boilerplate)
7807 $ git merge spi/spi/next
7808 Already up-to-date.
7809 Merging gpio/gpio/next (15182f6 Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into gpio/next)
7810 $ git merge gpio/gpio/next
7811 Auto-merging drivers/spi/spi-pl022.c
7812 Auto-merging drivers/gpio/Kconfig
7813 Auto-merging MAINTAINERS
7814 Merge made by the 'recursive' strategy.
7815  MAINTAINERS                                    |    1 +
7816  arch/arm/boot/dts/testcases/tests-phandle.dtsi |   37 ++++++
7817  arch/arm/boot/dts/testcases/tests.dtsi         |    1 +
7818  arch/arm/boot/dts/versatile-pb.dts             |    2 +
7819  arch/microblaze/kernel/reset.c                 |   43 +-------
7820  arch/powerpc/sysdev/qe_lib/gpio.c              |   42 ++------
7821  drivers/gpio/Kconfig                           |   11 +-
7822  drivers/gpio/gpio-adp5588.c                    |    5 +-
7823  drivers/gpio/gpio-bt8xx.c                      |    3 -
7824  drivers/gpio/gpio-cs5535.c                     |    1 -
7825  drivers/gpio/gpio-janz-ttl.c                   |    2 -
7826  drivers/gpio/gpio-nomadik.c                    |    4 +-
7827  drivers/gpio/gpio-pcf857x.c                    |    5 +-
7828  drivers/gpio/gpio-pch.c                        |    7 +-
7829  drivers/gpio/gpio-xilinx.c                     |    1 -
7830  drivers/gpio/gpiolib.c                         |    6 +-
7831  drivers/of/Kconfig                             |    9 ++
7832  drivers/of/Makefile                            |    1 +
7833  drivers/of/base.c                              |  146 ++++++++++++------------
7834  drivers/of/gpio.c                              |   45 +++----
7835  drivers/of/selftest.c                          |  139 ++++++++++++++++++++++
7836  drivers/spi/spi-pl022.c                        |  141 ++++++++++++++---------
7837  include/asm-generic/gpio.h                     |    6 +-
7838  include/linux/amba/pl022.h                     |    4 +
7839  include/linux/of.h                             |   11 ++-
7840  include/linux/of_gpio.h                        |   10 +-
7841  26 files changed, 422 insertions(+), 261 deletions(-)
7842  create mode 100644 arch/arm/boot/dts/testcases/tests-phandle.dtsi
7843  create mode 100644 arch/arm/boot/dts/testcases/tests.dtsi
7844  create mode 100644 drivers/of/selftest.c
7845 Merging tip/auto-latest (2d1f83e Merge branch 'x86/mce' into auto-latest)
7846 $ git merge tip/auto-latest
7847 Resolved 'drivers/cpufreq/cpufreq_conservative.c' using previous resolution.
7848 Resolved 'drivers/cpufreq/cpufreq_ondemand.c' using previous resolution.
7849 Resolved 'drivers/macintosh/rack-meter.c' using previous resolution.
7850 Resolved 'fs/proc/stat.c' using previous resolution.
7851 Resolved 'fs/proc/uptime.c' using previous resolution.
7852 Resolved 'kernel/sched/core.c' using previous resolution.
7853 Auto-merging kernel/sched/stop_task.c
7854 Auto-merging kernel/sched/stats.h
7855 Auto-merging kernel/sched/rt.c
7856 Auto-merging kernel/sched/idle_task.c
7857 Auto-merging kernel/sched/features.h
7858 Auto-merging kernel/sched/fair.c
7859 Auto-merging kernel/sched/debug.c
7860 Auto-merging kernel/sched/cpupri.c
7861 Auto-merging kernel/sched/core.c
7862 CONFLICT (content): Merge conflict in kernel/sched/core.c
7863 Auto-merging kernel/sched/auto_group.h
7864 Auto-merging kernel/sched/auto_group.c
7865 Auto-merging kernel/cpu.c
7866 Auto-merging init/Kconfig
7867 Auto-merging include/linux/sched.h
7868 Auto-merging fs/proc/uptime.c
7869 CONFLICT (content): Merge conflict in fs/proc/uptime.c
7870 Auto-merging fs/proc/stat.c
7871 CONFLICT (content): Merge conflict in fs/proc/stat.c
7872 Auto-merging drivers/macintosh/rack-meter.c
7873 CONFLICT (content): Merge conflict in drivers/macintosh/rack-meter.c
7874 Auto-merging drivers/cpufreq/cpufreq_ondemand.c
7875 CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
7876 Auto-merging drivers/cpufreq/cpufreq_conservative.c
7877 CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_conservative.c
7878 Removing arch/x86/um/sys_call_table_32.S
7879 Removing arch/x86/oprofile/nmi_timer_int.c
7880 Removing arch/x86/kernel/syscall_table_32.S
7881 Removing arch/x86/include/asm/unistd_64.h
7882 Removing arch/x86/include/asm/unistd_32.h
7883 Auto-merging arch/x86/include/asm/topology.h
7884 Auto-merging arch/x86/include/asm/thread_info.h
7885 Auto-merging arch/x86/Kconfig
7886 Auto-merging arch/arm/kernel/process.c
7887 Auto-merging MAINTAINERS
7888 Auto-merging Documentation/kernel-parameters.txt
7889 Automatic merge failed; fix conflicts and then commit the result.
7890 $ git commit -v -a
7891 [master a63b278] Merge remote-tracking branch 'tip/auto-latest'
7892 $ git diff -M --stat --summary HEAD^..
7893  Documentation/DocBook/debugobjects.tmpl            |   50 +
7894  Documentation/RCU/checklist.txt                    |    6 +
7895  Documentation/RCU/rcu.txt                          |   10 +-
7896  Documentation/RCU/stallwarn.txt                    |   16 +-
7897  Documentation/RCU/torture.txt                      |   13 +
7898  Documentation/RCU/trace.txt                        |    4 -
7899  Documentation/RCU/whatisRCU.txt                    |   19 +-
7900  Documentation/atomic_ops.txt                       |   87 +
7901  Documentation/kbuild/makefiles.txt                 |   50 +-
7902  Documentation/kernel-parameters.txt                |   14 +-
7903  Documentation/lockdep-design.txt                   |   63 +
7904  Documentation/sysctl/kernel.txt                    |   14 +
7905  Documentation/trace/events.txt                     |    2 -
7906  MAINTAINERS                                        |   13 +-
7907  Makefile                                           |    9 +-
7908  arch/Kconfig                                       |    4 +
7909  arch/arm/kernel/process.c                          |    6 +-
7910  arch/avr32/kernel/process.c                        |    6 +-
7911  arch/blackfin/kernel/process.c                     |    6 +-
7912  arch/cris/arch-v32/kernel/time.c                   |    4 +-
7913  arch/microblaze/kernel/process.c                   |    6 +-
7914  arch/mips/kernel/process.c                         |    6 +-
7915  arch/openrisc/kernel/idle.c                        |    6 +-
7916  arch/parisc/kernel/time.c                          |    6 +-
7917  arch/powerpc/kernel/idle.c                         |   15 +-
7918  arch/powerpc/platforms/iseries/setup.c             |   12 +-
7919  arch/powerpc/platforms/pseries/lpar.c              |    4 +
7920  arch/s390/appldata/appldata_os.c                   |   16 +-
7921  arch/s390/kernel/process.c                         |    6 +-
7922  arch/sh/kernel/idle.c                              |    6 +-
7923  arch/sparc/kernel/process_64.c                     |    6 +-
7924  arch/sparc/kernel/setup_32.c                       |    2 +-
7925  arch/tile/kernel/process.c                         |    6 +-
7926  arch/tile/mm/fault.c                               |    4 +-
7927  arch/um/Makefile                                   |    9 +-
7928  arch/um/kernel/process.c                           |    6 +-
7929  arch/um/kernel/time.c                              |    6 +-
7930  arch/unicore32/kernel/process.c                    |    6 +-
7931  arch/x86/Kconfig                                   |   39 +-
7932  arch/x86/Kconfig.debug                             |   25 +-
7933  arch/x86/Makefile                                  |    6 +
7934  arch/x86/boot/compressed/Makefile                  |   10 +-
7935  arch/x86/boot/compressed/eboot.c                   | 1014 +++++++++
7936  arch/x86/boot/compressed/eboot.h                   |   60 +
7937  arch/x86/boot/compressed/efi_stub_32.S             |   86 +
7938  arch/x86/boot/compressed/efi_stub_64.S             |    1 +
7939  arch/x86/boot/compressed/head_32.S                 |   22 +
7940  arch/x86/boot/compressed/head_64.S                 |   20 +
7941  arch/x86/boot/compressed/string.c                  |    9 +
7942  arch/x86/boot/header.S                             |  158 ++
7943  arch/x86/boot/string.c                             |   35 +
7944  arch/x86/boot/tools/build.c                        |   39 +
7945  arch/x86/ia32/Makefile                             |    1 +
7946  arch/x86/ia32/ia32entry.S                          |  402 +----
7947  arch/x86/ia32/nosyscall.c                          |    7 +
7948  arch/x86/ia32/syscall_ia32.c                       |   25 +
7949  arch/x86/include/asm/Kbuild                        |    5 +-
7950  arch/x86/include/asm/apic.h                        |    3 +
7951  arch/x86/include/asm/apic_flat_64.h                |    7 +
7952  arch/x86/include/asm/bootparam.h                   |    2 +
7953  arch/x86/include/asm/cmpxchg.h                     |  140 +-
7954  arch/x86/include/asm/div64.h                       |   22 +-
7955  arch/x86/include/asm/efi.h                         |    4 +
7956  arch/x86/include/asm/i387.h                        |    2 +-
7957  arch/x86/include/asm/ia32_unistd.h                 |   13 +-
7958  arch/x86/include/asm/init.h                        |    2 +
7959  arch/x86/include/asm/insn.h                        |    7 +
7960  arch/x86/include/asm/mach_timer.h                  |    2 +-
7961  arch/x86/include/asm/numachip/numachip_csr.h       |  167 ++
7962  arch/x86/include/asm/perf_event.h                  |   29 +
7963  arch/x86/include/asm/processor-flags.h             |    1 +
7964  arch/x86/include/asm/smp.h                         |    6 +
7965  arch/x86/include/asm/spinlock.h                    |   15 +-
7966  arch/x86/include/asm/thread_info.h                 |    9 +-
7967  arch/x86/include/asm/topology.h                    |    2 -
7968  arch/x86/include/asm/tsc.h                         |    2 +
7969  arch/x86/include/asm/uaccess.h                     |    2 +-
7970  arch/x86/include/asm/unistd.h                      |   54 +-
7971  arch/x86/include/asm/unistd_32.h                   |  401 ----
7972  arch/x86/include/asm/unistd_64.h                   |  732 -------
7973  arch/x86/include/asm/x86_init.h                    |    3 +
7974  arch/x86/kernel/Makefile                           |    4 +-
7975  arch/x86/kernel/apic/Makefile                      |    1 +
7976  arch/x86/kernel/apic/apic.c                        |   12 +-
7977  arch/x86/kernel/apic/apic_flat_64.c                |    2 +-
7978  arch/x86/kernel/apic/apic_numachip.c               |  294 +++
7979  arch/x86/kernel/apic/io_apic.c                     |    2 +-
7980  arch/x86/kernel/asm-offsets.c                      |    2 +
7981  arch/x86/kernel/asm-offsets_32.c                   |    8 +
7982  arch/x86/kernel/asm-offsets_64.c                   |   19 +-
7983  arch/x86/kernel/cpu/amd.c                          |    7 +
7984  arch/x86/kernel/cpu/common.c                       |   11 +
7985  arch/x86/kernel/cpu/cpu.h                          |    5 +-
7986  arch/x86/kernel/cpu/mcheck/therm_throt.c           |   31 +-
7987  arch/x86/kernel/cpu/mcheck/threshold.c             |    2 +-
7988  arch/x86/kernel/cpu/perf_event.c                   |  254 ++-
7989  arch/x86/kernel/cpu/perf_event.h                   |   51 +-
7990  arch/x86/kernel/cpu/perf_event_amd.c               |    2 +-
7991  arch/x86/kernel/cpu/perf_event_intel.c             |   72 +-
7992  arch/x86/kernel/e820.c                             |   59 +-
7993  arch/x86/kernel/early_printk.c                     |    2 +-
7994  arch/x86/kernel/entry_32.S                         |   41 +-
7995  arch/x86/kernel/entry_64.S                         |   31 +-
7996  arch/x86/kernel/hpet.c                             |    7 +-
7997  arch/x86/kernel/irq.c                              |   11 +-
7998  arch/x86/kernel/irq_32.c                           |    5 +
7999  arch/x86/kernel/irq_64.c                           |   35 +-
8000  arch/x86/kernel/jump_label.c                       |    2 +-
8001  arch/x86/kernel/nmi_selftest.c                     |  180 ++
8002  arch/x86/kernel/process.c                          |    2 +-
8003  arch/x86/kernel/process_32.c                       |    6 +-
8004  arch/x86/kernel/process_64.c                       |   15 +-
8005  arch/x86/kernel/ptrace.c                           |    3 +-
8006  arch/x86/kernel/setup.c                            |    7 +-
8007  arch/x86/kernel/smp.c                              |   72 +-
8008  arch/x86/kernel/smpboot.c                          |   17 +-
8009  arch/x86/kernel/syscall_32.c                       |   25 +
8010  arch/x86/kernel/syscall_64.c                       |   20 +-
8011  arch/x86/kernel/syscall_table_32.S                 |  350 ----
8012  arch/x86/kernel/traps.c                            |    7 +-
8013  arch/x86/kernel/tsc.c                              |   26 +-
8014  arch/x86/kernel/tsc_sync.c                         |    4 +-
8015  arch/x86/kernel/vsyscall_64.c                      |   77 +-
8016  arch/x86/kernel/x86_init.c                         |    1 +
8017  arch/x86/lib/inat.c                                |    9 +-
8018  arch/x86/lib/insn.c                                |    4 +-
8019  arch/x86/lib/string_32.c                           |    8 +-
8020  arch/x86/lib/x86-opcode-map.txt                    |  606 +++---
8021  arch/x86/mm/extable.c                              |    2 +-
8022  arch/x86/mm/fault.c                                |   22 +-
8023  arch/x86/mm/init.c                                 |   23 +
8024  arch/x86/mm/init_32.c                              |   29 +-
8025  arch/x86/mm/init_64.c                              |   11 +-
8026  arch/x86/mm/mmap.c                                 |    4 +-
8027  arch/x86/mm/numa.c                                 |   10 +-
8028  arch/x86/mm/pageattr.c                             |    8 +-
8029  arch/x86/oprofile/Makefile                         |    3 +-
8030  arch/x86/oprofile/init.c                           |   30 +-
8031  arch/x86/oprofile/nmi_int.c                        |   27 +-
8032  arch/x86/oprofile/nmi_timer_int.c                  |   50 -
8033  arch/x86/platform/efi/efi.c                        |    3 +-
8034  arch/x86/platform/mrst/Makefile                    |    2 +-
8035  arch/x86/platform/mrst/mrst.c                      |    3 +-
8036  arch/x86/syscalls/Makefile                         |   43 +
8037  arch/x86/syscalls/syscall_32.tbl                   |  357 ++++
8038  arch/x86/syscalls/syscall_64.tbl                   |  320 +++
8039  arch/x86/syscalls/syscallhdr.sh                    |   27 +
8040  arch/x86/syscalls/syscalltbl.sh                    |   15 +
8041  arch/x86/tools/Makefile                            |   11 +-
8042  arch/x86/tools/gen-insn-attr-x86.awk               |   21 +-
8043  arch/x86/tools/insn_sanity.c                       |  275 +++
8044  arch/x86/um/Makefile                               |    3 +-
8045  arch/x86/um/sys_call_table_32.S                    |   26 -
8046  arch/x86/um/sys_call_table_32.c                    |   55 +
8047  arch/x86/um/sys_call_table_64.c                    |   33 +-
8048  arch/x86/um/user-offsets.c                         |   15 +
8049  arch/xtensa/kernel/time.c                          |   13 +-
8050  drivers/base/cpu.c                                 |    7 +
8051  drivers/clocksource/acpi_pm.c                      |    2 +-
8052  drivers/clocksource/i8253.c                        |    6 +-
8053  drivers/clocksource/tcb_clksrc.c                   |    4 +-
8054  drivers/cpufreq/cpufreq_conservative.c             |   39 +-
8055  drivers/cpufreq/cpufreq_ondemand.c                 |   39 +-
8056  drivers/lguest/x86/core.c                          |    2 +-
8057  drivers/macintosh/rack-meter.c                     |    7 +-
8058  drivers/oprofile/nmi_timer_int.c                   |  173 ++
8059  drivers/oprofile/oprof.c                           |   30 +-
8060  drivers/oprofile/oprof.h                           |    9 +
8061  drivers/oprofile/timer_int.c                       |   30 +-
8062  drivers/pci/Kconfig                                |    4 +-
8063  drivers/pci/ioapic.c                               |   15 +-
8064  drivers/rtc/interface.c                            |    6 +
8065  drivers/rtc/rtc-m41t80.c                           |    9 +
8066  fs/proc/stat.c                                     |   52 +-
8067  fs/proc/uptime.c                                   |    4 +-
8068  include/linux/bitops.h                             |   10 +-
8069  include/linux/cpu.h                                |    1 +
8070  include/linux/debugobjects.h                       |    6 +
8071  include/linux/efi.h                                |  136 ++-
8072  include/linux/hardirq.h                            |   21 -
8073  include/linux/jump_label.h                         |   27 +
8074  include/linux/kernel.h                             |    1 +
8075  include/linux/kernel_stat.h                        |   36 +-
8076  include/linux/latencytop.h                         |    3 +-
8077  include/linux/lockdep.h                            |    4 +
8078  include/linux/mm.h                                 |   10 -
8079  include/linux/perf_event.h                         |    7 +-
8080  include/linux/rcupdate.h                           |  115 +-
8081  include/linux/sched.h                              |   23 +
8082  include/linux/srcu.h                               |   87 +-
8083  include/linux/tick.h                               |   11 +-
8084  include/trace/events/rcu.h                         |  122 +-
8085  include/trace/events/sched.h                       |    7 +
8086  init/Kconfig                                       |   10 +-
8087  init/calibrate.c                                   |   15 +
8088  init/main.c                                        |    8 +-
8089  kernel/Makefile                                    |   20 +-
8090  kernel/cpu.c                                       |    1 +
8091  kernel/debug/kdb/kdb_support.c                     |    2 +-
8092  kernel/events/Makefile                             |    2 +-
8093  kernel/events/callchain.c                          |  191 ++
8094  kernel/events/core.c                               |  306 +---
8095  kernel/events/internal.h                           |   39 +-
8096  kernel/jump_label.c                                |   49 +-
8097  kernel/lockdep.c                                   |   83 +-
8098  kernel/panic.c                                     |   17 +-
8099  kernel/printk.c                                    |    9 +-
8100  kernel/rcu.h                                       |    7 +
8101  kernel/rcupdate.c                                  |   12 +
8102  kernel/rcutiny.c                                   |  149 ++-
8103  kernel/rcutiny_plugin.h                            |   29 +-
8104  kernel/rcutorture.c                                |  225 ++-
8105  kernel/rcutree.c                                   |  290 ++-
8106  kernel/rcutree.h                                   |   26 +-
8107  kernel/rcutree_plugin.h                            |  289 +++-
8108  kernel/rcutree_trace.c                             |   12 +-
8109  kernel/rtmutex-debug.c                             |    1 +
8110  kernel/rtmutex.c                                   |    8 -
8111  kernel/sched/Makefile                              |   20 +
8112  kernel/{sched_autogroup.c => sched/auto_group.c}   |   33 +-
8113  kernel/{sched_autogroup.h => sched/auto_group.h}   |   26 +-
8114  kernel/{sched_clock.c => sched/clock.c}            |    0
8115  kernel/{sched.c => sched/core.c}                   | 2180 +++-----------------
8116  kernel/{sched_cpupri.c => sched/cpupri.c}          |    4 +-
8117  kernel/{sched_cpupri.h => sched/cpupri.h}          |    0
8118  kernel/{sched_debug.c => sched/debug.c}            |    6 +-
8119  kernel/{sched_fair.c => sched/fair.c}              |  929 +++++++--
8120  kernel/{sched_features.h => sched/features.h}      |   30 +-
8121  kernel/{sched_idletask.c => sched/idle_task.c}     |    4 +-
8122  kernel/{sched_rt.c => sched/rt.c}                  |  218 ++-
8123  kernel/sched/sched.h                               | 1136 ++++++++++
8124  kernel/sched/stats.c                               |  111 +
8125  kernel/{sched_stats.h => sched/stats.h}            |  103 -
8126  kernel/{sched_stoptask.c => sched/stop_task.c}     |    4 +-
8127  kernel/softirq.c                                   |    4 +-
8128  kernel/sysctl.c                                    |    9 +
8129  kernel/time/tick-sched.c                           |  105 +-
8130  kernel/time/timekeeping.c                          |   10 +-
8131  kernel/timer.c                                     |   62 +-
8132  kernel/trace/trace.c                               |  106 +-
8133  kernel/trace/trace.h                               |    2 +
8134  kernel/trace/trace_events_filter.c                 |   26 +-
8135  kernel/trace/trace_irqsoff.c                       |   13 +-
8136  kernel/trace/trace_output.c                        |   16 +-
8137  kernel/trace/trace_sched_wakeup.c                  |   13 +-
8138  kernel/trace/trace_syscalls.c                      |    1 +
8139  lib/debugobjects.c                                 |   54 +-
8140  mm/debug-pagealloc.c                               |    3 -
8141  scripts/Makefile.headersinst                       |   10 +-
8142  scripts/checksyscalls.sh                           |   15 +-
8143  tools/perf/Documentation/perf-annotate.txt         |    2 +-
8144  tools/perf/Documentation/perf-report.txt           |    4 +-
8145  tools/perf/Documentation/perf-script.txt           |    7 +-
8146  tools/perf/Documentation/perf-test.txt             |    8 +-
8147  tools/perf/Makefile                                |    1 +
8148  tools/perf/builtin-annotate.c                      |  133 +-
8149  tools/perf/builtin-diff.c                          |   21 +-
8150  tools/perf/builtin-inject.c                        |  118 +-
8151  tools/perf/builtin-kmem.c                          |   14 +-
8152  tools/perf/builtin-lock.c                          |   10 +-
8153  tools/perf/builtin-probe.c                         |    1 -
8154  tools/perf/builtin-record.c                        |  585 +++---
8155  tools/perf/builtin-report.c                        |  225 ++-
8156  tools/perf/builtin-sched.c                         |  198 +-
8157  tools/perf/builtin-script.c                        |  113 +-
8158  tools/perf/builtin-stat.c                          |   43 +-
8159  tools/perf/builtin-test.c                          |  418 ++++-
8160  tools/perf/builtin-timechart.c                     |   34 +-
8161  tools/perf/builtin-top.c                           |  557 +++---
8162  tools/perf/perf.c                                  |   33 +-
8163  tools/perf/perf.h                                  |   23 +
8164  tools/perf/util/annotate.c                         |    6 +-
8165  tools/perf/util/annotate.h                         |    5 +-
8166  tools/perf/util/build-id.c                         |   26 +-
8167  tools/perf/util/build-id.h                         |    2 +-
8168  tools/perf/util/callchain.h                        |    3 +
8169  tools/perf/util/cgroup.c                           |   15 +-
8170  tools/perf/util/debugfs.c                          |   35 +-
8171  tools/perf/util/debugfs.h                          |   31 +-
8172  tools/perf/util/event.c                            |  243 ++-
8173  tools/perf/util/event.h                            |   68 +-
8174  tools/perf/util/evlist.c                           |  293 +++-
8175  tools/perf/util/evlist.h                           |   43 +-
8176  tools/perf/util/evsel.c                            |  149 ++
8177  tools/perf/util/evsel.h                            |    8 +
8178  tools/perf/util/header.c                           |   75 +-
8179  tools/perf/util/header.h                           |   45 +-
8180  tools/perf/util/hist.h                             |    3 +-
8181  tools/perf/util/map.c                              |    4 +
8182  tools/perf/util/map.h                              |   19 +
8183  tools/perf/util/parse-events.c                     |   28 +-
8184  tools/perf/util/parse-events.h                     |    1 -
8185  tools/perf/util/probe-finder.h                     |    1 -
8186  .../perf/util/scripting-engines/trace-event-perl.c |    4 +-
8187  .../util/scripting-engines/trace-event-python.c    |    4 +-
8188  tools/perf/util/session.c                          |  326 ++--
8189  tools/perf/util/session.h                          |   70 +-
8190  tools/perf/util/setup.py                           |    3 +-
8191  tools/perf/util/symbol.h                           |    1 +
8192  tools/perf/util/thread.c                           |    6 +-
8193  tools/perf/util/thread.h                           |   14 +-
8194  tools/perf/util/tool.h                             |   50 +
8195  tools/perf/util/top.h                              |   20 +-
8196  tools/perf/util/trace-event-info.c                 |   28 +-
8197  tools/perf/util/trace-event-scripting.c            |    2 +-
8198  tools/perf/util/trace-event.h                      |    8 +-
8199  tools/perf/util/ui/browsers/annotate.c             |   16 +-
8200  tools/perf/util/ui/browsers/hists.c                |    2 +-
8201  tools/perf/util/ui/progress.c                      |    3 +
8202  309 files changed, 12671 insertions(+), 7622 deletions(-)
8203  create mode 100644 arch/x86/boot/compressed/eboot.c
8204  create mode 100644 arch/x86/boot/compressed/eboot.h
8205  create mode 100644 arch/x86/boot/compressed/efi_stub_32.S
8206  create mode 100644 arch/x86/boot/compressed/efi_stub_64.S
8207  create mode 100644 arch/x86/ia32/nosyscall.c
8208  create mode 100644 arch/x86/ia32/syscall_ia32.c
8209  create mode 100644 arch/x86/include/asm/apic_flat_64.h
8210  create mode 100644 arch/x86/include/asm/numachip/numachip_csr.h
8211  delete mode 100644 arch/x86/include/asm/unistd_32.h
8212  delete mode 100644 arch/x86/include/asm/unistd_64.h
8213  create mode 100644 arch/x86/kernel/apic/apic_numachip.c
8214  create mode 100644 arch/x86/kernel/nmi_selftest.c
8215  create mode 100644 arch/x86/kernel/syscall_32.c
8216  delete mode 100644 arch/x86/kernel/syscall_table_32.S
8217  delete mode 100644 arch/x86/oprofile/nmi_timer_int.c
8218  create mode 100644 arch/x86/syscalls/Makefile
8219  create mode 100644 arch/x86/syscalls/syscall_32.tbl
8220  create mode 100644 arch/x86/syscalls/syscall_64.tbl
8221  create mode 100644 arch/x86/syscalls/syscallhdr.sh
8222  create mode 100644 arch/x86/syscalls/syscalltbl.sh
8223  create mode 100644 arch/x86/tools/insn_sanity.c
8224  delete mode 100644 arch/x86/um/sys_call_table_32.S
8225  create mode 100644 arch/x86/um/sys_call_table_32.c
8226  create mode 100644 drivers/oprofile/nmi_timer_int.c
8227  create mode 100644 kernel/events/callchain.c
8228  create mode 100644 kernel/sched/Makefile
8229  rename kernel/{sched_autogroup.c => sched/auto_group.c} (88%)
8230  rename kernel/{sched_autogroup.h => sched/auto_group.h} (66%)
8231  rename kernel/{sched_clock.c => sched/clock.c} (100%)
8232  rename kernel/{sched.c => sched/core.c} (80%)
8233  rename kernel/{sched_cpupri.c => sched/cpupri.c} (99%)
8234  rename kernel/{sched_cpupri.h => sched/cpupri.h} (100%)
8235  rename kernel/{sched_debug.c => sched/debug.c} (99%)
8236  rename kernel/{sched_fair.c => sched/fair.c} (87%)
8237  rename kernel/{sched_features.h => sched/features.h} (75%)
8238  rename kernel/{sched_idletask.c => sched/idle_task.c} (96%)
8239  rename kernel/{sched_rt.c => sched/rt.c} (90%)
8240  create mode 100644 kernel/sched/sched.h
8241  create mode 100644 kernel/sched/stats.c
8242  rename kernel/{sched_stats.h => sched/stats.h} (71%)
8243  rename kernel/{sched_stoptask.c => sched/stop_task.c} (97%)
8244  create mode 100644 tools/perf/util/tool.h
8245 Merging rcu/rcu/next (a513f6b cpu: Export cpu_up())
8246 $ git merge rcu/rcu/next
8247 Already up-to-date.
8248 Merging uprobes/for-next (b23a347 x86: skip singlestep where possible)
8249 $ git merge uprobes/for-next
8250 Auto-merging tools/perf/util/symbol.h
8251 Auto-merging tools/perf/builtin-probe.c
8252 Auto-merging kernel/trace/trace.h
8253 Auto-merging kernel/signal.c
8254 Auto-merging kernel/fork.c
8255 Auto-merging kernel/Makefile
8256 Auto-merging include/linux/srcu.h
8257 Auto-merging include/linux/sched.h
8258 Auto-merging arch/x86/kernel/Makefile
8259 Auto-merging arch/x86/include/asm/thread_info.h
8260 Auto-merging arch/x86/Kconfig
8261 Auto-merging arch/Kconfig
8262 Merge made by the 'recursive' strategy.
8263  Documentation/trace/uprobetracer.txt    |   93 ++
8264  arch/Kconfig                            |    3 +
8265  arch/x86/Kconfig                        |    5 +-
8266  arch/x86/include/asm/thread_info.h      |    2 +
8267  arch/x86/include/asm/uprobes.h          |   59 ++
8268  arch/x86/kernel/Makefile                |    1 +
8269  arch/x86/kernel/signal.c                |    6 +
8270  arch/x86/kernel/uprobes.c               |  651 ++++++++++++++
8271  include/linux/mm_types.h                |    5 +
8272  include/linux/sched.h                   |    4 +
8273  include/linux/srcu.h                    |   50 +
8274  include/linux/uprobes.h                 |  180 ++++
8275  kernel/Makefile                         |    1 +
8276  kernel/fork.c                           |   15 +
8277  kernel/signal.c                         |    3 +
8278  kernel/srcu.c                           |    3 +-
8279  kernel/trace/Kconfig                    |   20 +
8280  kernel/trace/Makefile                   |    2 +
8281  kernel/trace/trace.h                    |    5 +
8282  kernel/trace/trace_kprobe.c             |  899 +------------------
8283  kernel/trace/trace_probe.c              |  785 ++++++++++++++++
8284  kernel/trace/trace_probe.h              |  161 ++++
8285  kernel/trace/trace_uprobe.c             |  768 ++++++++++++++++
8286  kernel/uprobes.c                        | 1500 +++++++++++++++++++++++++++++++
8287  mm/mmap.c                               |   33 +-
8288  tools/perf/Documentation/perf-probe.txt |   14 +
8289  tools/perf/builtin-probe.c              |   49 +-
8290  tools/perf/util/probe-event.c           |  411 +++++++--
8291  tools/perf/util/probe-event.h           |   12 +-
8292  tools/perf/util/symbol.c                |    8 +
8293  tools/perf/util/symbol.h                |    1 +
8294  31 files changed, 4767 insertions(+), 982 deletions(-)
8295  create mode 100644 Documentation/trace/uprobetracer.txt
8296  create mode 100644 arch/x86/include/asm/uprobes.h
8297  create mode 100644 arch/x86/kernel/uprobes.c
8298  create mode 100644 include/linux/uprobes.h
8299  create mode 100644 kernel/trace/trace_probe.c
8300  create mode 100644 kernel/trace/trace_probe.h
8301  create mode 100644 kernel/trace/trace_uprobe.c
8302  create mode 100644 kernel/uprobes.c
8303 Merging cgroup/for-next (789244f Merge branch 'for-3.3' into for-next)
8304 $ git merge cgroup/for-next
8305 Auto-merging mm/memcontrol.c
8306 Auto-merging kernel/signal.c
8307 Auto-merging kernel/sched/core.c
8308 Auto-merging kernel/fork.c
8309 Auto-merging kernel/events/core.c
8310 Auto-merging kernel/cgroup_freezer.c
8311 Auto-merging include/linux/sched.h
8312 Merge made by the 'recursive' strategy.
8313  Documentation/cgroups/cgroups.txt |   51 +++----
8314  block/blk-cgroup.c                |   45 ++++--
8315  include/linux/cgroup.h            |   31 +++-
8316  include/linux/init_task.h         |    9 +-
8317  include/linux/sched.h             |   73 ++++++---
8318  kernel/cgroup.c                   |  322 ++++++++++++++++++++++---------------
8319  kernel/cgroup_freezer.c           |   16 +--
8320  kernel/cpuset.c                   |  105 ++++++-------
8321  kernel/events/core.c              |   13 +-
8322  kernel/fork.c                     |    8 +-
8323  kernel/res_counter.c              |    3 +-
8324  kernel/sched/core.c               |   31 +++--
8325  kernel/signal.c                   |   10 ++
8326  mm/memcontrol.c                   |   16 +-
8327  security/device_cgroup.c          |    7 +-
8328  15 files changed, 433 insertions(+), 307 deletions(-)
8329 Merging kmemleak/kmemleak (029aeff kmemleak: Add support for memory hotplug)
8330 $ git merge kmemleak/kmemleak
8331 Merge made by the 'recursive' strategy.
8332  Documentation/kmemleak.txt |    3 +
8333  include/linux/kmemleak.h   |    8 ++
8334  lib/Kconfig.debug          |    2 +-
8335  mm/kmemleak.c              |  158 ++++++++++++++++++++++++++++++++++++-------
8336  mm/percpu.c                |   12 +++-
8337  5 files changed, 155 insertions(+), 28 deletions(-)
8338 Merging kvm/kvm-updates/3.2 (a3e06bb KVM: emulate lapic tsc deadline timer for guest)
8339 $ git merge kvm/kvm-updates/3.2
8340 Already up-to-date.
8341 Merging oprofile/for-next (8685bbc Merge branch 'oprofile/urgent' into oprofile/master)
8342 $ git merge oprofile/for-next
8343 Auto-merging Documentation/kernel-parameters.txt
8344 Merge made by the 'recursive' strategy.
8345  Documentation/kernel-parameters.txt |    2 +
8346  arch/s390/oprofile/hwsampler.c      |    7 +-
8347  arch/s390/oprofile/init.c           |  373 ++++++++++++++++++++++++++++++++---
8348  arch/s390/oprofile/op_counter.h     |   23 +++
8349  drivers/oprofile/oprof.h            |    1 -
8350  5 files changed, 374 insertions(+), 32 deletions(-)
8351  create mode 100644 arch/s390/oprofile/op_counter.h
8352 Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen)
8353 $ git merge xen/upstream/xen
8354 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
8355 Auto-merging arch/x86/xen/Kconfig
8356 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
8357 Auto-merging arch/x86/kernel/microcode_core.c
8358 Auto-merging arch/x86/kernel/Makefile
8359 Automatic merge failed; fix conflicts and then commit the result.
8360 $ git commit -v -a
8361 [master 6b14454] Merge remote-tracking branch 'xen/upstream/xen'
8362 $ git diff -M --stat --summary HEAD^..
8363  arch/x86/include/asm/microcode.h |    9 ++
8364  arch/x86/kernel/Makefile         |    1 +
8365  arch/x86/kernel/microcode_core.c |    5 +-
8366  arch/x86/kernel/microcode_xen.c  |  198 ++++++++++++++++++++++++++++++++++++++
8367  arch/x86/xen/Kconfig             |    4 +
8368  5 files changed, 216 insertions(+), 1 deletions(-)
8369  create mode 100644 arch/x86/kernel/microcode_xen.c
8370 Merging xen-two/linux-next (82eab1f Merge branch 'stable/for-linus-fixes-3.2' into linux-next)
8371 $ git merge xen-two/linux-next
8372 Resolved 'arch/x86/xen/Kconfig' using previous resolution.
8373 Auto-merging arch/x86/xen/Kconfig
8374 CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig
8375 Automatic merge failed; fix conflicts and then commit the result.
8376 $ git commit -v -a
8377 [master 1434b6a] Merge remote-tracking branch 'xen-two/linux-next'
8378 $ git diff -M --stat --summary HEAD^..
8379  Documentation/ABI/stable/sysfs-bus-xen-backend     |   75 ++++
8380  .../ABI/stable/sysfs-devices-system-xen_memory     |   77 +++++
8381  arch/ia64/include/asm/xen/interface.h              |    2 +-
8382  arch/x86/xen/Kconfig                               |    3 +-
8383  arch/x86/xen/grant-table.c                         |   44 +++-
8384  drivers/xen/events.c                               |   74 ++++-
8385  drivers/xen/evtchn.c                               |    2 +-
8386  drivers/xen/gntalloc.c                             |   62 +++--
8387  drivers/xen/gntdev.c                               |   31 ++-
8388  drivers/xen/grant-table.c                          |  354 +++++++++++++++++---
8389  include/xen/events.h                               |    7 +
8390  include/xen/grant_table.h                          |   10 +-
8391  include/xen/interface/grant_table.h                |  167 +++++++++-
8392  include/xen/interface/xen.h                        |    2 +
8393  14 files changed, 828 insertions(+), 82 deletions(-)
8394  create mode 100644 Documentation/ABI/stable/sysfs-bus-xen-backend
8395  create mode 100644 Documentation/ABI/stable/sysfs-devices-system-xen_memory
8396 Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
8397 $ git merge xen-pvhvm/linux-next
8398 Already up-to-date.
8399 Merging percpu/for-next (9f57bd4 percpu: fix per_cpu_ptr_to_phys() handling of non-page-aligned addresses)
8400 $ git merge percpu/for-next
8401 Auto-merging mm/percpu.c
8402 Merge made by the 'recursive' strategy.
8403  mm/percpu.c |    6 ++++--
8404  1 files changed, 4 insertions(+), 2 deletions(-)
8405 Merging workqueues/for-next (9c5a2ba workqueue: separate out drain_workqueue() from destroy_workqueue())
8406 $ git merge workqueues/for-next
8407 Already up-to-date.
8408 Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap())
8409 $ git merge sfi/sfi-test
8410 Already up-to-date.
8411 Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs)
8412 $ git merge asm-generic/next
8413 Already up-to-date.
8414 Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch)
8415 $ git merge drivers-x86/linux-next
8416 Already up-to-date.
8417 Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
8418 $ git merge hwpoison/hwpoison
8419 Already up-to-date.
8420 Merging sysctl/master (c2f5631 sysctl: remove impossible condition check)
8421 $ git merge sysctl/master
8422 Auto-merging fs/proc/proc_sysctl.c
8423 Merge made by the 'recursive' strategy.
8424  fs/proc/proc_sysctl.c |   14 ++------------
8425  1 files changed, 2 insertions(+), 12 deletions(-)
8426 Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.)
8427 $ git merge namespace/master
8428 Auto-merging fs/proc/inode.c
8429 Merge made by the 'recursive' strategy.
8430  fs/proc/inode.c      |    6 +-
8431  fs/proc/namespaces.c |  160 +++++++++++++++++++++++++++++++++++++++++++-------
8432  2 files changed, 142 insertions(+), 24 deletions(-)
8433 Merging regmap/for-next (704867e Merge branch 'mfd/da9052' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into regmap-next)
8434 $ git merge regmap/for-next
8435 Resolved 'drivers/base/regmap/regcache.c' using previous resolution.
8436 Resolved 'drivers/base/regmap/regmap.c' using previous resolution.
8437 Auto-merging drivers/mfd/Makefile
8438 Auto-merging drivers/mfd/Kconfig
8439 Auto-merging drivers/base/regmap/regmap.c
8440 CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
8441 Auto-merging drivers/base/regmap/regcache.c
8442 CONFLICT (content): Merge conflict in drivers/base/regmap/regcache.c
8443 Removing drivers/base/regmap/regcache-indexed.c
8444 Auto-merging drivers/base/regmap/internal.h
8445 Automatic merge failed; fix conflicts and then commit the result.
8446 $ git commit -v -a
8447 [master bbe4271] Merge remote-tracking branch 'regmap/for-next'
8448 $ git diff -M --stat --summary HEAD^..
8449  drivers/base/regmap/Makefile           |    3 +-
8450  drivers/base/regmap/internal.h         |    3 -
8451  drivers/base/regmap/regcache-indexed.c |   64 ---
8452  drivers/base/regmap/regcache-lzo.c     |   19 +-
8453  drivers/base/regmap/regcache-rbtree.c  |   61 +++-
8454  drivers/base/regmap/regcache.c         |   65 ++--
8455  drivers/base/regmap/regmap.c           |  134 ++++--
8456  drivers/mfd/Kconfig                    |   28 ++
8457  drivers/mfd/Makefile                   |    5 +
8458  drivers/mfd/da9052-core.c              |  690 +++++++++++++++++++++++++++++
8459  drivers/mfd/da9052-i2c.c               |  140 ++++++
8460  drivers/mfd/da9052-spi.c               |  115 +++++
8461  include/linux/mfd/da9052/da9052.h      |  129 ++++++
8462  include/linux/mfd/da9052/pdata.h       |   40 ++
8463  include/linux/mfd/da9052/reg.h         |  749 ++++++++++++++++++++++++++++++++
8464  include/linux/regmap.h                 |    6 +-
8465  include/trace/events/regmap.h          |    9 +
8466  17 files changed, 2113 insertions(+), 147 deletions(-)
8467  delete mode 100644 drivers/base/regmap/regcache-indexed.c
8468  create mode 100644 drivers/mfd/da9052-core.c
8469  create mode 100644 drivers/mfd/da9052-i2c.c
8470  create mode 100644 drivers/mfd/da9052-spi.c
8471  create mode 100644 include/linux/mfd/da9052/da9052.h
8472  create mode 100644 include/linux/mfd/da9052/pdata.h
8473  create mode 100644 include/linux/mfd/da9052/reg.h
8474 $ git am -3 ../patches/0001-gpio-disable-broken-driver.patch
8475 Applying: gpio: disable broken driver
8476 $ git reset HEAD^
8477 Unstaged changes after reset:
8478 M       drivers/gpio/Kconfig
8479 $ git add .
8480 $ git commit -v -a --amend
8481 [master 9341113] Merge remote-tracking branch 'regmap/for-next'
8482 $ git reset --hard HEAD^
8483 HEAD is now at dc9f855 Merge remote-tracking branch 'namespace/master'
8484 Merging refs/next/20111214/regmap
8485 $ git merge refs/next/20111214/regmap
8486 Resolved 'drivers/base/regmap/regcache.c' using previous resolution.
8487 Resolved 'drivers/base/regmap/regmap.c' using previous resolution.
8488 Auto-merging drivers/base/regmap/regmap.c
8489 CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c
8490 Auto-merging drivers/base/regmap/regcache.c
8491 CONFLICT (content): Merge conflict in drivers/base/regmap/regcache.c
8492 Removing drivers/base/regmap/regcache-indexed.c
8493 Auto-merging drivers/base/regmap/internal.h
8494 Automatic merge failed; fix conflicts and then commit the result.
8495 $ git commit -v -a
8496 [master 9ac4ca3] Merge commit 'refs/next/20111214/regmap'
8497 $ git diff -M --stat --summary HEAD^..
8498  drivers/base/regmap/Makefile           |    3 +-
8499  drivers/base/regmap/internal.h         |    3 -
8500  drivers/base/regmap/regcache-indexed.c |   64 ---------------
8501  drivers/base/regmap/regcache-lzo.c     |   19 +++--
8502  drivers/base/regmap/regcache-rbtree.c  |   61 ++++++++++++++-
8503  drivers/base/regmap/regcache.c         |   65 ++++++++--------
8504  drivers/base/regmap/regmap.c           |  134 +++++++++++++++++++++++---------
8505  include/linux/regmap.h                 |    6 +-
8506  include/trace/events/regmap.h          |    9 ++
8507  9 files changed, 217 insertions(+), 147 deletions(-)
8508  delete mode 100644 drivers/base/regmap/regcache-indexed.c
8509 $ git am -3 ../patches/0001-gpio-disable-broken-driver.patch
8510 Applying: gpio: disable broken driver
8511 $ git reset HEAD^
8512 Unstaged changes after reset:
8513 M       drivers/gpio/Kconfig
8514 $ git add .
8515 $ git commit -v -a --amend
8516 [master ec2f13d] Merge commit 'refs/next/20111214/regmap'
8517 Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt)
8518 $ git merge hsi/for-next
8519 Auto-merging include/linux/Kbuild
8520 Auto-merging drivers/Makefile
8521 Auto-merging drivers/Kconfig
8522 Merge made by the 'recursive' strategy.
8523  Documentation/DocBook/device-drivers.tmpl |   17 +
8524  Documentation/ioctl/ioctl-number.txt      |    1 +
8525  drivers/Kconfig                           |    2 +
8526  drivers/Makefile                          |    1 +
8527  drivers/hsi/Kconfig                       |   19 +
8528  drivers/hsi/Makefile                      |    6 +
8529  drivers/hsi/clients/Kconfig               |   13 +
8530  drivers/hsi/clients/Makefile              |    5 +
8531  drivers/hsi/clients/hsi_char.c            |  802 +++++++++++++++++++++++++++++
8532  drivers/hsi/hsi.c                         |  494 ++++++++++++++++++
8533  drivers/hsi/hsi_boardinfo.c               |   62 +++
8534  drivers/hsi/hsi_core.h                    |   35 ++
8535  include/linux/Kbuild                      |    1 +
8536  include/linux/hsi/Kbuild                  |    1 +
8537  include/linux/hsi/hsi.h                   |  410 +++++++++++++++
8538  include/linux/hsi/hsi_char.h              |   63 +++
8539  16 files changed, 1932 insertions(+), 0 deletions(-)
8540  create mode 100644 drivers/hsi/Kconfig
8541  create mode 100644 drivers/hsi/Makefile
8542  create mode 100644 drivers/hsi/clients/Kconfig
8543  create mode 100644 drivers/hsi/clients/Makefile
8544  create mode 100644 drivers/hsi/clients/hsi_char.c
8545  create mode 100644 drivers/hsi/hsi.c
8546  create mode 100644 drivers/hsi/hsi_boardinfo.c
8547  create mode 100644 drivers/hsi/hsi_core.h
8548  create mode 100644 include/linux/hsi/Kbuild
8549  create mode 100644 include/linux/hsi/hsi.h
8550  create mode 100644 include/linux/hsi/hsi_char.h
8551 Merging driver-core/driver-core-next (cb0c05c xen: fix build breakage in xen-selfballoon.c caused by sysdev conversion)
8552 $ git merge driver-core/driver-core-next
8553 Removing lib/kref.c
8554 Auto-merging lib/Makefile
8555 Auto-merging kernel/time/clocksource.c
8556 Auto-merging include/linux/i2c.h
8557 Auto-merging include/linux/device.h
8558 Auto-merging drivers/uwb/i1480/dfu/usb.c
8559 Auto-merging drivers/usb/storage/ene_ub6250.c
8560 Auto-merging drivers/usb/misc/usbled.c
8561 Auto-merging drivers/usb/host/hwa-hc.c
8562 Auto-merging drivers/staging/media/lirc/lirc_imon.c
8563 Auto-merging drivers/staging/media/go7007/go7007-usb.c
8564 Auto-merging drivers/nfc/pn533.c
8565 Auto-merging drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
8566 Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c
8567 Auto-merging drivers/net/wireless/rndis_wlan.c
8568 Auto-merging drivers/net/usb/smsc95xx.c
8569 Auto-merging drivers/net/usb/smsc75xx.c
8570 Auto-merging drivers/net/usb/lg-vl600.c
8571 Auto-merging drivers/net/usb/cdc_ncm.c
8572 Auto-merging drivers/net/usb/cdc_ether.c
8573 Auto-merging drivers/net/usb/cdc-phonet.c
8574 Auto-merging drivers/net/usb/asix.c
8575 Auto-merging drivers/net/irda/stir4200.c
8576 Auto-merging drivers/media/video/tm6000/tm6000-cards.c
8577 Auto-merging drivers/media/video/gspca/zc3xx.c
8578 Auto-merging drivers/media/video/gspca/xirlink_cit.c
8579 Auto-merging drivers/media/video/gspca/topro.c
8580 Auto-merging drivers/media/video/gspca/spca561.c
8581 Auto-merging drivers/media/video/gspca/sonixj.c
8582 Auto-merging drivers/media/video/gspca/se401.c
8583 Auto-merging drivers/media/video/gspca/pac207.c
8584 Auto-merging drivers/media/video/gspca/ov519.c
8585 Auto-merging drivers/media/video/gspca/nw80x.c
8586 Auto-merging drivers/media/video/gspca/mars.c
8587 Auto-merging drivers/media/video/gspca/konica.c
8588 Auto-merging drivers/media/video/gspca/gl860/gl860.c
8589 Auto-merging drivers/media/video/gspca/benq.c
8590 Auto-merging drivers/media/video/em28xx/em28xx-cards.c
8591 Auto-merging drivers/media/rc/redrat3.c
8592 Auto-merging drivers/media/rc/ati_remote.c
8593 Auto-merging drivers/media/dvb/dvb-usb/ttusb2.c
8594 Auto-merging drivers/media/dvb/dvb-usb/it913x.c
8595 Auto-merging drivers/media/dvb/dvb-usb/dw2102.c
8596 Auto-merging drivers/media/dvb/dvb-usb/anysee.c
8597 Auto-merging drivers/media/dvb/dvb-usb/af9015.c
8598 Auto-merging drivers/input/touchscreen/usbtouchscreen.c
8599 Auto-merging drivers/input/tablet/wacom_sys.c
8600 Auto-merging drivers/input/tablet/aiptek.c
8601 Auto-merging drivers/input/misc/ati_remote2.c
8602 Auto-merging drivers/hid/usbhid/usbkbd.c
8603 Auto-merging drivers/edac/edac_mc_sysfs.c
8604 Auto-merging drivers/bluetooth/btusb.c
8605 Auto-merging drivers/bluetooth/bfusb.c
8606 Auto-merging drivers/bluetooth/ath3k.c
8607 Auto-merging drivers/base/core.c
8608 Auto-merging drivers/Kconfig
8609 Auto-merging MAINTAINERS
8610 Merge made by the 'recursive' strategy.
8611  Documentation/HOWTO                               |    4 +-
8612  Documentation/development-process/5.Posting       |    8 +-
8613  Documentation/driver-model/devres.txt             |    1 +
8614  Documentation/filesystems/debugfs.txt             |   32 +++-
8615  MAINTAINERS                                       |    2 +-
8616  drivers/Kconfig                                   |    4 +-
8617  drivers/base/Makefile                             |    4 +-
8618  drivers/base/base.h                               |   12 +-
8619  drivers/base/bus.c                                |  293 +++++++++++++++++++--
8620  drivers/base/class.c                              |   14 +-
8621  drivers/base/core.c                               |   85 +++++--
8622  drivers/base/devtmpfs.c                           |    3 +-
8623  drivers/base/init.c                               |    1 -
8624  drivers/base/platform.c                           |    2 +-
8625  drivers/base/sys.c                                |   10 +-
8626  drivers/bluetooth/ath3k.c                         |   14 +-
8627  drivers/bluetooth/bcm203x.c                       |   21 +--
8628  drivers/bluetooth/bfusb.c                         |   21 +--
8629  drivers/bluetooth/bpa10x.c                        |   15 +-
8630  drivers/bluetooth/btusb.c                         |   15 +-
8631  drivers/edac/edac_core.h                          |    7 +-
8632  drivers/edac/edac_device.c                        |    1 -
8633  drivers/edac/edac_device_sysfs.c                  |   20 +-
8634  drivers/edac/edac_mc.c                            |    1 -
8635  drivers/edac/edac_mc_sysfs.c                      |   16 +-
8636  drivers/edac/edac_module.h                        |    2 -
8637  drivers/edac/edac_pci.c                           |    1 -
8638  drivers/edac/edac_pci_sysfs.c                     |   16 +-
8639  drivers/edac/edac_stub.c                          |   27 +-
8640  drivers/edac/mce_amd_inj.c                        |   13 +-
8641  drivers/firmware/google/gsmi.c                    |    3 +-
8642  drivers/hid/usbhid/usbkbd.c                       |   17 +--
8643  drivers/hid/usbhid/usbmouse.c                     |   17 +--
8644  drivers/hv/Kconfig                                |    4 +-
8645  drivers/hv/channel_mgmt.c                         |   12 +
8646  drivers/hv/hv.c                                   |    8 +-
8647  drivers/hv/hyperv_vmbus.h                         |    1 +
8648  drivers/hv/vmbus_drv.c                            |   29 ++-
8649  drivers/i2c/busses/i2c-diolan-u2c.c               |   15 +-
8650  drivers/i2c/busses/i2c-tiny-usb.c                 |   15 +-
8651  drivers/input/joystick/xpad.c                     |   13 +-
8652  drivers/input/misc/ati_remote2.c                  |   21 +--
8653  drivers/input/misc/keyspan_remote.c               |   21 +--
8654  drivers/input/misc/powermate.c                    |   13 +-
8655  drivers/input/misc/yealink.c                      |   17 +--
8656  drivers/input/mouse/appletouch.c                  |   13 +-
8657  drivers/input/mouse/bcm5974.c                     |   14 +-
8658  drivers/input/tablet/acecad.c                     |   17 +--
8659  drivers/input/tablet/aiptek.c                     |   19 +--
8660  drivers/input/tablet/gtco.c                       |   28 +--
8661  drivers/input/tablet/hanwang.c                    |   13 +-
8662  drivers/input/tablet/kbtab.c                      |   20 +--
8663  drivers/input/tablet/wacom_sys.c                  |   19 +--
8664  drivers/input/touchscreen/usbtouchscreen.c        |   13 +-
8665  drivers/isdn/hardware/mISDN/hfcsusb.c             |   28 +--
8666  drivers/media/dvb/b2c2/flexcop-usb.c              |   20 +--
8667  drivers/media/dvb/dvb-usb/a800.c                  |   21 +--
8668  drivers/media/dvb/dvb-usb/af9015.c                |   20 +--
8669  drivers/media/dvb/dvb-usb/anysee.c                |   21 +--
8670  drivers/media/dvb/dvb-usb/au6610.c                |   21 +--
8671  drivers/media/dvb/dvb-usb/az6027.c                |   23 +--
8672  drivers/media/dvb/dvb-usb/ce6230.c                |   22 +--
8673  drivers/media/dvb/dvb-usb/cinergyT2-core.c        |   20 +--
8674  drivers/media/dvb/dvb-usb/cxusb.c                 |   21 +--
8675  drivers/media/dvb/dvb-usb/dib0700_core.c          |   22 +--
8676  drivers/media/dvb/dvb-usb/dibusb-mb.c             |   21 +--
8677  drivers/media/dvb/dvb-usb/dibusb-mc.c             |   21 +--
8678  drivers/media/dvb/dvb-usb/digitv.c                |   21 +--
8679  drivers/media/dvb/dvb-usb/dtt200u.c               |   21 +--
8680  drivers/media/dvb/dvb-usb/dtv5100.c               |   21 +--
8681  drivers/media/dvb/dvb-usb/dw2102.c                |   17 +--
8682  drivers/media/dvb/dvb-usb/ec168.c                 |   22 +--
8683  drivers/media/dvb/dvb-usb/friio.c                 |   23 +--
8684  drivers/media/dvb/dvb-usb/gl861.c                 |   21 +--
8685  drivers/media/dvb/dvb-usb/gp8psk.c                |   21 +--
8686  drivers/media/dvb/dvb-usb/it913x.c                |   21 +--
8687  drivers/media/dvb/dvb-usb/lmedm04.c               |   21 +--
8688  drivers/media/dvb/dvb-usb/m920x.c                 |   22 +--
8689  drivers/media/dvb/dvb-usb/mxl111sf.c              |   19 +--
8690  drivers/media/dvb/dvb-usb/nova-t-usb2.c           |   21 +--
8691  drivers/media/dvb/dvb-usb/opera1.c                |   17 +--
8692  drivers/media/dvb/dvb-usb/pctv452e.c              |   17 +--
8693  drivers/media/dvb/dvb-usb/technisat-usb2.c        |   20 +--
8694  drivers/media/dvb/dvb-usb/ttusb2.c                |   21 +--
8695  drivers/media/dvb/dvb-usb/umt-010.c               |   21 +--
8696  drivers/media/dvb/dvb-usb/vp702x.c                |   21 +--
8697  drivers/media/dvb/dvb-usb/vp7045.c                |   21 +--
8698  drivers/media/dvb/siano/smsusb.c                  |   21 +--
8699  drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c |   21 +--
8700  drivers/media/dvb/ttusb-dec/ttusb_dec.c           |   21 +--
8701  drivers/media/radio/dsbr100.c                     |   16 +-
8702  drivers/media/radio/radio-mr800.c                 |   23 +--
8703  drivers/media/radio/si470x/radio-si470x-usb.c     |   28 +--
8704  drivers/media/rc/ati_remote.c                     |   33 +---
8705  drivers/media/rc/imon.c                           |   21 +--
8706  drivers/media/rc/mceusb.c                         |   20 +--
8707  drivers/media/rc/redrat3.c                        |   20 +--
8708  drivers/media/rc/streamzap.c                      |   28 +--
8709  drivers/media/video/cx231xx/cx231xx-cards.c       |   24 +--
8710  drivers/media/video/em28xx/em28xx-cards.c         |   24 +--
8711  drivers/media/video/et61x251/et61x251_core.c      |   25 +--
8712  drivers/media/video/gspca/benq.c                  |   13 +-
8713  drivers/media/video/gspca/conex.c                 |   13 +-
8714  drivers/media/video/gspca/cpia1.c                 |   13 +-
8715  drivers/media/video/gspca/etoms.c                 |   14 +-
8716  drivers/media/video/gspca/finepix.c               |   14 +-
8717  drivers/media/video/gspca/gl860/gl860.c           |   17 +--
8718  drivers/media/video/gspca/jeilinj.c               |   14 +-
8719  drivers/media/video/gspca/kinect.c                |   14 +-
8720  drivers/media/video/gspca/konica.c                |   13 +-
8721  drivers/media/video/gspca/m5602/m5602_core.c      |   14 +-
8722  drivers/media/video/gspca/mars.c                  |   13 +-
8723  drivers/media/video/gspca/mr97310a.c              |   13 +-
8724  drivers/media/video/gspca/nw80x.c                 |   13 +-
8725  drivers/media/video/gspca/ov519.c                 |   13 +-
8726  drivers/media/video/gspca/ov534.c                 |   14 +-
8727  drivers/media/video/gspca/ov534_9.c               |   14 +-
8728  drivers/media/video/gspca/pac207.c                |   13 +-
8729  drivers/media/video/gspca/pac7302.c               |   13 +-
8730  drivers/media/video/gspca/pac7311.c               |   13 +-
8731  drivers/media/video/gspca/se401.c                 |   13 +-
8732  drivers/media/video/gspca/sn9c2028.c              |   14 +-
8733  drivers/media/video/gspca/sn9c20x.c               |   13 +-
8734  drivers/media/video/gspca/sonixb.c                |   13 +-
8735  drivers/media/video/gspca/sonixj.c                |   13 +-
8736  drivers/media/video/gspca/spca1528.c              |   13 +-
8737  drivers/media/video/gspca/spca500.c               |   13 +-
8738  drivers/media/video/gspca/spca501.c               |   13 +-
8739  drivers/media/video/gspca/spca505.c               |   13 +-
8740  drivers/media/video/gspca/spca506.c               |   19 +--
8741  drivers/media/video/gspca/spca508.c               |   13 +-
8742  drivers/media/video/gspca/spca561.c               |   13 +-
8743  drivers/media/video/gspca/sq905.c                 |   14 +-
8744  drivers/media/video/gspca/sq905c.c                |   14 +-
8745  drivers/media/video/gspca/sq930x.c                |   13 +-
8746  drivers/media/video/gspca/stk014.c                |   13 +-
8747  drivers/media/video/gspca/stv0680.c               |   13 +-
8748  drivers/media/video/gspca/stv06xx/stv06xx.c       |   13 +-
8749  drivers/media/video/gspca/sunplus.c               |   13 +-
8750  drivers/media/video/gspca/t613.c                  |   13 +-
8751  drivers/media/video/gspca/topro.c                 |   13 +-
8752  drivers/media/video/gspca/tv8532.c                |   14 +-
8753  drivers/media/video/gspca/vc032x.c                |   13 +-
8754  drivers/media/video/gspca/vicam.c                 |   14 +-
8755  drivers/media/video/gspca/xirlink_cit.c           |   13 +-
8756  drivers/media/video/gspca/zc3xx.c                 |   13 +-
8757  drivers/media/video/hdpvr/hdpvr-core.c            |   21 +--
8758  drivers/media/video/s2255drv.c                    |   20 +--
8759  drivers/media/video/sn9c102/sn9c102_core.c        |   25 +--
8760  drivers/media/video/stk-webcam.c                  |   23 +--
8761  drivers/media/video/tm6000/tm6000-cards.c         |   26 +--
8762  drivers/media/video/zr364xx.c                     |   23 +--
8763  drivers/mmc/host/ushc.c                           |   12 +-
8764  drivers/mtd/nand/alauda.c                         |   13 +-
8765  drivers/net/can/usb/ems_usb.c                     |   26 +--
8766  drivers/net/can/usb/esd_usb2.c                    |   23 +--
8767  drivers/net/irda/irda-usb.c                       |   35 +---
8768  drivers/net/irda/kingsun-sir.c                    |   19 +--
8769  drivers/net/irda/ks959-sir.c                      |   21 +--
8770  drivers/net/irda/ksdazzle-sir.c                   |   21 +--
8771  drivers/net/irda/mcs7780.c                        |   23 +--
8772  drivers/net/irda/stir4200.c                       |   19 +--
8773  drivers/net/usb/asix.c                            |   12 +-
8774  drivers/net/usb/catc.c                            |   17 +--
8775  drivers/net/usb/cdc-phonet.c                      |   13 +-
8776  drivers/net/usb/cdc_eem.c                         |   13 +-
8777  drivers/net/usb/cdc_ether.c                       |   19 +-
8778  drivers/net/usb/cdc_ncm.c                         |   15 +-
8779  drivers/net/usb/cdc_subset.c                      |   12 +-
8780  drivers/net/usb/cx82310_eth.c                     |   12 +-
8781  drivers/net/usb/dm9601.c                          |   13 +-
8782  drivers/net/usb/gl620a.c                          |   12 +-
8783  drivers/net/usb/int51x1.c                         |   12 +-
8784  drivers/net/usb/ipheth.c                          |   20 +--
8785  drivers/net/usb/kalmia.c                          |   12 +-
8786  drivers/net/usb/kaweth.c                          |   30 +--
8787  drivers/net/usb/lg-vl600.c                        |   12 +-
8788  drivers/net/usb/mcs7830.c                         |   12 +-
8789  drivers/net/usb/net1080.c                         |   12 +-
8790  drivers/net/usb/plusb.c                           |   12 +-
8791  drivers/net/usb/rndis_host.c                      |   12 +-
8792  drivers/net/usb/rtl8150.c                         |   15 +-
8793  drivers/net/usb/sierra_net.c                      |   19 +-
8794  drivers/net/usb/smsc75xx.c                        |   12 +-
8795  drivers/net/usb/smsc95xx.c                        |   12 +-
8796  drivers/net/usb/zaurus.c                          |   12 +-
8797  drivers/net/wireless/ath/carl9170/usb.c           |   13 +-
8798  drivers/net/wireless/libertas/if_usb.c            |   24 +--
8799  drivers/net/wireless/libertas_tf/if_usb.c         |   22 +--
8800  drivers/net/wireless/orinoco/orinoco_usb.c        |   27 +--
8801  drivers/net/wireless/p54/p54usb.c                 |   13 +-
8802  drivers/net/wireless/rndis_wlan.c                 |   12 +-
8803  drivers/net/wireless/rt2x00/rt2500usb.c           |   13 +-
8804  drivers/net/wireless/rt2x00/rt2800usb.c           |   13 +-
8805  drivers/net/wireless/rt2x00/rt73usb.c             |   13 +-
8806  drivers/net/wireless/rtl818x/rtl8187/dev.c        |   13 +-
8807  drivers/net/wireless/rtlwifi/rtl8192cu/sw.c       |   13 +-
8808  drivers/net/wireless/zd1201.c                     |   13 +-
8809  drivers/nfc/pn533.c                               |   19 +--
8810  drivers/platform/x86/ibm_rtl.c                    |   34 ++--
8811  drivers/staging/frontier/alphatrack.c             |   28 +--
8812  drivers/staging/frontier/tranzport.c              |   27 +--
8813  drivers/staging/ft1000/ft1000-usb/ft1000_usb.c    |   22 +--
8814  drivers/staging/iio/accel/adis16201_core.c        |   13 +-
8815  drivers/staging/iio/accel/adis16203_core.c        |   13 +-
8816  drivers/staging/iio/accel/adis16204_core.c        |   13 +-
8817  drivers/staging/iio/accel/adis16209_core.c        |   13 +-
8818  drivers/staging/iio/accel/adis16220_core.c        |   13 +-
8819  drivers/staging/iio/accel/adis16240_core.c        |   13 +-
8820  drivers/staging/iio/accel/kxsd9.c                 |   13 +-
8821  drivers/staging/iio/accel/lis3l02dq_core.c        |   13 +-
8822  drivers/staging/iio/accel/sca3000_core.c          |   13 +-
8823  drivers/staging/iio/adc/ad7192.c                  |   13 +-
8824  drivers/staging/iio/adc/ad7280a.c                 |   13 +-
8825  drivers/staging/iio/adc/ad7291.c                  |   14 +-
8826  drivers/staging/iio/adc/ad7298_core.c             |   13 +-
8827  drivers/staging/iio/adc/ad7476_core.c             |   13 +-
8828  drivers/staging/iio/adc/ad7606_spi.c              |   13 +-
8829  drivers/staging/iio/adc/ad7780.c                  |   13 +-
8830  drivers/staging/iio/adc/ad7793.c                  |   13 +-
8831  drivers/staging/iio/adc/ad7816.c                  |   14 +-
8832  drivers/staging/iio/adc/ad7887_core.c             |   13 +-
8833  drivers/staging/iio/adc/ad799x_core.c             |   14 +-
8834  drivers/staging/iio/adc/adt7310.c                 |   14 +-
8835  drivers/staging/iio/adc/adt7410.c                 |   14 +-
8836  drivers/staging/iio/adc/max1363_core.c            |   14 +-
8837  drivers/staging/iio/addac/adt7316-i2c.c           |   14 +-
8838  drivers/staging/iio/addac/adt7316-spi.c           |   14 +-
8839  drivers/staging/iio/cdc/ad7150.c                  |   14 +-
8840  drivers/staging/iio/cdc/ad7152.c                  |   14 +-
8841  drivers/staging/iio/cdc/ad7746.c                  |   14 +-
8842  drivers/staging/iio/dac/ad5064.c                  |   13 +-
8843  drivers/staging/iio/dac/ad5360.c                  |   13 +-
8844  drivers/staging/iio/dac/ad5446.c                  |   13 +-
8845  drivers/staging/iio/dac/ad5504.c                  |   13 +-
8846  drivers/staging/iio/dac/ad5624r_spi.c             |   13 +-
8847  drivers/staging/iio/dac/ad5686.c                  |   13 +-
8848  drivers/staging/iio/dac/ad5791.c                  |   13 +-
8849  drivers/staging/iio/dac/max517.c                  |   14 +-
8850  drivers/staging/iio/dds/ad5930.c                  |   13 +-
8851  drivers/staging/iio/dds/ad9832.c                  |   13 +-
8852  drivers/staging/iio/dds/ad9834.c                  |   13 +-
8853  drivers/staging/iio/dds/ad9850.c                  |   13 +-
8854  drivers/staging/iio/dds/ad9852.c                  |   13 +-
8855  drivers/staging/iio/dds/ad9910.c                  |   13 +-
8856  drivers/staging/iio/dds/ad9951.c                  |   13 +-
8857  drivers/staging/iio/gyro/adis16080_core.c         |   13 +-
8858  drivers/staging/iio/gyro/adis16130_core.c         |   13 +-
8859  drivers/staging/iio/gyro/adis16260_core.c         |   13 +-
8860  drivers/staging/iio/gyro/adxrs450_core.c          |   13 +-
8861  drivers/staging/iio/impedance-analyzer/ad5933.c   |   13 +-
8862  drivers/staging/iio/imu/adis16400_core.c          |   13 +-
8863  drivers/staging/iio/light/isl29018.c              |   14 +-
8864  drivers/staging/iio/light/tsl2563.c               |   14 +-
8865  drivers/staging/iio/light/tsl2583.c               |   14 +-
8866  drivers/staging/iio/magnetometer/ak8975.c         |   14 +-
8867  drivers/staging/iio/magnetometer/hmc5843.c        |   14 +-
8868  drivers/staging/iio/meter/ade7753.c               |   13 +-
8869  drivers/staging/iio/meter/ade7754.c               |   13 +-
8870  drivers/staging/iio/meter/ade7758_core.c          |   13 +-
8871  drivers/staging/iio/meter/ade7759.c               |   13 +-
8872  drivers/staging/iio/meter/ade7854-i2c.c           |   14 +-
8873  drivers/staging/iio/meter/ade7854-spi.c           |   13 +-
8874  drivers/staging/iio/resolver/ad2s1200.c           |   13 +-
8875  drivers/staging/iio/resolver/ad2s1210.c           |   13 +-
8876  drivers/staging/iio/resolver/ad2s90.c             |   13 +-
8877  drivers/staging/keucr/usb.c                       |   24 +--
8878  drivers/staging/media/go7007/go7007-usb.c         |   15 +-
8879  drivers/staging/media/lirc/lirc_igorplugusb.c     |   21 +--
8880  drivers/staging/media/lirc/lirc_imon.c            |   24 +--
8881  drivers/staging/media/lirc/lirc_sasem.c           |   25 +--
8882  drivers/staging/media/lirc/lirc_ttusbir.c         |   22 +--
8883  drivers/staging/rts5139/rts51x.c                  |   32 +---
8884  drivers/staging/vt6656/main_usb.c                 |   14 +-
8885  drivers/staging/winbond/wbusb.c                   |   13 +-
8886  drivers/staging/wlan-ng/prism2usb.c               |   14 +-
8887  drivers/uio/uio_pdrv.c                            |   12 +-
8888  drivers/uio/uio_pdrv_genirq.c                     |   13 +-
8889  drivers/uio/uio_pruss.c                           |   14 +-
8890  drivers/usb/atm/cxacru.c                          |   13 +-
8891  drivers/usb/atm/speedtch.c                        |   17 +--
8892  drivers/usb/atm/ueagle-atm.c                      |   31 +--
8893  drivers/usb/class/cdc-wdm.c                       |   19 +--
8894  drivers/usb/class/usblp.c                         |   13 +-
8895  drivers/usb/class/usbtmc.c                        |   17 +--
8896  drivers/usb/dwc3/debugfs.c                        |   16 +-
8897  drivers/usb/host/hwa-hc.c                         |   13 +-
8898  drivers/usb/image/microtek.c                      |   14 +-
8899  drivers/usb/misc/adutux.c                         |   35 +---
8900  drivers/usb/misc/cypress_cy7c63.c                 |   22 +--
8901  drivers/usb/misc/cytherm.c                        |   26 +--
8902  drivers/usb/misc/emi26.c                          |   13 +-
8903  drivers/usb/misc/emi62.c                          |   17 +--
8904  drivers/usb/misc/idmouse.c                        |   24 +--
8905  drivers/usb/misc/iowarrior.c                      |   13 +-
8906  drivers/usb/misc/isight_firmware.c                |   13 +-
8907  drivers/usb/misc/ldusb.c                          |   27 +--
8908  drivers/usb/misc/legousbtower.c                   |   46 +----
8909  drivers/usb/misc/rio500.c                         |   28 +--
8910  drivers/usb/misc/trancevibrator.c                 |   21 +--
8911  drivers/usb/misc/usblcd.c                         |   20 +--
8912  drivers/usb/misc/usbled.c                         |   18 +--
8913  drivers/usb/misc/usbsevseg.c                      |   18 +--
8914  drivers/usb/misc/yurex.c                          |   22 +--
8915  drivers/usb/storage/alauda.c                      |   13 +-
8916  drivers/usb/storage/cypress_atacb.c               |   13 +-
8917  drivers/usb/storage/datafab.c                     |   13 +-
8918  drivers/usb/storage/ene_ub6250.c                  |   13 +-
8919  drivers/usb/storage/freecom.c                     |   13 +-
8920  drivers/usb/storage/isd200.c                      |   13 +-
8921  drivers/usb/storage/jumpshot.c                    |   13 +-
8922  drivers/usb/storage/karma.c                       |   13 +-
8923  drivers/usb/storage/onetouch.c                    |   13 +-
8924  drivers/usb/storage/realtek_cr.c                  |   13 +-
8925  drivers/usb/storage/sddr09.c                      |   13 +-
8926  drivers/usb/storage/sddr55.c                      |   13 +-
8927  drivers/usb/storage/shuttle_usbat.c               |   13 +-
8928  drivers/usb/storage/uas.c                         |   13 +-
8929  drivers/usb/usb-skeleton.c                        |   21 +--
8930  drivers/usb/wusbcore/cbaf.c                       |   12 +-
8931  drivers/uwb/hwa-rc.c                              |   12 +-
8932  drivers/uwb/i1480/dfu/usb.c                       |   20 +--
8933  drivers/video/smscufx.c                           |   19 +--
8934  drivers/video/udlfb.c                             |   19 +--
8935  drivers/w1/masters/ds2490.c                       |   21 +--
8936  drivers/w1/slaves/w1_therm.c                      |   36 +++-
8937  drivers/w1/w1.c                                   |   10 +
8938  drivers/watchdog/pcwd_usb.c                       |   35 +---
8939  drivers/xen/xen-balloon.c                         |   86 +++---
8940  drivers/xen/xen-selfballoon.c                     |   76 +++---
8941  fs/debugfs/file.c                                 |   91 +++++++
8942  include/linux/debugfs.h                           |   26 ++
8943  include/linux/device.h                            |  102 +++++++-
8944  include/linux/edac.h                              |    8 +-
8945  include/linux/i2c.h                               |   13 +
8946  include/linux/kref.h                              |   77 +++++-
8947  include/linux/platform_device.h                   |   14 +-
8948  include/linux/spi/spi.h                           |   11 +
8949  include/linux/usb.h                               |   12 +
8950  include/xen/balloon.h                             |    6 +-
8951  kernel/rtmutex-tester.c                           |   37 ++--
8952  kernel/time/clocksource.c                         |   37 ++--
8953  lib/Makefile                                      |    2 +-
8954  lib/devres.c                                      |   55 ++++-
8955  lib/kobject_uevent.c                              |    3 +
8956  lib/kref.c                                        |   97 -------
8957  sound/usb/6fire/chip.c                            |   15 +-
8958  sound/usb/caiaq/device.c                          |   13 +-
8959  sound/usb/misc/ua101.c                            |   14 +-
8960  sound/usb/usx2y/us122l.c                          |   14 +-
8961  sound/usb/usx2y/usbusx2y.c                        |   13 +-
8962  351 files changed, 1374 insertions(+), 5091 deletions(-)
8963  delete mode 100644 lib/kref.c
8964 Merging tty/tty-next (6485163 serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.)
8965 $ git merge tty/tty-next
8966 Resolved 'drivers/tty/serial/Kconfig' using previous resolution.
8967 Resolved 'drivers/tty/serial/Makefile' using previous resolution.
8968 Auto-merging include/linux/serial_core.h
8969 Auto-merging drivers/tty/serial/pch_uart.c
8970 Auto-merging drivers/tty/serial/Makefile
8971 CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
8972 Auto-merging drivers/tty/serial/Kconfig
8973 CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
8974 Auto-merging arch/x86/kernel/early_printk.c
8975 Auto-merging arch/x86/include/asm/mrst.h
8976 Automatic merge failed; fix conflicts and then commit the result.
8977 $ git commit -v -a
8978 [master fc89d0a] Merge remote-tracking branch 'tty/tty-next'
8979 $ git diff -M --stat --summary HEAD^..
8980  arch/powerpc/kernel/legacy_serial.c        |    3 +
8981  arch/x86/include/asm/mrst.h                |    2 +-
8982  arch/x86/kernel/early_printk.c             |    2 +-
8983  arch/x86/platform/mrst/early_printk_mrst.c |   16 +-
8984  drivers/parport/parport_ax88796.c          |   13 +-
8985  drivers/parport/parport_sunbpp.c           |   13 +-
8986  drivers/tty/n_hdlc.c                       |    6 +-
8987  drivers/tty/n_tty.c                        |    8 +-
8988  drivers/tty/pty.c                          |   26 +-
8989  drivers/tty/serial/8250.c                  |   98 ++---
8990  drivers/tty/serial/8250.h                  |   26 +
8991  drivers/tty/serial/8250_dw.c               |   12 +-
8992  drivers/tty/serial/8250_fsl.c              |   63 +++
8993  drivers/tty/serial/8250_pci.c              |   31 ++-
8994  drivers/tty/serial/Kconfig                 |   38 ++-
8995  drivers/tty/serial/Makefile                |    2 +
8996  drivers/tty/serial/atmel_serial.c          |    7 +-
8997  drivers/tty/serial/bfin_sport_uart.c       |   22 +-
8998  drivers/tty/serial/bfin_sport_uart.h       |    5 +-
8999  drivers/tty/serial/bfin_uart.c             |   83 ++--
9000  drivers/tty/serial/ifx6x60.c               |    1 -
9001  drivers/tty/serial/imx.c                   |    2 +-
9002  drivers/tty/serial/max3100.c               |    1 -
9003  drivers/tty/serial/max3107-aava.c          |    1 -
9004  drivers/tty/serial/max3107.c               |    1 -
9005  drivers/tty/serial/mfd.c                   |   18 +-
9006  drivers/tty/serial/mrst_max3110.c          |    1 -
9007  drivers/tty/serial/msm_serial_hs.c         |   23 +-
9008  drivers/tty/serial/mxs-auart.c             |    5 +-
9009  drivers/tty/serial/omap-serial.c           |    2 +-
9010  drivers/tty/serial/pch_uart.c              |  160 ++++++-
9011  drivers/tty/serial/sc26xx.c                |   14 +-
9012  drivers/tty/serial/serial_core.c           |  323 +++++++-----
9013  drivers/tty/serial/serial_cs.c             |    8 +-
9014  drivers/tty/serial/sirfsoc_uart.c          |  783 ++++++++++++++++++++++++++++
9015  drivers/tty/serial/sirfsoc_uart.h          |  185 +++++++
9016  drivers/tty/serial/timbuart.c              |   15 +-
9017  drivers/tty/serial/vr41xx_siu.c            |   13 +-
9018  drivers/tty/tty_io.c                       |  309 +++++++-----
9019  drivers/tty/tty_ldisc.c                    |   22 +-
9020  include/linux/serial_8250.h                |    5 +
9021  include/linux/serial_core.h                |  100 +---
9022  42 files changed, 1834 insertions(+), 634 deletions(-)
9023  create mode 100644 drivers/tty/serial/8250_fsl.c
9024  create mode 100644 drivers/tty/serial/sirfsoc_uart.c
9025  create mode 100644 drivers/tty/serial/sirfsoc_uart.h
9026 Merging usb/usb-next (121a8cd Merge branch 'for-next/gadget' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next)
9027 $ git merge usb/usb-next
9028 Auto-merging include/linux/usb.h
9029 Auto-merging drivers/usb/storage/shuttle_usbat.c
9030 Auto-merging drivers/usb/storage/sddr55.c
9031 Auto-merging drivers/usb/storage/sddr09.c
9032 Auto-merging drivers/usb/storage/realtek_cr.c
9033 Auto-merging drivers/usb/storage/onetouch.c
9034 Auto-merging drivers/usb/storage/karma.c
9035 Auto-merging drivers/usb/storage/jumpshot.c
9036 Auto-merging drivers/usb/storage/isd200.c
9037 Auto-merging drivers/usb/storage/freecom.c
9038 Auto-merging drivers/usb/storage/ene_ub6250.c
9039 Auto-merging drivers/usb/storage/datafab.c
9040 Auto-merging drivers/usb/storage/cypress_atacb.c
9041 Auto-merging drivers/usb/storage/alauda.c
9042 Removing drivers/usb/serial/ChangeLog.history
9043 Auto-merging drivers/usb/renesas_usbhs/mod_host.c
9044 Auto-merging drivers/usb/renesas_usbhs/mod.c
9045 Auto-merging drivers/usb/renesas_usbhs/fifo.c
9046 Auto-merging drivers/usb/otg/fsl_otg.c
9047 Auto-merging drivers/usb/musb/ux500_dma.c
9048 Auto-merging drivers/usb/misc/isight_firmware.c
9049 Auto-merging drivers/usb/host/ohci-au1xxx.c
9050 Auto-merging drivers/usb/host/imx21-hcd.c
9051 Auto-merging drivers/usb/host/hwa-hc.c
9052 Auto-merging drivers/usb/gadget/f_mass_storage.c
9053 Auto-merging drivers/usb/gadget/at91_udc.c
9054 Auto-merging drivers/usb/gadget/Kconfig
9055 Auto-merging drivers/usb/dwc3/debugfs.c
9056 Auto-merging drivers/usb/class/cdc-acm.c
9057 Auto-merging arch/arm/mach-omap2/board-n8x0.c
9058 Auto-merging Documentation/kernel-parameters.txt
9059 Auto-merging Documentation/feature-removal-schedule.txt
9060 Merge made by the 'recursive' strategy.
9061  Documentation/ABI/testing/sysfs-bus-usb    |   25 +
9062  Documentation/feature-removal-schedule.txt |   14 +
9063  Documentation/kernel-parameters.txt        |    4 +
9064  arch/arm/mach-omap2/board-n8x0.c           |    2 +-
9065  drivers/hv/hv_kvp.c                        |   10 +-
9066  drivers/usb/Makefile                       |    3 +-
9067  drivers/usb/c67x00/c67x00-drv.c            |   15 +-
9068  drivers/usb/c67x00/c67x00-hcd.c            |    1 -
9069  drivers/usb/class/cdc-acm.c                |  334 ++++++-----
9070  drivers/usb/class/cdc-acm.h                |    1 +
9071  drivers/usb/core/devio.c                   |  186 ++++--
9072  drivers/usb/core/driver.c                  |    8 +-
9073  drivers/usb/core/hcd-pci.c                 |    4 -
9074  drivers/usb/core/hcd.c                     |   31 +-
9075  drivers/usb/core/hub.c                     |   89 ++--
9076  drivers/usb/core/usb.h                     |   14 -
9077  drivers/usb/dwc3/Kconfig                   |    5 +-
9078  drivers/usb/dwc3/Makefile                  |    6 +-
9079  drivers/usb/dwc3/core.c                    |  209 +++++-
9080  drivers/usb/dwc3/core.h                    |   62 ++-
9081  drivers/usb/dwc3/debugfs.c                 |   83 +++-
9082  drivers/usb/dwc3/dwc3-omap.c               |   43 +-
9083  drivers/usb/dwc3/dwc3-pci.c                |   49 +--
9084  drivers/usb/dwc3/ep0.c                     |  160 ++++--
9085  drivers/usb/dwc3/gadget.c                  |  199 +++++--
9086  drivers/usb/dwc3/gadget.h                  |   29 +-
9087  drivers/usb/dwc3/host.c                    |  102 +++
9088  drivers/usb/dwc3/io.h                      |    2 +-
9089  drivers/usb/gadget/Kconfig                 |   14 +-
9090  drivers/usb/gadget/amd5536udc.c            |    4 +-
9091  drivers/usb/gadget/at91_udc.c              |    2 +-
9092  drivers/usb/gadget/atmel_usba_udc.c        |    2 +-
9093  drivers/usb/gadget/ci13xxx_udc.c           |   36 +-
9094  drivers/usb/gadget/ci13xxx_udc.h           |    2 +-
9095  drivers/usb/gadget/composite.c             |    8 +-
9096  drivers/usb/gadget/dbgp.c                  |    2 +-
9097  drivers/usb/gadget/dummy_hcd.c             |   15 +-
9098  drivers/usb/gadget/epautoconf.c            |    6 +-
9099  drivers/usb/gadget/f_fs.c                  |    2 +-
9100  drivers/usb/gadget/f_mass_storage.c        |   60 +-
9101  drivers/usb/gadget/file_storage.c          |   64 ++-
9102  drivers/usb/gadget/fsl_qe_udc.c            |   19 +-
9103  drivers/usb/gadget/fsl_udc_core.c          |    4 +-
9104  drivers/usb/gadget/fusb300_udc.c           |    4 +-
9105  drivers/usb/gadget/goku_udc.c              |    3 +-
9106  drivers/usb/gadget/imx_udc.c               |    2 +-
9107  drivers/usb/gadget/inode.c                 |    6 +-
9108  drivers/usb/gadget/langwell_udc.c          |    2 +-
9109  drivers/usb/gadget/m66592-udc.c            |    4 +-
9110  drivers/usb/gadget/mv_udc.h                |    5 +-
9111  drivers/usb/gadget/mv_udc_core.c           |  160 ++++--
9112  drivers/usb/gadget/net2272.c               |    4 +-
9113  drivers/usb/gadget/net2280.c               |    4 +-
9114  drivers/usb/gadget/omap_udc.c              |    3 +-
9115  drivers/usb/gadget/pch_udc.c               |    4 +-
9116  drivers/usb/gadget/printer.c               |    6 +-
9117  drivers/usb/gadget/pxa25x_udc.c            |    2 +-
9118  drivers/usb/gadget/pxa27x_udc.c            |    2 +-
9119  drivers/usb/gadget/r8a66597-udc.c          |    4 +-
9120  drivers/usb/gadget/s3c-hsotg.c             |   17 +-
9121  drivers/usb/gadget/s3c-hsudc.c             |   19 +-
9122  drivers/usb/gadget/s3c2410_udc.c           |    4 +-
9123  drivers/usb/gadget/udc-core.c              |   26 +-
9124  drivers/usb/gadget/usbstring.c             |   73 +--
9125  drivers/usb/host/ehci-au1xxx.c             |    1 +
9126  drivers/usb/host/ehci-hcd.c                |   64 ++-
9127  drivers/usb/host/ehci-octeon.c             |    2 +
9128  drivers/usb/host/ehci-omap.c               |    2 +
9129  drivers/usb/host/ehci-ps3.c                |   30 +
9130  drivers/usb/host/ehci-pxa168.c             |    2 +-
9131  drivers/usb/host/ehci-q.c                  |   13 +-
9132  drivers/usb/host/ehci-s5p.c                |    4 +-
9133  drivers/usb/host/ehci-vt8500.c             |    2 +
9134  drivers/usb/host/ehci-w90x900.c            |    2 +
9135  drivers/usb/host/ehci-xls.c                |    2 +-
9136  drivers/usb/host/fhci-hcd.c                |   12 +-
9137  drivers/usb/host/fsl-mph-dr-of.c           |   12 +-
9138  drivers/usb/host/hwa-hc.c                  |    1 -
9139  drivers/usb/host/imx21-hcd.c               |   13 +-
9140  drivers/usb/host/isp1760-hcd.c             |   74 +--
9141  drivers/usb/host/isp1760-if.c              |    6 +-
9142  drivers/usb/host/ohci-au1xxx.c             |    5 +-
9143  drivers/usb/host/ohci-dbg.c                |   18 +-
9144  drivers/usb/host/ohci-ep93xx.c             |    2 -
9145  drivers/usb/host/ohci-hcd.c                |   28 +-
9146  drivers/usb/host/ohci-hub.c                |    7 +-
9147  drivers/usb/host/ohci-omap.c               |    1 -
9148  drivers/usb/host/ohci-pci.c                |    5 +-
9149  drivers/usb/host/ohci-pxa27x.c             |    2 -
9150  drivers/usb/host/ohci-q.c                  |    8 +-
9151  drivers/usb/host/ohci-s3c2410.c            |   55 ++-
9152  drivers/usb/host/ohci-sh.c                 |    1 -
9153  drivers/usb/host/ohci-sm501.c              |    1 -
9154  drivers/usb/host/ohci-spear.c              |    1 -
9155  drivers/usb/host/ohci-tmio.c               |    3 -
9156  drivers/usb/host/ohci-xls.c                |    2 +-
9157  drivers/usb/host/ohci.h                    |   14 +-
9158  drivers/usb/host/oxu210hp-hcd.c            |   19 +-
9159  drivers/usb/host/uhci-q.c                  |    2 +-
9160  drivers/usb/host/whci/qset.c               |    4 +-
9161  drivers/usb/host/xhci-hub.c                |   18 +-
9162  drivers/usb/host/xhci-ring.c               |   16 +-
9163  drivers/usb/misc/isight_firmware.c         |    6 +-
9164  drivers/usb/misc/usbtest.c                 |    1 -
9165  drivers/usb/musb/Kconfig                   |   59 +-
9166  drivers/usb/musb/Makefile                  |   26 +-
9167  drivers/usb/musb/musb_core.c               |    6 +-
9168  drivers/usb/musb/musb_core.h               |    4 +-
9169  drivers/usb/musb/musb_debugfs.c            |    8 -
9170  drivers/usb/musb/musb_gadget.c             |    6 +-
9171  drivers/usb/musb/musb_gadget_ep0.c         |    1 -
9172  drivers/usb/musb/musb_io.h                 |    2 +-
9173  drivers/usb/musb/omap2430.c                |   24 +-
9174  drivers/usb/musb/tusb6010.c                |    1 +
9175  drivers/usb/musb/ux500_dma.c               |   39 +-
9176  drivers/usb/otg/fsl_otg.c                  |   13 +-
9177  drivers/usb/renesas_usbhs/common.c         |   52 +-
9178  drivers/usb/renesas_usbhs/common.h         |    9 +-
9179  drivers/usb/renesas_usbhs/fifo.c           |    9 +-
9180  drivers/usb/renesas_usbhs/fifo.h           |    3 +-
9181  drivers/usb/renesas_usbhs/mod.c            |    4 +-
9182  drivers/usb/renesas_usbhs/mod_gadget.c     |  193 +++++-
9183  drivers/usb/renesas_usbhs/mod_host.c       |  953 +++++++++++++++++-----------
9184  drivers/usb/renesas_usbhs/pipe.c           |   28 +-
9185  drivers/usb/renesas_usbhs/pipe.h           |    1 +
9186  drivers/usb/serial/ChangeLog.history       |  730 ---------------------
9187  drivers/usb/serial/belkin_sa.c             |   43 --
9188  drivers/usb/serial/ch341.c                 |    3 +-
9189  drivers/usb/serial/cp210x.c                |   58 +-
9190  drivers/usb/serial/cyberjack.c             |   33 +-
9191  drivers/usb/serial/cypress_m8.c            |   29 -
9192  drivers/usb/serial/digi_acceleport.c       |  227 +-------
9193  drivers/usb/serial/ftdi_sio.c              |    4 +
9194  drivers/usb/serial/garmin_gps.c            |    9 -
9195  drivers/usb/serial/generic.c               |   83 ++-
9196  drivers/usb/serial/io_edgeport.c           |    3 -
9197  drivers/usb/serial/io_ti.c                 |   28 +-
9198  drivers/usb/serial/ipaq.c                  |   34 -
9199  drivers/usb/serial/ir-usb.c                |   32 -
9200  drivers/usb/serial/iuu_phoenix.c           |    3 +-
9201  drivers/usb/serial/keyspan.c               |   90 ---
9202  drivers/usb/serial/keyspan_pda.c           |   66 +--
9203  drivers/usb/serial/kobil_sct.c             |   25 -
9204  drivers/usb/serial/mct_u232.c              |   46 --
9205  drivers/usb/serial/mos7720.c               |   18 -
9206  drivers/usb/serial/mos7840.c               |    4 -
9207  drivers/usb/serial/omninet.c               |   51 +--
9208  drivers/usb/serial/opticon.c               |    1 -
9209  drivers/usb/serial/oti6858.c               |   23 +-
9210  drivers/usb/serial/pl2303.c                |   17 +-
9211  drivers/usb/serial/sierra.c                |    1 -
9212  drivers/usb/serial/symbolserial.c          |    1 -
9213  drivers/usb/serial/ti_usb_3410_5052.c      |   13 +-
9214  drivers/usb/serial/usb-serial.c            |   98 ++--
9215  drivers/usb/serial/usb_debug.c             |   13 +-
9216  drivers/usb/serial/whiteheat.c             |   58 --
9217  drivers/usb/storage/alauda.c               |    2 +-
9218  drivers/usb/storage/cypress_atacb.c        |    2 +-
9219  drivers/usb/storage/datafab.c              |    2 +-
9220  drivers/usb/storage/ene_ub6250.c           |   12 +-
9221  drivers/usb/storage/freecom.c              |    2 +-
9222  drivers/usb/storage/isd200.c               |    2 +-
9223  drivers/usb/storage/jumpshot.c             |    2 +-
9224  drivers/usb/storage/karma.c                |    2 +-
9225  drivers/usb/storage/onetouch.c             |    2 +-
9226  drivers/usb/storage/realtek_cr.c           |   14 +-
9227  drivers/usb/storage/sddr09.c               |    2 +-
9228  drivers/usb/storage/sddr55.c               |    2 +-
9229  drivers/usb/storage/shuttle_usbat.c        |    2 +-
9230  drivers/usb/wusbcore/security.c            |    2 +-
9231  drivers/uwb/est.c                          |    2 +-
9232  fs/fat/namei_vfat.c                        |    3 +-
9233  fs/nls/nls_base.c                          |   73 ++-
9234  include/linux/nls.h                        |    5 +-
9235  include/linux/usb.h                        |   14 +
9236  include/linux/usb/ch11.h                   |   31 +-
9237  include/linux/usb/gadget.h                 |   14 +-
9238  include/linux/usb/hcd.h                    |    2 -
9239  include/linux/usb/renesas_usbhs.h          |   10 +-
9240  include/linux/usb/serial.h                 |   11 +-
9241  180 files changed, 2913 insertions(+), 3332 deletions(-)
9242  create mode 100644 drivers/usb/dwc3/host.c
9243  delete mode 100644 drivers/usb/serial/ChangeLog.history
9244 Merging staging/staging-next (89c5db0 Staging: comedi: fix printk issue in contec_pci_dio.c)
9245 $ git merge staging/staging-next
9246 Removing drivers/staging/xgifb/vb_ext.h
9247 Removing drivers/staging/xgifb/vb_ext.c
9248 Auto-merging drivers/staging/vt6656/main_usb.c
9249 Removing drivers/staging/spectra/spectraswconfig.h
9250 Removing drivers/staging/spectra/nand_regs.h
9251 Removing drivers/staging/spectra/lld_nand.h
9252 Removing drivers/staging/spectra/lld_nand.c
9253 Removing drivers/staging/spectra/lld_mtd.h
9254 Removing drivers/staging/spectra/lld_mtd.c
9255 Removing drivers/staging/spectra/lld_emu.h
9256 Removing drivers/staging/spectra/lld_emu.c
9257 Removing drivers/staging/spectra/lld_cdma.h
9258 Removing drivers/staging/spectra/lld_cdma.c
9259 Removing drivers/staging/spectra/lld.h
9260 Removing drivers/staging/spectra/lld.c
9261 Removing drivers/staging/spectra/flash.h
9262 Removing drivers/staging/spectra/flash.c
9263 Removing drivers/staging/spectra/ffsport.h
9264 Removing drivers/staging/spectra/ffsport.c
9265 Removing drivers/staging/spectra/ffsdefs.h
9266 Removing drivers/staging/spectra/README
9267 Removing drivers/staging/spectra/Makefile
9268 Removing drivers/staging/spectra/Kconfig
9269 Auto-merging drivers/staging/sep/sep_driver.c
9270 Removing drivers/staging/rtl8192u/ieee80211/api.c
9271 Removing drivers/staging/rtl8192e/rtl_debug.h
9272 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
9273 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_ps.h
9274 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.h
9275 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pm.c
9276 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_pci.h
9277 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_debug.c
9278 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.h
9279 Auto-merging drivers/staging/rtl8192e/rtl8192e/rtl_core.c
9280 Auto-merging drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
9281 Removing drivers/staging/intel_sst/intelmid_v2_control.c
9282 Removing drivers/staging/intel_sst/intelmid_v1_control.c
9283 Removing drivers/staging/intel_sst/intelmid_v0_control.c
9284 Removing drivers/staging/intel_sst/intelmid_snd_control.h
9285 Removing drivers/staging/intel_sst/intelmid_pvt.c
9286 Removing drivers/staging/intel_sst/intelmid_msic_control.c
9287 Removing drivers/staging/intel_sst/intelmid_ctrl.c
9288 Removing drivers/staging/intel_sst/intelmid_adc_control.h
9289 Removing drivers/staging/intel_sst/intelmid.h
9290 Removing drivers/staging/intel_sst/intelmid.c
9291 Removing drivers/staging/intel_sst/intel_sst_stream_encoded.c
9292 Removing drivers/staging/intel_sst/intel_sst_stream.c
9293 Removing drivers/staging/intel_sst/intel_sst_pvt.c
9294 Removing drivers/staging/intel_sst/intel_sst_ipc.c
9295 Removing drivers/staging/intel_sst/intel_sst_ioctl.h
9296 Removing drivers/staging/intel_sst/intel_sst_fw_ipc.h
9297 Removing drivers/staging/intel_sst/intel_sst_dsp.c
9298 Removing drivers/staging/intel_sst/intel_sst_drv_interface.c
9299 Removing drivers/staging/intel_sst/intel_sst_common.h
9300 Removing drivers/staging/intel_sst/intel_sst_app_interface.c
9301 Removing drivers/staging/intel_sst/intel_sst.h
9302 Removing drivers/staging/intel_sst/intel_sst.c
9303 Removing drivers/staging/intel_sst/TODO
9304 Removing drivers/staging/intel_sst/Makefile
9305 Removing drivers/staging/intel_sst/Kconfig
9306 Auto-merging drivers/staging/iio/resolver/ad2s90.c
9307 Auto-merging drivers/staging/iio/resolver/ad2s1210.c
9308 Auto-merging drivers/staging/iio/resolver/ad2s1200.c
9309 Auto-merging drivers/staging/iio/meter/ade7854-spi.c
9310 Auto-merging drivers/staging/iio/meter/ade7759.c
9311 Auto-merging drivers/staging/iio/meter/ade7758_core.c
9312 Auto-merging drivers/staging/iio/meter/ade7754.c
9313 Auto-merging drivers/staging/iio/meter/ade7753.c
9314 Auto-merging drivers/staging/iio/magnetometer/hmc5843.c
9315 Auto-merging drivers/staging/iio/magnetometer/ak8975.c
9316 Auto-merging drivers/staging/iio/light/tsl2583.c
9317 Auto-merging drivers/staging/iio/light/tsl2563.c
9318 Auto-merging drivers/staging/iio/light/isl29018.c
9319 Auto-merging drivers/staging/iio/industrialio-trigger.c
9320 Auto-merging drivers/staging/iio/imu/adis16400_core.c
9321 Auto-merging drivers/staging/iio/impedance-analyzer/ad5933.c
9322 Auto-merging drivers/staging/iio/gyro/adxrs450_core.c
9323 Auto-merging drivers/staging/iio/gyro/adis16260_core.c
9324 Auto-merging drivers/staging/iio/gyro/adis16130_core.c
9325 Auto-merging drivers/staging/iio/gyro/adis16080_core.c
9326 Auto-merging drivers/staging/iio/dds/ad9951.c
9327 Auto-merging drivers/staging/iio/dds/Resolved 'drivers/staging/hv/Kconfig' using previous resolution.
9328 Resolved 'drivers/staging/hv/Makefile' using previous resolution.
9329 Resolved 'drivers/staging/iio/adc/ad799x_core.c' using previous resolution.
9330 ad9910.c
9331 Auto-merging drivers/staging/iio/dds/ad9852.c
9332 Auto-merging drivers/staging/iio/dds/ad9850.c
9333 Auto-merging drivers/staging/iio/dds/ad9834.c
9334 Auto-merging drivers/staging/iio/dds/ad9832.c
9335 Auto-merging drivers/staging/iio/dds/ad5930.c
9336 Auto-merging drivers/staging/iio/dac/ad5791.c
9337 Auto-merging drivers/staging/iio/dac/ad5686.c
9338 Auto-merging drivers/staging/iio/dac/ad5624r_spi.c
9339 Auto-merging drivers/staging/iio/dac/ad5504.c
9340 Auto-merging drivers/staging/iio/dac/ad5446.c
9341 Auto-merging drivers/staging/iio/dac/ad5360.c
9342 Auto-merging drivers/staging/iio/dac/ad5064.c
9343 Removing drivers/staging/iio/chrdev.h
9344 Auto-merging drivers/staging/iio/cdc/ad7746.c
9345 Auto-merging drivers/staging/iio/cdc/ad7152.c
9346 Auto-merging drivers/staging/iio/cdc/ad7150.c
9347 Auto-merging drivers/staging/iio/buffer.h
9348 Auto-merging drivers/staging/iio/addac/adt7316-spi.c
9349 Auto-merging drivers/staging/iio/adc/max1363_core.c
9350 Auto-merging drivers/staging/iio/adc/adt7410.c
9351 Auto-merging drivers/staging/iio/adc/adt7310.c
9352 Auto-merging drivers/staging/iio/adc/ad799x_core.c
9353 CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c
9354 Auto-merging drivers/staging/iio/adc/ad7887_core.c
9355 Auto-merging drivers/staging/iio/adc/ad7816.c
9356 Auto-merging drivers/staging/iio/adc/ad7793.c
9357 Auto-merging drivers/staging/iio/adc/ad7780.c
9358 Auto-merging drivers/staging/iio/adc/ad7606_spi.c
9359 Auto-merging drivers/staging/iio/adc/ad7476_core.c
9360 Auto-merging drivers/staging/iio/adc/ad7298_core.c
9361 Auto-merging drivers/staging/iio/adc/ad7291.c
9362 Auto-merging drivers/staging/iio/adc/ad7280a.c
9363 Auto-merging drivers/staging/iio/adc/ad7192.c
9364 Auto-merging drivers/staging/iio/accel/sca3000_core.c
9365 Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c
9366 Auto-merging drivers/staging/iio/accel/kxsd9.c
9367 Auto-merging drivers/staging/iio/accel/adis16240_core.c
9368 Auto-merging drivers/staging/iio/accel/adis16220_core.c
9369 Auto-merging drivers/staging/iio/accel/adis16209_core.c
9370 Auto-merging drivers/staging/iio/accel/adis16204_core.c
9371 Auto-merging drivers/staging/iio/accel/adis16203_core.c
9372 Auto-merging drivers/staging/iio/accel/adis16201_core.c
9373 Auto-merging drivers/staging/hv/Makefile
9374 CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile
9375 Auto-merging drivers/staging/hv/Kconfig
9376 CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig
9377 Auto-merging drivers/staging/frontier/tranzport.c
9378 Auto-merging drivers/staging/cxt1e1/libsbew.h
9379 Auto-merging drivers/net/hyperv/rndis_filter.c
9380 Auto-merging drivers/net/hyperv/netvsc_drv.c
9381 Auto-merging drivers/net/hyperv/netvsc.c
9382 Auto-merging drivers/net/hyperv/hyperv_net.h
9383 Auto-merging drivers/net/Makefile
9384 Auto-merging drivers/net/Kconfig
9385 CONFLICT (rename/delete): drivers/hid/hid-hyperv.c deleted in staging/staging-next and renamed in HEAD. Version HEAD of drivers/hid/hid-hyperv.c left in tree.
9386 Auto-merging MAINTAINERS
9387 Automatic merge failed; fix conflicts and then commit the result.
9388 $ git commit -v -a
9389 [master 77480d9] Merge remote-tracking branch 'staging/staging-next'
9390 $ git diff -M --stat --summary HEAD^..
9391  .../devicetree/bindings/nvec/nvec_nvidia.txt       |    9 +
9392  MAINTAINERS                                        |   46 +-
9393  drivers/net/Kconfig                                |    2 +
9394  drivers/net/Makefile                               |    2 +
9395  drivers/net/hyperv/Kconfig                         |    5 +
9396  drivers/net/hyperv/Makefile                        |    3 +
9397  drivers/{staging/hv => net/hyperv}/hyperv_net.h    |   24 +
9398  drivers/{staging/hv => net/hyperv}/netvsc.c        |   27 +-
9399  drivers/{staging/hv => net/hyperv}/netvsc_drv.c    |   70 +-
9400  drivers/{staging/hv => net/hyperv}/rndis_filter.c  |   23 +-
9401  drivers/staging/Kconfig                            |    8 +-
9402  drivers/staging/Makefile                           |    4 +-
9403  drivers/staging/android/Kconfig                    |   95 +
9404  drivers/staging/android/Makefile                   |    6 +
9405  drivers/staging/android/TODO                       |   10 +
9406  drivers/staging/android/binder.c                   | 3600 ++++++++++++++++
9407  drivers/staging/android/binder.h                   |  330 ++
9408  drivers/staging/android/logger.c                   |  616 +++
9409  drivers/staging/android/logger.h                   |   49 +
9410  drivers/staging/android/lowmemorykiller.c          |  219 +
9411  drivers/staging/android/ram_console.c              |  443 ++
9412  drivers/staging/android/ram_console.h              |   22 +
9413  drivers/staging/android/timed_gpio.c               |  176 +
9414  drivers/staging/android/timed_gpio.h               |   33 +
9415  drivers/staging/android/timed_output.c             |  123 +
9416  drivers/staging/android/timed_output.h             |   37 +
9417  drivers/staging/asus_oled/asus_oled.c              |    4 +-
9418  drivers/staging/bcm/Bcmchar.c                      |  366 +-
9419  drivers/staging/bcm/HandleControlPacket.c          |  323 +-
9420  drivers/staging/bcm/InterfaceDld.c                 |   12 +-
9421  drivers/staging/bcm/InterfaceIdleMode.c            |   33 +-
9422  drivers/staging/bcm/InterfaceInit.c                |   12 +-
9423  drivers/staging/bcm/InterfaceMisc.c                |   24 +-
9424  drivers/staging/bcm/Misc.c                         |   32 +-
9425  drivers/staging/bcm/hostmibs.c                     |  178 +-
9426  drivers/staging/bcm/led_control.c                  | 1131 +++---
9427  drivers/staging/bcm/nvm.c                          |   95 +-
9428  drivers/staging/comedi/comedi_fops.c               |   62 +-
9429  .../staging/comedi/drivers/addi-data/addi_common.c |  137 +-
9430  drivers/staging/comedi/drivers/adl_pci7230.c       |   10 +-
9431  drivers/staging/comedi/drivers/adl_pci7296.c       |    6 +-
9432  drivers/staging/comedi/drivers/adl_pci7432.c       |    6 +-
9433  drivers/staging/comedi/drivers/adl_pci8164.c       |    6 +-
9434  drivers/staging/comedi/drivers/adl_pci9111.c       |    6 +-
9435  drivers/staging/comedi/drivers/adv_pci1710.c       |   32 +-
9436  drivers/staging/comedi/drivers/adv_pci_dio.c       |   23 +-
9437  drivers/staging/comedi/drivers/amplc_dio200.c      |    9 +-
9438  drivers/staging/comedi/drivers/amplc_pc236.c       |    6 +-
9439  drivers/staging/comedi/drivers/amplc_pc263.c       |    6 +-
9440  drivers/staging/comedi/drivers/amplc_pci224.c      |    9 +-
9441  drivers/staging/comedi/drivers/amplc_pci230.c      |    9 +-
9442  drivers/staging/comedi/drivers/cb_das16_cs.c       |   20 +-
9443  drivers/staging/comedi/drivers/cb_pcidas.c         |   42 +-
9444  drivers/staging/comedi/drivers/cb_pcidas64.c       |   26 +-
9445  drivers/staging/comedi/drivers/cb_pcidda.c         |   18 +-
9446  drivers/staging/comedi/drivers/cb_pcidio.c         |   23 +-
9447  drivers/staging/comedi/drivers/cb_pcimdas.c        |   50 +-
9448  drivers/staging/comedi/drivers/cb_pcimdda.c        |   30 +-
9449  drivers/staging/comedi/drivers/contec_pci_dio.c    |   19 +-
9450  drivers/staging/comedi/drivers/daqboard2000.c      |   73 +-
9451  drivers/staging/comedi/drivers/das08.c             |    6 +-
9452  drivers/staging/comedi/drivers/das08_cs.c          |    8 +-
9453  drivers/staging/comedi/drivers/das16m1.c           |   37 +-
9454  drivers/staging/comedi/drivers/das1800.c           |   65 +-
9455  drivers/staging/comedi/drivers/das6402.c           |   23 +-
9456  drivers/staging/comedi/drivers/das800.c            |   43 +-
9457  drivers/staging/comedi/drivers/dt3000.c            |   38 +-
9458  drivers/staging/comedi/drivers/jr3_pci.c           |   81 +-
9459  drivers/staging/comedi/drivers/ke_counter.c        |    6 +-
9460  drivers/staging/comedi/drivers/me_daq.c            |    9 +-
9461  drivers/staging/comedi/drivers/ni_at_a2150.c       |    8 +-
9462  drivers/staging/comedi/drivers/ni_daq_dio24.c      |   19 +-
9463  drivers/staging/comedi/drivers/ni_labpc_cs.c       |    2 +-
9464  drivers/staging/comedi/drivers/ni_pcimio.c         |   29 +-
9465  drivers/staging/comedi/drivers/pcl816.c            |    4 +-
9466  drivers/staging/comedi/drivers/pcl818.c            |  108 +-
9467  drivers/staging/comedi/drivers/pcmmio.c            |   26 +-
9468  drivers/staging/comedi/drivers/pcmuio.c            |   40 +-
9469  drivers/staging/comedi/drivers/serial2002.c        |    7 +-
9470  drivers/staging/comedi/drivers/usbduxsigma.c       |   16 +-
9471  drivers/staging/cxt1e1/comet.h                     |   22 -
9472  drivers/staging/cxt1e1/comet_tables.c              |   24 -
9473  drivers/staging/cxt1e1/comet_tables.h              |   24 -
9474  drivers/staging/cxt1e1/libsbew.h                   |   32 -
9475  drivers/staging/cxt1e1/musycc.c                    |   49 -
9476  drivers/staging/cxt1e1/musycc.h                    |   31 -
9477  drivers/staging/cxt1e1/ossiRelease.c               |   10 -
9478  drivers/staging/cxt1e1/pmc93x6_eeprom.h            |   21 -
9479  drivers/staging/cxt1e1/pmcc4.h                     |   42 -
9480  drivers/staging/cxt1e1/pmcc4_cpld.h                |   33 -
9481  drivers/staging/cxt1e1/pmcc4_defs.h                |   14 -
9482  drivers/staging/cxt1e1/pmcc4_drv.c                 |   70 -
9483  drivers/staging/cxt1e1/pmcc4_ioctls.h              |   16 -
9484  drivers/staging/cxt1e1/sbe_bid.h                   |   14 -
9485  drivers/staging/cxt1e1/sbe_promformat.h            |   27 -
9486  drivers/staging/cxt1e1/sbecom_inline_linux.h       |   20 -
9487  drivers/staging/cxt1e1/sbeproc.h                   |   20 -
9488  drivers/staging/cxt1e1/sbew_ioc.h                  |   55 -
9489  drivers/staging/et131x/et131x.c                    |  370 +-
9490  drivers/staging/frontier/tranzport.c               |    2 +-
9491  drivers/staging/gma500/Kconfig                     |    2 +-
9492  drivers/staging/hv/Kconfig                         |    6 -
9493  drivers/staging/hv/Makefile                        |    2 -
9494  drivers/staging/hv/TODO                            |    4 +-
9495  drivers/staging/hv/storvsc_drv.c                   |  310 +-
9496  drivers/staging/iio/Documentation/generic_buffer.c |    8 +
9497  drivers/staging/iio/Documentation/iio_utils.h      |   26 +-
9498  drivers/staging/iio/Documentation/sysfs-bus-iio    |   10 +
9499  drivers/staging/iio/Kconfig                        |    1 -
9500  drivers/staging/iio/accel/adis16201_core.c         |   36 +-
9501  drivers/staging/iio/accel/adis16201_ring.c         |   14 +-
9502  drivers/staging/iio/accel/adis16203_core.c         |   24 +-
9503  drivers/staging/iio/accel/adis16203_ring.c         |   14 +-
9504  drivers/staging/iio/accel/adis16204_core.c         |   35 +-
9505  drivers/staging/iio/accel/adis16204_ring.c         |   14 +-
9506  drivers/staging/iio/accel/adis16209_core.c         |   32 +-
9507  drivers/staging/iio/accel/adis16209_ring.c         |    9 +-
9508  drivers/staging/iio/accel/adis16220_core.c         |   27 +-
9509  drivers/staging/iio/accel/adis16240_core.c         |   32 +-
9510  drivers/staging/iio/accel/adis16240_ring.c         |    9 +-
9511  drivers/staging/iio/accel/kxsd9.c                  |   10 +-
9512  drivers/staging/iio/accel/lis3l02dq.h              |   12 -
9513  drivers/staging/iio/accel/lis3l02dq_core.c         |   35 +-
9514  drivers/staging/iio/accel/lis3l02dq_ring.c         |   61 +-
9515  drivers/staging/iio/accel/sca3000_core.c           |   24 +-
9516  drivers/staging/iio/accel/sca3000_ring.c           |   17 +-
9517  drivers/staging/iio/adc/ad7192.c                   |   73 +-
9518  drivers/staging/iio/adc/ad7280a.c                  |   28 +-
9519  drivers/staging/iio/adc/ad7291.c                   |   39 +-
9520  drivers/staging/iio/adc/ad7298.h                   |    5 -
9521  drivers/staging/iio/adc/ad7298_core.c              |   67 +-
9522  drivers/staging/iio/adc/ad7298_ring.c              |   45 +-
9523  drivers/staging/iio/adc/ad7476.h                   |    5 -
9524  drivers/staging/iio/adc/ad7476_core.c              |   25 +-
9525  drivers/staging/iio/adc/ad7476_ring.c              |   31 +-
9526  drivers/staging/iio/adc/ad7606.h                   |    1 -
9527  drivers/staging/iio/adc/ad7606_core.c              |    6 +-
9528  drivers/staging/iio/adc/ad7606_par.c               |    1 -
9529  drivers/staging/iio/adc/ad7606_ring.c              |   30 +-
9530  drivers/staging/iio/adc/ad7606_spi.c               |    3 +-
9531  drivers/staging/iio/adc/ad7780.c                   |    8 +-
9532  drivers/staging/iio/adc/ad7793.c                   |   89 +-
9533  drivers/staging/iio/adc/ad7816.c                   |    2 +-
9534  drivers/staging/iio/adc/ad7887.h                   |    5 -
9535  drivers/staging/iio/adc/ad7887_core.c              |   13 +-
9536  drivers/staging/iio/adc/ad7887_ring.c              |   46 +-
9537  drivers/staging/iio/adc/ad799x.h                   |    6 -
9538  drivers/staging/iio/adc/ad799x_core.c              |    9 +-
9539  drivers/staging/iio/adc/ad799x_ring.c              |   47 +-
9540  drivers/staging/iio/adc/adt7310.c                  |    3 +-
9541  drivers/staging/iio/adc/adt7410.c                  |    1 +
9542  drivers/staging/iio/adc/max1363.h                  |   14 +-
9543  drivers/staging/iio/adc/max1363_core.c             |   78 +-
9544  drivers/staging/iio/adc/max1363_ring.c             |   92 +-
9545  drivers/staging/iio/addac/adt7316-spi.c            |    1 -
9546  drivers/staging/iio/addac/adt7316.c                |    1 +
9547  drivers/staging/iio/{buffer_generic.h => buffer.h} |   71 +-
9548  drivers/staging/iio/cdc/ad7150.c                   |    8 +-
9549  drivers/staging/iio/cdc/ad7152.c                   |   38 +-
9550  drivers/staging/iio/cdc/ad7746.c                   |   50 +-
9551  drivers/staging/iio/chrdev.h                       |   25 -
9552  drivers/staging/iio/dac/Kconfig                    |   39 +-
9553  drivers/staging/iio/dac/Makefile                   |    3 +
9554  drivers/staging/iio/dac/ad5064.c                   |    6 +-
9555  drivers/staging/iio/dac/ad5360.c                   |   24 +-
9556  drivers/staging/iio/dac/ad5380.c                   |  676 +++
9557  drivers/staging/iio/dac/ad5421.c                   |  555 +++
9558  drivers/staging/iio/dac/ad5421.h                   |   32 +
9559  drivers/staging/iio/dac/ad5446.c                   |  184 +-
9560  drivers/staging/iio/dac/ad5446.h                   |   10 +-
9561  drivers/staging/iio/dac/ad5504.c                   |  132 +-
9562  drivers/staging/iio/dac/ad5504.h                   |    5 +-
9563  drivers/staging/iio/dac/ad5624r.h                  |    4 +-
9564  drivers/staging/iio/dac/ad5624r_spi.c              |  127 +-
9565  drivers/staging/iio/dac/ad5686.c                   |    5 +-
9566  drivers/staging/iio/dac/ad5764.c                   |  393 ++
9567  drivers/staging/iio/dac/ad5791.c                   |   15 +-
9568  drivers/staging/iio/dds/ad5930.c                   |    1 +
9569  drivers/staging/iio/dds/ad9832.c                   |    5 +-
9570  drivers/staging/iio/dds/ad9834.c                   |    7 +-
9571  drivers/staging/iio/dds/ad9850.c                   |    1 +
9572  drivers/staging/iio/dds/ad9852.c                   |    1 +
9573  drivers/staging/iio/dds/ad9910.c                   |    1 +
9574  drivers/staging/iio/dds/ad9951.c                   |    1 +
9575  drivers/staging/iio/events.h                       |  103 +
9576  drivers/staging/iio/gyro/adis16060_core.c          |    8 +-
9577  drivers/staging/iio/gyro/adis16080_core.c          |    1 +
9578  drivers/staging/iio/gyro/adis16130_core.c          |    1 +
9579  drivers/staging/iio/gyro/adis16260_core.c          |   45 +-
9580  drivers/staging/iio/gyro/adis16260_ring.c          |    9 +-
9581  drivers/staging/iio/gyro/adxrs450_core.c           |    9 +-
9582  drivers/staging/iio/iio.h                          |  141 +-
9583  drivers/staging/iio/iio_core.h                     |    2 +-
9584  drivers/staging/iio/iio_core_trigger.h             |    3 +-
9585  drivers/staging/iio/iio_dummy_evgen.c              |    4 +
9586  drivers/staging/iio/iio_simple_dummy.c             |   49 +-
9587  drivers/staging/iio/iio_simple_dummy_buffer.c      |   12 +-
9588  drivers/staging/iio/iio_simple_dummy_events.c      |    1 +
9589  drivers/staging/iio/impedance-analyzer/ad5933.c    |   30 +-
9590  drivers/staging/iio/imu/adis16400.h                |    2 +
9591  drivers/staging/iio/imu/adis16400_core.c           |  269 +-
9592  drivers/staging/iio/imu/adis16400_ring.c           |   23 +-
9593  drivers/staging/iio/industrialio-buffer.c          |  298 +-
9594  drivers/staging/iio/industrialio-core.c            |   59 +-
9595  drivers/staging/iio/industrialio-trigger.c         |   34 +-
9596  drivers/staging/iio/kfifo_buf.c                    |   19 +-
9597  drivers/staging/iio/kfifo_buf.h                    |    2 +-
9598  drivers/staging/iio/light/isl29018.c               |    7 +-
9599  drivers/staging/iio/light/tsl2563.c                |   11 +-
9600  drivers/staging/iio/light/tsl2583.c                |   17 +-
9601  drivers/staging/iio/magnetometer/ak8975.c          |    4 +-
9602  drivers/staging/iio/magnetometer/hmc5843.c         |    5 +-
9603  drivers/staging/iio/meter/ade7753.c                |    1 +
9604  drivers/staging/iio/meter/ade7754.c                |    1 +
9605  drivers/staging/iio/meter/ade7758_core.c           |   37 +-
9606  drivers/staging/iio/meter/ade7758_ring.c           |   10 +-
9607  drivers/staging/iio/meter/ade7759.c                |    1 +
9608  drivers/staging/iio/meter/ade7854-spi.c            |    1 +
9609  drivers/staging/iio/resolver/ad2s1200.c            |    1 +
9610  drivers/staging/iio/resolver/ad2s1210.c            |    1 +
9611  drivers/staging/iio/resolver/ad2s90.c              |    1 +
9612  drivers/staging/iio/ring_sw.c                      |   95 +-
9613  drivers/staging/iio/ring_sw.h                      |    2 +-
9614  drivers/staging/iio/sysfs.h                        |   43 -
9615  drivers/staging/iio/types.h                        |   49 +
9616  drivers/staging/intel_sst/Kconfig                  |   19 -
9617  drivers/staging/intel_sst/Makefile                 |    7 -
9618  drivers/staging/intel_sst/TODO                     |   13 -
9619  drivers/staging/intel_sst/intel_sst.c              |  649 ---
9620  drivers/staging/intel_sst/intel_sst.h              |  162 -
9621  .../staging/intel_sst/intel_sst_app_interface.c    | 1460 -------
9622  drivers/staging/intel_sst/intel_sst_common.h       |  623 ---
9623  .../staging/intel_sst/intel_sst_drv_interface.c    |  564 ---
9624  drivers/staging/intel_sst/intel_sst_dsp.c          |  496 ---
9625  drivers/staging/intel_sst/intel_sst_fw_ipc.h       |  416 --
9626  drivers/staging/intel_sst/intel_sst_ioctl.h        |  440 --
9627  drivers/staging/intel_sst/intel_sst_ipc.c          |  774 ----
9628  drivers/staging/intel_sst/intel_sst_pvt.c          |  313 --
9629  drivers/staging/intel_sst/intel_sst_stream.c       |  583 ---
9630  .../staging/intel_sst/intel_sst_stream_encoded.c   | 1273 ------
9631  drivers/staging/intel_sst/intelmid.c               | 1022 -----
9632  drivers/staging/intel_sst/intelmid.h               |  209 -
9633  drivers/staging/intel_sst/intelmid_adc_control.h   |  193 -
9634  drivers/staging/intel_sst/intelmid_ctrl.c          |  921 -----
9635  drivers/staging/intel_sst/intelmid_msic_control.c  | 1047 -----
9636  drivers/staging/intel_sst/intelmid_pvt.c           |  173 -
9637  drivers/staging/intel_sst/intelmid_snd_control.h   |  123 -
9638  drivers/staging/intel_sst/intelmid_v0_control.c    |  866 ----
9639  drivers/staging/intel_sst/intelmid_v1_control.c    |  978 -----
9640  drivers/staging/intel_sst/intelmid_v2_control.c    | 1156 ------
9641  drivers/staging/line6/Makefile                     |    3 +-
9642  drivers/staging/line6/capture.c                    |   44 +-
9643  drivers/staging/line6/capture.h                    |    2 +
9644  drivers/staging/line6/driver.c                     |   74 +-
9645  drivers/staging/line6/driver.h                     |   10 +-
9646  drivers/staging/line6/midi.c                       |   37 +-
9647  drivers/staging/line6/midi.h                       |    4 +-
9648  drivers/staging/line6/pcm.c                        |  115 +-
9649  drivers/staging/line6/pcm.h                        |    8 -
9650  drivers/staging/line6/playback.c                   |   53 +-
9651  drivers/staging/line6/playback.h                   |    2 +
9652  drivers/staging/line6/pod.c                        |    6 +-
9653  drivers/staging/line6/podhd.c                      |  154 +
9654  drivers/staging/line6/podhd.h                      |   30 +
9655  drivers/staging/line6/revision.h                   |    2 +-
9656  drivers/staging/line6/toneport.c                   |    6 +-
9657  drivers/staging/line6/usbdefs.h                    |   91 +-
9658  drivers/staging/line6/variax.c                     |    6 +-
9659  drivers/staging/mei/init.c                         |   49 +-
9660  drivers/staging/mei/interface.c                    |    8 +-
9661  drivers/staging/mei/interrupt.c                    |  304 +-
9662  drivers/staging/mei/iorw.c                         |   77 +-
9663  drivers/staging/mei/main.c                         |  577 ++--
9664  drivers/staging/mei/mei.txt                        |  226 +-
9665  drivers/staging/mei/mei_dev.h                      |    8 -
9666  drivers/staging/mei/wd.c                           |    4 +-
9667  drivers/staging/nvec/nvec.c                        |   30 +-
9668  drivers/staging/olpc_dcon/olpc_dcon.c              |   18 +-
9669  drivers/staging/olpc_dcon/olpc_dcon.h              |    2 +-
9670  drivers/staging/olpc_dcon/olpc_dcon_xo_1.c         |   10 +-
9671  drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c       |   10 +-
9672  drivers/staging/omapdrm/Kconfig                    |   25 +
9673  drivers/staging/omapdrm/Makefile                   |   20 +
9674  drivers/staging/omapdrm/TODO                       |   38 +
9675  drivers/staging/omapdrm/omap_connector.c           |  371 ++
9676  drivers/staging/omapdrm/omap_crtc.c                |  326 ++
9677  drivers/staging/omapdrm/omap_dmm_priv.h            |  187 +
9678  drivers/staging/omapdrm/omap_dmm_tiler.c           |  681 ++++
9679  drivers/staging/omapdrm/omap_dmm_tiler.h           |  131 +
9680  drivers/staging/omapdrm/omap_drm.h                 |  123 +
9681  drivers/staging/omapdrm/omap_drv.c                 |  817 ++++
9682  drivers/staging/omapdrm/omap_drv.h                 |  130 +
9683  drivers/staging/omapdrm/omap_encoder.c             |  171 +
9684  drivers/staging/omapdrm/omap_fb.c                  |  243 ++
9685  drivers/staging/omapdrm/omap_fbdev.c               |  367 ++
9686  drivers/staging/omapdrm/omap_gem.c                 | 1189 ++++++
9687  drivers/staging/omapdrm/omap_gem_helpers.c         |  169 +
9688  drivers/staging/omapdrm/omap_priv.h                |   47 +
9689  drivers/staging/omapdrm/tcm-sita.c                 |  703 ++++
9690  drivers/staging/omapdrm/tcm-sita.h                 |   95 +
9691  drivers/staging/omapdrm/tcm.h                      |  326 ++
9692  drivers/staging/phison/phison.c                    |    2 +-
9693  drivers/staging/rtl8192e/Kconfig                   |   58 +-
9694  drivers/staging/rtl8192e/Makefile                  |   47 +-
9695  drivers/staging/rtl8192e/dot11d.c                  |    4 +-
9696  drivers/staging/rtl8192e/dot11d.h                  |    2 +-
9697  drivers/staging/rtl8192e/rtl8192e/Kconfig          |    9 +
9698  drivers/staging/rtl8192e/rtl8192e/Makefile         |   21 +
9699  .../staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h  |    0
9700  .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c      |    0
9701  .../rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h      |    0
9702  .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c       |    0
9703  .../rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h       |    0
9704  .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c  |    0
9705  .../staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h  |    0
9706  .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.c     |    0
9707  .../rtl8192e/{ => }/rtl8192e/r8192E_firmware.h     |    0
9708  .../staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h   |    0
9709  .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c        |    0
9710  .../rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h        |    0
9711  .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c  |    3 +-
9712  .../staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h  |    0
9713  .../rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h       |    0
9714  .../rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h       |    0
9715  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c |    0
9716  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h |    0
9717  .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.c    |   68 +-
9718  .../staging/rtl8192e/{ => }/rtl8192e/rtl_core.h    |   53 +-
9719  .../staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h  |    0
9720  .../staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c   |   79 -
9721  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c  |    0
9722  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h  |    0
9723  .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c  |    0
9724  .../staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h  |    0
9725  .../staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c |    0
9726  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c |    0
9727  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h |    1 -
9728  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c  |    2 -
9729  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h  |    4 -
9730  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c  |    0
9731  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h  |    2 +-
9732  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c  |    1 -
9733  drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h  |    0
9734  drivers/staging/rtl8192e/rtl819x_BAProc.c          |    1 -
9735  drivers/staging/rtl8192e/rtl819x_HTProc.c          |    5 +-
9736  drivers/staging/rtl8192e/rtl819x_TSProc.c          |    1 +
9737  drivers/staging/rtl8192e/rtl_debug.h               |  299 --
9738  drivers/staging/rtl8192e/rtllib.h                  |   10 +-
9739  drivers/staging/rtl8192e/rtllib_crypt.c            |   18 +-
9740  drivers/staging/rtl8192e/rtllib_crypt_ccmp.c       |   14 +-
9741  drivers/staging/rtl8192e/rtllib_crypt_tkip.c       |   13 +-
9742  drivers/staging/rtl8192e/rtllib_crypt_wep.c        |   13 +-
9743  drivers/staging/rtl8192e/rtllib_debug.h            |   86 +
9744  drivers/staging/rtl8192e/rtllib_module.c           |   16 +-
9745  drivers/staging/rtl8192e/rtllib_rx.c               |    7 +-
9746  drivers/staging/rtl8192e/rtllib_softmac.c          |   30 +-
9747  drivers/staging/rtl8192e/rtllib_softmac_wx.c       |   19 +-
9748  drivers/staging/rtl8192e/rtllib_tx.c               |    2 +-
9749  drivers/staging/rtl8192e/rtllib_wx.c               |   17 +-
9750  drivers/staging/rtl8192u/ieee80211/api.c           |  244 --
9751  drivers/staging/rtl8712/rtl871x_mlme.c             |    2 +-
9752  drivers/staging/rts5139/rts51x.h                   |    1 -
9753  drivers/staging/rts5139/rts51x_transport.h         |    1 -
9754  drivers/staging/sep/sep_driver.c                   |    2 +
9755  drivers/staging/serial/68360serial.c               |    4 +-
9756  drivers/staging/sm7xx/smtcfb.c                     |    6 +-
9757  drivers/staging/speakup/kobjects.c                 |    3 +-
9758  drivers/staging/speakup/main.c                     |    5 +-
9759  drivers/staging/spectra/Kconfig                    |   41 -
9760  drivers/staging/spectra/Makefile                   |   11 -
9761  drivers/staging/spectra/README                     |   29 -
9762  drivers/staging/spectra/ffsdefs.h                  |   58 -
9763  drivers/staging/spectra/ffsport.c                  |  834 ----
9764  drivers/staging/spectra/ffsport.h                  |   85 -
9765  drivers/staging/spectra/flash.c                    | 4305 --------------------
9766  drivers/staging/spectra/flash.h                    |  198 -
9767  drivers/staging/spectra/lld.c                      |  339 --
9768  drivers/staging/spectra/lld.h                      |  111 -
9769  drivers/staging/spectra/lld_cdma.c                 |  910 -----
9770  drivers/staging/spectra/lld_cdma.h                 |  123 -
9771  drivers/staging/spectra/lld_emu.c                  |  776 ----
9772  drivers/staging/spectra/lld_emu.h                  |   51 -
9773  drivers/staging/spectra/lld_mtd.c                  |  683 ----
9774  drivers/staging/spectra/lld_mtd.h                  |   51 -
9775  drivers/staging/spectra/lld_nand.c                 | 2619 ------------
9776  drivers/staging/spectra/lld_nand.h                 |  131 -
9777  drivers/staging/spectra/nand_regs.h                |  619 ---
9778  drivers/staging/spectra/spectraswconfig.h          |   82 -
9779  drivers/staging/vme/TODO                           |   67 +-
9780  drivers/staging/vme/bridges/vme_ca91cx42.c         |   31 +-
9781  drivers/staging/vme/bridges/vme_tsi148.c           |   36 +-
9782  drivers/staging/vme/devices/Kconfig                |   13 +
9783  drivers/staging/vme/devices/Makefile               |    3 +
9784  drivers/staging/vme/devices/vme_pio2.h             |  249 ++
9785  drivers/staging/vme/devices/vme_pio2_cntr.c        |   71 +
9786  drivers/staging/vme/devices/vme_pio2_core.c        |  524 +++
9787  drivers/staging/vme/devices/vme_pio2_gpio.c        |  232 ++
9788  drivers/staging/vme/devices/vme_user.h             |   10 +-
9789  drivers/staging/vme/vme.c                          |   69 +-
9790  drivers/staging/vme/vme.h                          |   38 +-
9791  drivers/staging/vme/vme_api.txt                    |   61 +-
9792  drivers/staging/vme/vme_bridge.h                   |   38 +-
9793  drivers/staging/vt6655/device_main.c               |    6 +-
9794  drivers/staging/vt6655/ioctl.c                     |    8 +
9795  drivers/staging/vt6655/iwctl.c                     |   12 -
9796  drivers/staging/vt6655/iwctl.h                     |    5 -
9797  drivers/staging/vt6656/80211mgr.c                  |   35 +-
9798  drivers/staging/vt6656/baseband.c                  |   61 +-
9799  drivers/staging/vt6656/bssdb.c                     |  100 +-
9800  drivers/staging/vt6656/card.c                      |    4 +-
9801  drivers/staging/vt6656/card.h                      |    2 +-
9802  drivers/staging/vt6656/ioctl.c                     |    8 +
9803  drivers/staging/vt6656/iwctl.c                     |   12 -
9804  drivers/staging/vt6656/iwctl.h                     |    5 -
9805  drivers/staging/vt6656/main_usb.c                  |   12 +-
9806  drivers/staging/wlags49_h2/wl_pci.c                |   13 +-
9807  drivers/staging/xgifb/Makefile                     |    2 +-
9808  drivers/staging/xgifb/XGI_main.h                   |   13 +-
9809  drivers/staging/xgifb/XGI_main_26.c                |  158 +-
9810  drivers/staging/xgifb/XGIfb.h                      |    3 +
9811  drivers/staging/xgifb/vb_ext.c                     |  444 --
9812  drivers/staging/xgifb/vb_ext.h                     |    9 -
9813  drivers/staging/xgifb/vb_init.c                    |  276 +-
9814  drivers/staging/xgifb/vb_setmode.c                 | 1003 ++----
9815  drivers/staging/xgifb/vb_setmode.h                 |   52 +-
9816  drivers/staging/xgifb/vb_struct.h                  |    4 +-
9817  drivers/staging/xgifb/vb_table.h                   |   27 -
9818  drivers/staging/xgifb/vgatypes.h                   |    2 -
9819  drivers/staging/zcache/zcache-main.c               |    6 +-
9820  drivers/staging/zram/zram_drv.c                    |    3 +-
9821  drivers/staging/zram/zram_sysfs.c                  |    6 +-
9822  drivers/video/omap2/omapfb/Kconfig                 |    2 +-
9823  432 files changed, 20671 insertions(+), 34573 deletions(-)
9824  create mode 100644 Documentation/devicetree/bindings/nvec/nvec_nvidia.txt
9825  create mode 100644 drivers/net/hyperv/Kconfig
9826  create mode 100644 drivers/net/hyperv/Makefile
9827  rename drivers/{staging/hv => net/hyperv}/hyperv_net.h (98%)
9828  rename drivers/{staging/hv => net/hyperv}/netvsc.c (98%)
9829  rename drivers/{staging/hv => net/hyperv}/netvsc_drv.c (91%)
9830  rename drivers/{staging/hv => net/hyperv}/rndis_filter.c (97%)
9831  create mode 100644 drivers/staging/android/Kconfig
9832  create mode 100644 drivers/staging/android/Makefile
9833  create mode 100644 drivers/staging/android/TODO
9834  create mode 100644 drivers/staging/android/binder.c
9835  create mode 100644 drivers/staging/android/binder.h
9836  create mode 100644 drivers/staging/android/logger.c
9837  create mode 100644 drivers/staging/android/logger.h
9838  create mode 100644 drivers/staging/android/lowmemorykiller.c
9839  create mode 100644 drivers/staging/android/ram_console.c
9840  create mode 100644 drivers/staging/android/ram_console.h
9841  create mode 100644 drivers/staging/android/timed_gpio.c
9842  create mode 100644 drivers/staging/android/timed_gpio.h
9843  create mode 100644 drivers/staging/android/timed_output.c
9844  create mode 100644 drivers/staging/android/timed_output.h
9845  rename drivers/staging/iio/{buffer_generic.h => buffer.h} (76%)
9846  delete mode 100644 drivers/staging/iio/chrdev.h
9847  create mode 100644 drivers/staging/iio/dac/ad5380.c
9848  create mode 100644 drivers/staging/iio/dac/ad5421.c
9849  create mode 100644 drivers/staging/iio/dac/ad5421.h
9850  create mode 100644 drivers/staging/iio/dac/ad5764.c
9851  create mode 100644 drivers/staging/iio/events.h
9852  create mode 100644 drivers/staging/iio/types.h
9853  delete mode 100644 drivers/staging/intel_sst/Kconfig
9854  delete mode 100644 drivers/staging/intel_sst/Makefile
9855  delete mode 100644 drivers/staging/intel_sst/TODO
9856  delete mode 100644 drivers/staging/intel_sst/intel_sst.c
9857  delete mode 100644 drivers/staging/intel_sst/intel_sst.h
9858  delete mode 100644 drivers/staging/intel_sst/intel_sst_app_interface.c
9859  delete mode 100644 drivers/staging/intel_sst/intel_sst_common.h
9860  delete mode 100644 drivers/staging/intel_sst/intel_sst_drv_interface.c
9861  delete mode 100644 drivers/staging/intel_sst/intel_sst_dsp.c
9862  delete mode 100644 drivers/staging/intel_sst/intel_sst_fw_ipc.h
9863  delete mode 100644 drivers/staging/intel_sst/intel_sst_ioctl.h
9864  delete mode 100644 drivers/staging/intel_sst/intel_sst_ipc.c
9865  delete mode 100644 drivers/staging/intel_sst/intel_sst_pvt.c
9866  delete mode 100644 drivers/staging/intel_sst/intel_sst_stream.c
9867  delete mode 100644 drivers/staging/intel_sst/intel_sst_stream_encoded.c
9868  delete mode 100644 drivers/staging/intel_sst/intelmid.c
9869  delete mode 100644 drivers/staging/intel_sst/intelmid.h
9870  delete mode 100644 drivers/staging/intel_sst/intelmid_adc_control.h
9871  delete mode 100644 drivers/staging/intel_sst/intelmid_ctrl.c
9872  delete mode 100644 drivers/staging/intel_sst/intelmid_msic_control.c
9873  delete mode 100644 drivers/staging/intel_sst/intelmid_pvt.c
9874  delete mode 100644 drivers/staging/intel_sst/intelmid_snd_control.h
9875  delete mode 100644 drivers/staging/intel_sst/intelmid_v0_control.c
9876  delete mode 100644 drivers/staging/intel_sst/intelmid_v1_control.c
9877  delete mode 100644 drivers/staging/intel_sst/intelmid_v2_control.c
9878  create mode 100644 drivers/staging/line6/podhd.c
9879  create mode 100644 drivers/staging/line6/podhd.h
9880  create mode 100644 drivers/staging/omapdrm/Kconfig
9881  create mode 100644 drivers/staging/omapdrm/Makefile
9882  create mode 100644 drivers/staging/omapdrm/TODO
9883  create mode 100644 drivers/staging/omapdrm/omap_connector.c
9884  create mode 100644 drivers/staging/omapdrm/omap_crtc.c
9885  create mode 100644 drivers/staging/omapdrm/omap_dmm_priv.h
9886  create mode 100644 drivers/staging/omapdrm/omap_dmm_tiler.c
9887  create mode 100644 drivers/staging/omapdrm/omap_dmm_tiler.h
9888  create mode 100644 drivers/staging/omapdrm/omap_drm.h
9889  create mode 100644 drivers/staging/omapdrm/omap_drv.c
9890  create mode 100644 drivers/staging/omapdrm/omap_drv.h
9891  create mode 100644 drivers/staging/omapdrm/omap_encoder.c
9892  create mode 100644 drivers/staging/omapdrm/omap_fb.c
9893  create mode 100644 drivers/staging/omapdrm/omap_fbdev.c
9894  create mode 100644 drivers/staging/omapdrm/omap_gem.c
9895  create mode 100644 drivers/staging/omapdrm/omap_gem_helpers.c
9896  create mode 100644 drivers/staging/omapdrm/omap_priv.h
9897  create mode 100644 drivers/staging/omapdrm/tcm-sita.c
9898  create mode 100644 drivers/staging/omapdrm/tcm-sita.h
9899  create mode 100644 drivers/staging/omapdrm/tcm.h
9900  create mode 100644 drivers/staging/rtl8192e/rtl8192e/Kconfig
9901  create mode 100644 drivers/staging/rtl8192e/rtl8192e/Makefile
9902  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_def.h (100%)
9903  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.c (100%)
9904  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8190P_rtl8256.h (100%)
9905  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.c (100%)
9906  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_cmdpkt.h (100%)
9907  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.c (100%)
9908  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_dev.h (100%)
9909  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.c (100%)
9910  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_firmware.h (100%)
9911  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hw.h (100%)
9912  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.c (100%)
9913  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_hwimg.h (100%)
9914  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.c (99%)
9915  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phy.h (100%)
9916  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r8192E_phyreg.h (100%)
9917  rename drivers/staging/rtl8192e/{ => }/rtl8192e/r819xE_phyreg.h (100%)
9918  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.c (100%)
9919  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_cam.h (100%)
9920  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.c (98%)
9921  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_core.h (97%)
9922  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_crypto.h (100%)
9923  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_debug.c (94%)
9924  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.c (100%)
9925  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_dm.h (100%)
9926  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.c (100%)
9927  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_eeprom.h (100%)
9928  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ethtool.c (100%)
9929  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.c (100%)
9930  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pci.h (99%)
9931  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.c (99%)
9932  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_pm.h (97%)
9933  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.c (100%)
9934  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_ps.h (98%)
9935  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.c (99%)
9936  rename drivers/staging/rtl8192e/{ => }/rtl8192e/rtl_wx.h (100%)
9937  delete mode 100644 drivers/staging/rtl8192e/rtl_debug.h
9938  create mode 100644 drivers/staging/rtl8192e/rtllib_debug.h
9939  delete mode 100644 drivers/staging/rtl8192u/ieee80211/api.c
9940  delete mode 100644 drivers/staging/spectra/Kconfig
9941  delete mode 100644 drivers/staging/spectra/Makefile
9942  delete mode 100644 drivers/staging/spectra/README
9943  delete mode 100644 drivers/staging/spectra/ffsdefs.h
9944  delete mode 100644 drivers/staging/spectra/ffsport.c
9945  delete mode 100644 drivers/staging/spectra/ffsport.h
9946  delete mode 100644 drivers/staging/spectra/flash.c
9947  delete mode 100644 drivers/staging/spectra/flash.h
9948  delete mode 100644 drivers/staging/spectra/lld.c
9949  delete mode 100644 drivers/staging/spectra/lld.h
9950  delete mode 100644 drivers/staging/spectra/lld_cdma.c
9951  delete mode 100644 drivers/staging/spectra/lld_cdma.h
9952  delete mode 100644 drivers/staging/spectra/lld_emu.c
9953  delete mode 100644 drivers/staging/spectra/lld_emu.h
9954  delete mode 100644 drivers/staging/spectra/lld_mtd.c
9955  delete mode 100644 drivers/staging/spectra/lld_mtd.h
9956  delete mode 100644 drivers/staging/spectra/lld_nand.c
9957  delete mode 100644 drivers/staging/spectra/lld_nand.h
9958  delete mode 100644 drivers/staging/spectra/nand_regs.h
9959  delete mode 100644 drivers/staging/spectra/spectraswconfig.h
9960  create mode 100644 drivers/staging/vme/devices/vme_pio2.h
9961  create mode 100644 drivers/staging/vme/devices/vme_pio2_cntr.c
9962  create mode 100644 drivers/staging/vme/devices/vme_pio2_core.c
9963  create mode 100644 drivers/staging/vme/devices/vme_pio2_gpio.c
9964  delete mode 100644 drivers/staging/xgifb/vb_ext.c
9965  delete mode 100644 drivers/staging/xgifb/vb_ext.h
9966 Merging char-misc/char-misc-next (1ff9764 char_dev.c: fix up some whitespace errors)
9967 $ git merge char-misc/char-misc-next
9968 Auto-merging drivers/misc/ad525x_dpot.h
9969 Merge made by the 'recursive' strategy.
9970  drivers/misc/ad525x_dpot-i2c.c |   10 +---
9971  drivers/misc/ad525x_dpot-spi.c |   97 ++++++++++++++++------------------------
9972  drivers/misc/ad525x_dpot.c     |   24 +++++-----
9973  drivers/misc/ad525x_dpot.h     |    8 +---
9974  drivers/s390/char/tape_class.h |    1 -
9975  fs/char_dev.c                  |    6 +-
9976  6 files changed, 56 insertions(+), 90 deletions(-)
9977 Merging bkl-config/config (4ba8216 BKL: That's all, folks)
9978 $ git merge bkl-config/config
9979 Already up-to-date.
9980 Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.)
9981 $ git merge tmem/tmem
9982 Resolved 'mm/swapfile.c' using previous resolution.
9983 Auto-merging mm/truncate.c
9984 Auto-merging mm/swapfile.c
9985 CONFLICT (content): Merge conflict in mm/swapfile.c
9986 Auto-merging mm/filemap.c
9987 Auto-merging mm/Makefile
9988 Auto-merging mm/Kconfig
9989 Auto-merging include/linux/swap.h
9990 Auto-merging fs/super.c
9991 Auto-merging fs/buffer.c
9992 Auto-merging drivers/staging/zcache/zcache-main.c
9993 Removing Documentation/ABI/testing/sysfs-kernel-mm-cleancache
9994 Automatic merge failed; fix conflicts and then commit the result.
9995 $ git commit -v -a
9996 [master dbf2165] Merge remote-tracking branch 'tmem/tmem'
9997 $ git diff -M --stat --summary HEAD^..
9998  .../ABI/testing/sysfs-kernel-mm-cleancache         |   11 -
9999  Documentation/vm/cleancache.txt                    |   41 ++--
10000  Documentation/vm/frontswap.txt                     |  210 +++++++++++++++
10001  drivers/staging/zcache/zcache-main.c               |   10 +-
10002  drivers/xen/tmem.c                                 |   10 +-
10003  fs/buffer.c                                        |    2 +-
10004  fs/super.c                                         |    2 +-
10005  include/linux/cleancache.h                         |   24 +-
10006  include/linux/frontswap.h                          |  126 +++++++++
10007  include/linux/swap.h                               |    4 +
10008  include/linux/swapfile.h                           |   13 +
10009  mm/Kconfig                                         |   17 ++
10010  mm/Makefile                                        |    1 +
10011  mm/cleancache.c                                    |   98 +++-----
10012  mm/filemap.c                                       |    2 +-
10013  mm/frontswap.c                                     |  273 ++++++++++++++++++++
10014  mm/page_io.c                                       |   12 +
10015  mm/swapfile.c                                      |   64 ++++-
10016  mm/truncate.c                                      |   10 +-
10017  19 files changed, 796 insertions(+), 134 deletions(-)
10018  delete mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
10019  create mode 100644 Documentation/vm/frontswap.txt
10020  create mode 100644 include/linux/frontswap.h
10021  create mode 100644 include/linux/swapfile.h
10022  create mode 100644 mm/frontswap.c
10023 Merging writeback/writeback-for-next (3de7e9f writeback: do strict bdi dirty_exceeded)
10024 $ git merge writeback/writeback-for-next
10025 Auto-merging kernel/fork.c
10026 Auto-merging kernel/exit.c
10027 Auto-merging include/linux/sched.h
10028 Auto-merging fs/fs-writeback.c
10029 Merge made by the 'recursive' strategy.
10030  fs/btrfs/file.c                  |    3 +-
10031  fs/fs-writeback.c                |   10 ++-
10032  include/linux/sched.h            |    1 +
10033  include/linux/writeback.h        |    4 +
10034  include/trace/events/writeback.h |   31 ++++-
10035  kernel/exit.c                    |    3 +
10036  kernel/fork.c                    |    1 +
10037  mm/page-writeback.c              |  246 +++++++++++++++++++++++++++++---------
10038  8 files changed, 236 insertions(+), 63 deletions(-)
10039 Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
10040 $ git merge arm-dt/devicetree/arm-next
10041 Already up-to-date.
10042 Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
10043 $ git merge hwspinlock/linux-next
10044 Already up-to-date.
10045 Merging pinctrl/for-next (4cea691 pinctrl: Don't create a device for each pin controller)
10046 $ git merge pinctrl/for-next
10047 Auto-merging drivers/pinctrl/pinctrl-coh901.c
10048 Auto-merging drivers/gpio/Makefile
10049 Auto-merging drivers/gpio/Kconfig
10050 Auto-merging arch/arm/mach-u300/core.c
10051 Auto-merging MAINTAINERS
10052 Merge made by the 'recursive' strategy.
10053  Documentation/pinctrl.txt                          |  256 ++++++++++++------
10054  MAINTAINERS                                        |    2 +-
10055  arch/arm/mach-u300/Kconfig                         |    2 +-
10056  arch/arm/mach-u300/core.c                          |   14 +-
10057  arch/arm/mach-u300/include/mach/gpio-u300.h        |  115 --------
10058  arch/arm/mach-u300/include/mach/irqs.h             |    2 +-
10059  arch/arm/mach-u300/mmc.c                           |    2 +-
10060  arch/arm/mach-u300/u300-gpio.h                     |  114 ++++++++
10061  drivers/gpio/Kconfig                               |    9 -
10062  drivers/gpio/Makefile                              |    1 -
10063  drivers/pinctrl/Kconfig                            |   14 +-
10064  drivers/pinctrl/Makefile                           |    4 +-
10065  drivers/pinctrl/core.c                             |  115 ++++++---
10066  drivers/pinctrl/core.h                             |   11 +-
10067  drivers/pinctrl/pinconf.c                          |  288 ++++++++++++++++++++
10068  drivers/pinctrl/pinconf.h                          |   32 +++
10069  .../{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} |   21 ++
10070  drivers/pinctrl/pinmux-sirf.c                      |    8 +-
10071  drivers/pinctrl/pinmux-u300.c                      |   46 +++-
10072  drivers/pinctrl/pinmux.c                           |  252 +++++++++++-------
10073  include/linux/pinctrl/machine.h                    |   25 +--
10074  include/linux/pinctrl/pinconf.h                    |   96 +++++++
10075  include/linux/pinctrl/pinctrl.h                    |   12 +-
10076  include/linux/pinctrl/pinmux.h                     |   29 ++-
10077  24 files changed, 1081 insertions(+), 389 deletions(-)
10078  create mode 100644 arch/arm/mach-u300/u300-gpio.h
10079  create mode 100644 drivers/pinctrl/pinconf.c
10080  create mode 100644 drivers/pinctrl/pinconf.h
10081  rename drivers/{gpio/gpio-u300.c => pinctrl/pinctrl-coh901.c} (98%)
10082  create mode 100644 include/linux/pinctrl/pinconf.h
10083 Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h)
10084 $ git merge moduleh/for-sfr
10085 Already up-to-date.
10086 Merging vhost/linux-next (193a667 alpha: drop pci_iomap/pci_iounmap from pci-noop.c)
10087 $ git merge vhost/linux-next
10088 Resolved 'arch/hexagon/Kconfig' using previous resolution.
10089 Resolved 'arch/m68k/Kconfig' using previous resolution.
10090 Auto-merging lib/Makefile
10091 Auto-merging lib/Kconfig
10092 Auto-merging include/asm-generic/io.h
10093 Auto-merging arch/x86/Kconfig
10094 Auto-merging arch/tile/kernel/pci.c
10095 Auto-merging arch/tile/include/asm/pci.h
10096 Auto-merging arch/sh/drivers/pci/pci.c
10097 Auto-merging arch/powerpc/Kconfig
10098 Removing arch/mn10300/unit-asb2305/pci-iomap.c
10099 Auto-merging arch/mips/Kconfig
10100 Auto-merging arch/m68k/Kconfig
10101 CONFLICT (content): Merge conflict in arch/m68k/Kconfig
10102 Auto-merging arch/hexagon/Kconfig
10103 CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
10104 Removing arch/frv/mb93090-mb00/pci-iomap.c
10105 Auto-merging arch/frv/Kconfig
10106 Auto-merging arch/arm/Kconfig
10107 Auto-merging arch/alpha/kernel/pci.c
10108 Automatic merge failed; fix conflicts and then commit the result.
10109 $ git commit -v -a
10110 [master 476b181] Merge remote-tracking branch 'vhost/linux-next'
10111 $ git diff -M --stat --summary HEAD^..
10112  arch/alpha/Kconfig                    |    5 +---
10113  arch/alpha/kernel/pci-noop.c          |   12 --------
10114  arch/alpha/kernel/pci.c               |   26 +-----------------
10115  arch/arm/Kconfig                      |    1 +
10116  arch/arm/include/asm/io.h             |    2 +-
10117  arch/arm/mm/iomap.c                   |   21 --------------
10118  arch/cris/Kconfig                     |    5 +---
10119  arch/frv/Kconfig                      |    1 +
10120  arch/frv/include/asm/io.h             |    2 +-
10121  arch/frv/mb93090-mb00/Makefile        |    2 +-
10122  arch/frv/mb93090-mb00/pci-iomap.c     |   29 --------------------
10123  arch/hexagon/Kconfig                  |    4 +--
10124  arch/ia64/Kconfig                     |    5 +---
10125  arch/m68k/Kconfig                     |    4 +--
10126  arch/microblaze/Kconfig               |    1 +
10127  arch/microblaze/pci/iomap.c           |   19 -------------
10128  arch/mips/Kconfig                     |    1 +
10129  arch/mips/lib/iomap-pci.c             |   26 ------------------
10130  arch/mn10300/Kconfig                  |    1 +
10131  arch/mn10300/include/asm/io.h         |   17 +++++------
10132  arch/mn10300/unit-asb2305/Makefile    |    2 +-
10133  arch/mn10300/unit-asb2305/pci-iomap.c |   31 ---------------------
10134  arch/openrisc/Kconfig                 |    3 --
10135  arch/parisc/Kconfig                   |    1 +
10136  arch/parisc/lib/iomap.c               |   23 ---------------
10137  arch/powerpc/Kconfig                  |    1 +
10138  arch/powerpc/kernel/iomap.c           |   19 -------------
10139  arch/powerpc/platforms/Kconfig        |    3 --
10140  arch/score/Kconfig                    |    4 +--
10141  arch/sh/Kconfig                       |    4 +--
10142  arch/sh/drivers/pci/pci.c             |   23 ---------------
10143  arch/sparc/Kconfig                    |    1 +
10144  arch/sparc/include/asm/io_32.h        |    2 +-
10145  arch/sparc/include/asm/io_64.h        |    2 +-
10146  arch/sparc/lib/iomap.c                |   23 ---------------
10147  arch/tile/Kconfig                     |    1 +
10148  arch/tile/include/asm/io.h            |    3 +-
10149  arch/tile/include/asm/pci.h           |    2 +-
10150  arch/tile/kernel/pci.c                |   21 --------------
10151  arch/unicore32/Kconfig                |    4 +--
10152  arch/x86/Kconfig                      |    4 +--
10153  include/asm-generic/io.h              |    4 +-
10154  include/asm-generic/iomap.h           |    9 ++----
10155  include/asm-generic/pci_iomap.h       |   25 +++++++++++++++++
10156  lib/Kconfig                           |    7 +++++
10157  lib/Makefile                          |    1 +
10158  lib/iomap.c                           |   38 +------------------------
10159  lib/pci_iomap.c                       |   48 +++++++++++++++++++++++++++++++++
10160  48 files changed, 124 insertions(+), 369 deletions(-)
10161  delete mode 100644 arch/frv/mb93090-mb00/pci-iomap.c
10162  delete mode 100644 arch/mn10300/unit-asb2305/pci-iomap.c
10163  create mode 100644 include/asm-generic/pci_iomap.h
10164  create mode 100644 lib/pci_iomap.c
10165 Merging kmap_atomic/kmap_atomic (7b8fa32 feature-removal-schedule.txt: add the deprecated form of kmap_atomic())
10166 $ git merge kmap_atomic/kmap_atomic
10167 Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
10168 Auto-merging mm/vmalloc.c
10169 Auto-merging mm/swapfile.c
10170 Auto-merging mm/filemap.c
10171 Auto-merging lib/swiotlb.c
10172 Auto-merging kernel/debug/kdb/kdb_support.c
10173 Auto-merging fs/nfs/nfs4proc.c
10174 Auto-merging fs/logfs/segment.c
10175 Auto-merging fs/logfs/readwrite.c
10176 Auto-merging fs/logfs/dir.c
10177 Auto-merging fs/jbd2/journal.c
10178 Auto-merging fs/jbd/journal.c
10179 Auto-merging fs/gfs2/quota.c
10180 Auto-merging fs/gfs2/aops.c
10181 Auto-merging fs/fuse/file.c
10182 Auto-merging fs/fuse/dev.c
10183 Auto-merging fs/btrfs/inode.c
10184 Auto-merging fs/btrfs/extent_io.c
10185 Auto-merging drivers/target/tcm_fc/tfc_io.c
10186 Auto-merging drivers/target/target_core_transport.c
10187 Auto-merging drivers/staging/zram/zram_drv.c
10188 Auto-merging drivers/staging/zcache/zcache-main.c
10189 Removing drivers/staging/rtl8192u/ieee80211/kmap_types.h
10190 Auto-merging drivers/staging/hv/storvsc_drv.c
10191 Auto-merging drivers/scsi/ips.c
10192 Auto-merging drivers/scsi/fcoe/fcoe.c
10193 Auto-merging drivers/scsi/cxgbi/libcxgbi.c
10194 Auto-merging drivers/net/hyperv/rndis_filter.c
10195 Auto-merging drivers/net/hyperv/netvsc_drv.c
10196 Auto-merging drivers/net/ethernet/sun/cassini.c
10197 Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c
10198 Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
10199 Auto-merging drivers/md/bitmap.c
10200 Auto-merging drivers/gpu/drm/ttm/ttm_tt.c
10201 Auto-merging drivers/edac/edac_mc.c
10202 Auto-merging drivers/block/loop.c
10203 Auto-merging drivers/ata/libata-sff.c
10204 Auto-merging arch/powerpc/mm/mem.c
10205 Auto-merging arch/powerpc/mm/hugetlbpage.c
10206 Auto-merging arch/mips/mm/init.c
10207 Auto-merging arch/mips/mm/c-r4k.c
10208 Auto-merging Documentation/feature-removal-schedule.txt
10209 CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
10210 Automatic merge failed; fix conflicts and then commit the result.
10211 $ git commit -v -a
10212 [master 8c891fa] Merge remote-tracking branch 'kmap_atomic/kmap_atomic'
10213 $ git diff -M --stat --summary HEAD^..
10214  Documentation/feature-removal-schedule.txt       |    8 ++
10215  arch/arm/include/asm/highmem.h                   |    2 +-
10216  arch/arm/mm/copypage-fa.c                        |   12 ++--
10217  arch/arm/mm/copypage-feroceon.c                  |   12 ++--
10218  arch/arm/mm/copypage-v3.c                        |   12 ++--
10219  arch/arm/mm/copypage-v4mc.c                      |    8 +-
10220  arch/arm/mm/copypage-v4wb.c                      |   12 ++--
10221  arch/arm/mm/copypage-v4wt.c                      |   12 ++--
10222  arch/arm/mm/copypage-v6.c                        |   12 ++--
10223  arch/arm/mm/copypage-xsc3.c                      |   12 ++--
10224  arch/arm/mm/copypage-xscale.c                    |    8 +-
10225  arch/arm/mm/highmem.c                            |    4 +-
10226  arch/frv/include/asm/highmem.h                   |    2 +-
10227  arch/frv/mm/highmem.c                            |    4 +-
10228  arch/mips/include/asm/highmem.h                  |    2 +-
10229  arch/mips/mm/c-r4k.c                             |    4 +-
10230  arch/mips/mm/highmem.c                           |    4 +-
10231  arch/mips/mm/init.c                              |    8 +-
10232  arch/mn10300/include/asm/highmem.h               |    2 +-
10233  arch/parisc/include/asm/cacheflush.h             |    2 +-
10234  arch/powerpc/include/asm/highmem.h               |    2 +-
10235  arch/powerpc/kvm/book3s_pr.c                     |    4 +-
10236  arch/powerpc/mm/dma-noncoherent.c                |    5 +-
10237  arch/powerpc/mm/hugetlbpage.c                    |    4 +-
10238  arch/powerpc/mm/mem.c                            |    4 +-
10239  arch/sh/mm/cache-sh4.c                           |    4 +-
10240  arch/sh/mm/cache.c                               |   12 ++--
10241  arch/sparc/include/asm/highmem.h                 |    2 +-
10242  arch/sparc/mm/highmem.c                          |    4 +-
10243  arch/tile/include/asm/highmem.h                  |    2 +-
10244  arch/tile/mm/highmem.c                           |    4 +-
10245  arch/um/kernel/skas/uaccess.c                    |    4 +-
10246  arch/x86/crypto/aesni-intel_glue.c               |   24 +++---
10247  arch/x86/include/asm/highmem.h                   |    2 +-
10248  arch/x86/kernel/crash_dump_32.c                  |    6 +-
10249  arch/x86/kvm/lapic.c                             |    8 +-
10250  arch/x86/kvm/paging_tmpl.h                       |    4 +-
10251  arch/x86/kvm/x86.c                               |    8 +-
10252  arch/x86/lib/usercopy_32.c                       |    4 +-
10253  arch/x86/mm/highmem_32.c                         |    4 +-
10254  crypto/ahash.c                                   |    4 +-
10255  crypto/async_tx/async_memcpy.c                   |    8 +-
10256  crypto/blkcipher.c                               |    8 +-
10257  crypto/ccm.c                                     |    4 +-
10258  crypto/scatterwalk.c                             |    8 +-
10259  crypto/shash.c                                   |    8 +-
10260  drivers/ata/libata-sff.c                         |    8 +-
10261  drivers/block/brd.c                              |   20 +++---
10262  drivers/block/drbd/drbd_bitmap.c                 |   50 ++++++------
10263  drivers/block/drbd/drbd_nl.c                     |    4 +-
10264  drivers/block/loop.c                             |   16 ++--
10265  drivers/block/pktcdvd.c                          |    8 +-
10266  drivers/crypto/hifn_795x.c                       |   10 +-
10267  drivers/edac/edac_mc.c                           |    4 +-
10268  drivers/gpu/drm/drm_cache.c                      |    8 +-
10269  drivers/gpu/drm/ttm/ttm_tt.c                     |   16 ++--
10270  drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c              |    6 +-
10271  drivers/ide/ide-taskfile.c                       |    4 +-
10272  drivers/infiniband/ulp/iser/iser_memory.c        |    8 +-
10273  drivers/md/bitmap.c                              |   42 +++++-----
10274  drivers/md/dm-crypt.c                            |    8 +-
10275  drivers/media/video/ivtv/ivtv-udma.c             |    4 +-
10276  drivers/memstick/host/jmb38x_ms.c                |    4 +-
10277  drivers/memstick/host/tifm_ms.c                  |    4 +-
10278  drivers/net/ethernet/intel/e1000/e1000_main.c    |    6 +-
10279  drivers/net/ethernet/intel/e1000e/netdev.c       |   10 +--
10280  drivers/net/ethernet/sun/cassini.c               |    4 +-
10281  drivers/net/hyperv/netvsc_drv.c                  |    5 +-
10282  drivers/net/hyperv/rndis_filter.c                |    4 +-
10283  drivers/scsi/arcmsr/arcmsr_hba.c                 |    8 +-
10284  drivers/scsi/bnx2fc/bnx2fc_fcoe.c                |    5 +-
10285  drivers/scsi/cxgbi/libcxgbi.c                    |    5 +-
10286  drivers/scsi/fcoe/fcoe.c                         |    4 +-
10287  drivers/scsi/fcoe/fcoe_transport.c               |    5 +-
10288  drivers/scsi/gdth.c                              |    4 +-
10289  drivers/scsi/ips.c                               |    6 +-
10290  drivers/scsi/isci/request.c                      |   16 ++--
10291  drivers/scsi/libfc/fc_fcp.c                      |    8 +-
10292  drivers/scsi/libfc/fc_libfc.c                    |    8 +-
10293  drivers/scsi/libfc/fc_libfc.h                    |    2 +-
10294  drivers/scsi/libfc/fc_lport.c                    |    2 +-
10295  drivers/scsi/libiscsi_tcp.c                      |    4 +-
10296  drivers/scsi/libsas/sas_host_smp.c               |    8 +-
10297  drivers/scsi/megaraid.c                          |    4 +-
10298  drivers/scsi/mvsas/mv_sas.c                      |    4 +-
10299  drivers/scsi/scsi_debug.c                        |   24 +++---
10300  drivers/scsi/scsi_lib.c                          |    4 +-
10301  drivers/scsi/sd_dif.c                            |   12 ++--
10302  drivers/staging/gma500/mmu.c                     |   30 ++++----
10303  drivers/staging/hv/storvsc_drv.c                 |   31 +++----
10304  drivers/staging/pohmelfs/inode.c                 |    8 +-
10305  drivers/staging/rtl8192u/ieee80211/cipher.c      |    8 +-
10306  drivers/staging/rtl8192u/ieee80211/digest.c      |    8 +-
10307  drivers/staging/rtl8192u/ieee80211/internal.h    |   17 ----
10308  drivers/staging/rtl8192u/ieee80211/kmap_types.h  |   20 -----
10309  drivers/staging/rtl8192u/ieee80211/scatterwalk.c |   19 +---
10310  drivers/staging/zcache/zcache-main.c             |   16 ++--
10311  drivers/staging/zram/xvmalloc.c                  |   39 +++++-----
10312  drivers/staging/zram/zram_drv.c                  |   44 +++++-----
10313  drivers/target/target_core_transport.c           |    4 +-
10314  drivers/target/tcm_fc/tfc_io.c                   |   10 +--
10315  drivers/vhost/vhost.c                            |    4 +-
10316  fs/afs/fsclient.c                                |    8 +-
10317  fs/afs/mntpt.c                                   |    4 +-
10318  fs/aio.c                                         |   30 ++++----
10319  fs/bio-integrity.c                               |   10 +-
10320  fs/btrfs/compression.c                           |   12 ++--
10321  fs/btrfs/extent_io.c                             |   16 ++--
10322  fs/btrfs/file-item.c                             |    4 +-
10323  fs/btrfs/inode.c                                 |   26 +++---
10324  fs/btrfs/lzo.c                                   |    4 +-
10325  fs/btrfs/scrub.c                                 |    8 +-
10326  fs/btrfs/zlib.c                                  |    4 +-
10327  fs/ecryptfs/mmap.c                               |    4 +-
10328  fs/ecryptfs/read_write.c                         |    8 +-
10329  fs/exec.c                                        |    4 +-
10330  fs/exofs/dir.c                                   |    4 +-
10331  fs/ext2/dir.c                                    |    4 +-
10332  fs/fuse/dev.c                                    |    4 +-
10333  fs/fuse/file.c                                   |    4 +-
10334  fs/gfs2/aops.c                                   |   12 ++--
10335  fs/gfs2/lops.c                                   |    8 +-
10336  fs/gfs2/quota.c                                  |    4 +-
10337  fs/jbd/journal.c                                 |   12 ++--
10338  fs/jbd/transaction.c                             |    4 +-
10339  fs/jbd2/commit.c                                 |    4 +-
10340  fs/jbd2/journal.c                                |   12 ++--
10341  fs/jbd2/transaction.c                            |    4 +-
10342  fs/logfs/dir.c                                   |   18 ++--
10343  fs/logfs/readwrite.c                             |   38 +++++-----
10344  fs/logfs/segment.c                               |    4 +-
10345  fs/minix/dir.c                                   |    4 +-
10346  fs/namei.c                                       |    4 +-
10347  fs/nfs/dir.c                                     |    8 +-
10348  fs/nfs/nfs4proc.c                                |    4 +-
10349  fs/nilfs2/cpfile.c                               |   94 +++++++++++-----------
10350  fs/nilfs2/dat.c                                  |   38 +++++-----
10351  fs/nilfs2/dir.c                                  |    4 +-
10352  fs/nilfs2/ifile.c                                |    4 +-
10353  fs/nilfs2/mdt.c                                  |    4 +-
10354  fs/nilfs2/page.c                                 |    8 +-
10355  fs/nilfs2/recovery.c                             |    4 +-
10356  fs/nilfs2/segbuf.c                               |    4 +-
10357  fs/nilfs2/sufile.c                               |   68 ++++++++--------
10358  fs/ntfs/aops.c                                   |   20 +++---
10359  fs/ntfs/attrib.c                                 |   20 +++---
10360  fs/ntfs/file.c                                   |   16 ++--
10361  fs/ntfs/super.c                                  |    8 +-
10362  fs/ocfs2/aops.c                                  |   16 ++--
10363  fs/pipe.c                                        |    8 +-
10364  fs/reiserfs/stree.c                              |    4 +-
10365  fs/reiserfs/tail_conversion.c                    |    4 +-
10366  fs/splice.c                                      |    7 +-
10367  fs/squashfs/file.c                               |    8 +-
10368  fs/squashfs/symlink.c                            |    4 +-
10369  fs/ubifs/file.c                                  |    4 +-
10370  fs/udf/file.c                                    |    4 +-
10371  include/crypto/scatterwalk.h                     |   28 +------
10372  include/linux/bio.h                              |    8 +-
10373  include/linux/highmem.h                          |   79 +++++++++++++-----
10374  kernel/debug/kdb/kdb_support.c                   |    4 +-
10375  kernel/power/snapshot.c                          |   28 +++---
10376  lib/scatterlist.c                                |    4 +-
10377  lib/swiotlb.c                                    |    5 +-
10378  mm/bounce.c                                      |    4 +-
10379  mm/filemap.c                                     |    8 +-
10380  mm/ksm.c                                         |   12 ++--
10381  mm/memory.c                                      |    4 +-
10382  mm/shmem.c                                       |    4 +-
10383  mm/swapfile.c                                    |   30 ++++----
10384  mm/vmalloc.c                                     |    8 +-
10385  net/core/kmap_skb.h                              |    4 +-
10386  net/rds/ib_recv.c                                |    7 +-
10387  net/rds/info.c                                   |    6 +-
10388  net/rds/iw_recv.c                                |    7 +-
10389  net/rds/loop.c                                   |    2 +-
10390  net/rds/rds.h                                    |    2 +-
10391  net/rds/recv.c                                   |    2 +-
10392  net/rds/tcp_recv.c                               |   11 +--
10393  net/sunrpc/auth_gss/gss_krb5_wrap.c              |    4 +-
10394  net/sunrpc/socklib.c                             |    4 +-
10395  net/sunrpc/xdr.c                                 |   20 +++---
10396  net/sunrpc/xprtrdma/rpc_rdma.c                   |    8 +-
10397  security/tomoyo/domain.c                         |    4 +-
10398  184 files changed, 921 insertions(+), 972 deletions(-)
10399  delete mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h
10400 Merging xshm/xshm-for-next (e17899e caif-xshm: Add CAIF driver for Shared memory for M7400)
10401 $ git merge xshm/xshm-for-next
10402 Auto-merging include/linux/Kbuild
10403 Auto-merging drivers/Makefile
10404 Auto-merging drivers/Kconfig
10405 Merge made by the 'recursive' strategy.
10406  drivers/Kconfig                   |    2 +
10407  drivers/Makefile                  |    1 +
10408  drivers/net/caif/Kconfig          |   10 +
10409  drivers/net/caif/Makefile         |    1 +
10410  drivers/net/caif/caif_xshm.c      |  915 +++++++++++++++++++++++++++
10411  drivers/xshm/Kconfig              |   61 ++
10412  drivers/xshm/Makefile             |    5 +
10413  drivers/xshm/dummy_c2c_genio.c    |   76 +++
10414  drivers/xshm/xshm_boot.c          | 1149 +++++++++++++++++++++++++++++++++
10415  drivers/xshm/xshm_chr.c           | 1262 +++++++++++++++++++++++++++++++++++++
10416  drivers/xshm/xshm_dev.c           |  541 ++++++++++++++++
10417  drivers/xshm/xshm_ipctoc.h        |  153 +++++
10418  include/linux/Kbuild              |    1 +
10419  include/linux/c2c_genio.h         |  195 ++++++
10420  include/linux/xshm/Kbuild         |    1 +
10421  include/linux/xshm/xshm_dev.h     |  244 +++++++
10422  include/linux/xshm/xshm_netlink.h |   95 +++
10423  17 files changed, 4712 insertions(+), 0 deletions(-)
10424  create mode 100644 drivers/net/caif/caif_xshm.c
10425  create mode 100644 drivers/xshm/Kconfig
10426  create mode 100644 drivers/xshm/Makefile
10427  create mode 100644 drivers/xshm/dummy_c2c_genio.c
10428  create mode 100644 drivers/xshm/xshm_boot.c
10429  create mode 100644 drivers/xshm/xshm_chr.c
10430  create mode 100644 drivers/xshm/xshm_dev.c
10431  create mode 100644 drivers/xshm/xshm_ipctoc.h
10432  create mode 100644 include/linux/c2c_genio.h
10433  create mode 100644 include/linux/xshm/Kbuild
10434  create mode 100644 include/linux/xshm/xshm_dev.h
10435  create mode 100644 include/linux/xshm/xshm_netlink.h
10436 Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
10437 $ git merge memblock/memblock-kill-early_node_map
10438 Resolved 'arch/arm/mm/init.c' using previous resolution.
10439 Resolved 'arch/score/Kconfig' using previous resolution.
10440 Auto-merging mm/page_alloc.c
10441 Auto-merging mm/Kconfig
10442 Auto-merging kernel/printk.c
10443 Auto-merging include/linux/mm.h
10444 Auto-merging drivers/iommu/intel-iommu.c
10445 Auto-merging arch/x86/xen/setup.c
10446 Auto-merging arch/x86/platform/efi/efi.c
10447 Auto-merging arch/x86/mm/numa.c
10448 Removing arch/x86/mm/memblock.c
10449 Auto-merging arch/x86/mm/init_64.c
10450 Auto-merging arch/x86/mm/init_32.c
10451 Auto-merging arch/x86/mm/init.c
10452 Auto-merging arch/x86/kernel/setup.c
10453 Auto-merging arch/x86/kernel/mpparse.c
10454 Auto-merging arch/x86/kernel/e820.c
10455 Removing arch/x86/include/asm/memblock.h
10456 Auto-merging arch/x86/Kconfig
10457 Removing arch/sparc/include/asm/memblock.h
10458 Auto-merging arch/sparc/Kconfig
10459 Removing arch/sh/include/asm/memblock.h
10460 Auto-merging arch/sh/Kconfig
10461 Auto-merging arch/score/Kconfig
10462 CONFLICT (content): Merge conflict in arch/score/Kconfig
10463 Auto-merging arch/s390/kernel/setup.c
10464 Auto-merging arch/s390/Kconfig
10465 Auto-merging arch/powerpc/mm/tlb_nohash.c
10466 Auto-merging arch/powerpc/mm/numa.c
10467 Auto-merging arch/powerpc/mm/mem.c
10468 Removing arch/powerpc/include/asm/memblock.h
10469 Auto-merging arch/powerpc/Kconfig
10470 Removing arch/openrisc/include/asm/memblock.h
10471 Auto-merging arch/mips/kernel/setup.c
10472 Auto-merging arch/mips/Kconfig
10473 Removing arch/microblaze/include/asm/memblock.h
10474 Auto-merging arch/ia64/Kconfig
10475 Auto-merging arch/arm/mm/init.c
10476 CONFLICT (content): Merge conflict in arch/arm/mm/init.c
10477 Auto-merging arch/arm/kernel/setup.c
10478 Automatic merge failed; fix conflicts and then commit the result.
10479 $ git commit -v -a
10480 [master e4dc3bf] Merge remote-tracking branch 'memblock/memblock-kill-early_node_map'
10481 $ git diff -M --stat --summary HEAD^..
10482  arch/arm/kernel/setup.c                  |    1 +
10483  arch/arm/mm/init.c                       |    4 +-
10484  arch/ia64/Kconfig                        |    6 +-
10485  arch/ia64/mm/contig.c                    |    3 +-
10486  arch/ia64/mm/init.c                      |    4 +-
10487  arch/microblaze/include/asm/memblock.h   |   14 -
10488  arch/microblaze/kernel/prom.c            |    3 +-
10489  arch/mips/Kconfig                        |    6 +-
10490  arch/mips/kernel/setup.c                 |    3 +-
10491  arch/mips/sgi-ip27/ip27-memory.c         |    5 +-
10492  arch/openrisc/include/asm/memblock.h     |   24 -
10493  arch/openrisc/kernel/prom.c              |    3 +-
10494  arch/powerpc/Kconfig                     |    4 +-
10495  arch/powerpc/include/asm/memblock.h      |    8 -
10496  arch/powerpc/kernel/machine_kexec.c      |    3 -
10497  arch/powerpc/kernel/prom.c               |   20 +-
10498  arch/powerpc/mm/init_32.c                |    4 +-
10499  arch/powerpc/mm/mem.c                    |    2 +-
10500  arch/powerpc/mm/numa.c                   |   60 +--
10501  arch/powerpc/mm/tlb_nohash.c             |    1 -
10502  arch/powerpc/platforms/embedded6xx/wii.c |   23 +-
10503  arch/powerpc/platforms/ps3/mm.c          |    1 -
10504  arch/s390/Kconfig                        |    6 +-
10505  arch/s390/kernel/setup.c                 |    4 +-
10506  arch/score/Kconfig                       |    6 +-
10507  arch/score/kernel/setup.c                |    4 +-
10508  arch/sh/Kconfig                          |    1 +
10509  arch/sh/include/asm/memblock.h           |    4 -
10510  arch/sh/kernel/machine_kexec.c           |    3 -
10511  arch/sh/kernel/setup.c                   |    3 +-
10512  arch/sh/mm/Kconfig                       |    3 -
10513  arch/sh/mm/init.c                        |    3 +-
10514  arch/sparc/Kconfig                       |    4 +-
10515  arch/sparc/include/asm/memblock.h        |    8 -
10516  arch/sparc/mm/init_64.c                  |   32 +-
10517  arch/unicore32/kernel/setup.c            |    1 +
10518  arch/unicore32/mm/init.c                 |    4 +-
10519  arch/unicore32/mm/mmu.c                  |    1 +
10520  arch/x86/Kconfig                         |    5 +-
10521  arch/x86/include/asm/e820.h              |    2 +-
10522  arch/x86/include/asm/memblock.h          |   23 -
10523  arch/x86/kernel/aperture_64.c            |    4 +-
10524  arch/x86/kernel/check.c                  |   34 +-
10525  arch/x86/kernel/e820.c                   |   58 +-
10526  arch/x86/kernel/head.c                   |    2 +-
10527  arch/x86/kernel/head32.c                 |    7 +-
10528  arch/x86/kernel/head64.c                 |    7 +-
10529  arch/x86/kernel/mpparse.c                |   12 +-
10530  arch/x86/kernel/setup.c                  |   21 +-
10531  arch/x86/kernel/trampoline.c             |    4 +-
10532  arch/x86/mm/Makefile                     |    2 -
10533  arch/x86/mm/init.c                       |    8 +-
10534  arch/x86/mm/init_32.c                    |   36 +-
10535  arch/x86/mm/init_64.c                    |    2 +-
10536  arch/x86/mm/memblock.c                   |  348 -----------
10537  arch/x86/mm/memtest.c                    |   33 +-
10538  arch/x86/mm/numa.c                       |   37 +-
10539  arch/x86/mm/numa_32.c                    |   10 +-
10540  arch/x86/mm/numa_64.c                    |    2 +-
10541  arch/x86/mm/numa_emulation.c             |   36 +-
10542  arch/x86/platform/efi/efi.c              |    9 +-
10543  arch/x86/xen/enlighten.c                 |    2 -
10544  arch/x86/xen/mmu.c                       |   12 +-
10545  arch/x86/xen/setup.c                     |    7 +-
10546  drivers/iommu/intel-iommu.c              |   25 +-
10547  include/linux/bootmem.h                  |    2 +-
10548  include/linux/memblock.h                 |  170 ++++--
10549  include/linux/mm.h                       |   34 +-
10550  include/linux/mmzone.h                   |    8 +-
10551  include/linux/poison.h                   |    6 -
10552  kernel/printk.c                          |    2 +-
10553  mm/Kconfig                               |    6 +
10554  mm/memblock.c                            |  961 ++++++++++++++++-------------
10555  mm/nobootmem.c                           |   45 +-
10556  mm/page_alloc.c                          |  508 +++-------------
10557  75 files changed, 1032 insertions(+), 1747 deletions(-)
10558  delete mode 100644 arch/microblaze/include/asm/memblock.h
10559  delete mode 100644 arch/openrisc/include/asm/memblock.h
10560  delete mode 100644 arch/powerpc/include/asm/memblock.h
10561  delete mode 100644 arch/sh/include/asm/memblock.h
10562  delete mode 100644 arch/sparc/include/asm/memblock.h
10563  delete mode 100644 arch/x86/include/asm/memblock.h
10564  delete mode 100644 arch/x86/mm/memblock.c
10565 Merging remoteproc/for-next (d275b1b samples/rpmsg: add an rpmsg driver sample)
10566 $ git merge remoteproc/for-next
10567 Auto-merging include/linux/mod_devicetable.h
10568 Auto-merging drivers/Makefile
10569 Auto-merging drivers/Kconfig
10570 Auto-merging MAINTAINERS
10571 Merge made by the 'recursive' strategy.
10572  Documentation/ABI/testing/sysfs-bus-rpmsg    |   75 ++
10573  Documentation/remoteproc.txt                 |  324 ++++++
10574  Documentation/rpmsg.txt                      |  293 ++++++
10575  MAINTAINERS                                  |    7 +
10576  arch/arm/plat-omap/include/plat/remoteproc.h |   57 +
10577  drivers/Kconfig                              |    4 +
10578  drivers/Makefile                             |    2 +
10579  drivers/remoteproc/Kconfig                   |   24 +
10580  drivers/remoteproc/Makefile                  |    9 +
10581  drivers/remoteproc/omap_remoteproc.c         |  249 +++++
10582  drivers/remoteproc/omap_remoteproc.h         |   69 ++
10583  drivers/remoteproc/remoteproc_core.c         | 1410 ++++++++++++++++++++++++++
10584  drivers/remoteproc/remoteproc_debugfs.c      |  179 ++++
10585  drivers/remoteproc/remoteproc_internal.h     |   44 +
10586  drivers/remoteproc/remoteproc_rpmsg.c        |  295 ++++++
10587  drivers/rpmsg/Kconfig                        |    5 +
10588  drivers/rpmsg/Makefile                       |    1 +
10589  drivers/rpmsg/virtio_rpmsg_bus.c             | 1026 +++++++++++++++++++
10590  include/linux/mod_devicetable.h              |    9 +
10591  include/linux/remoteproc.h                   |  265 +++++
10592  include/linux/rpmsg.h                        |  326 ++++++
10593  include/linux/virtio_ids.h                   |    1 +
10594  samples/Kconfig                              |    8 +
10595  samples/Makefile                             |    2 +-
10596  samples/rpmsg/Makefile                       |    1 +
10597  samples/rpmsg/rpmsg_client_sample.c          |  100 ++
10598  26 files changed, 4784 insertions(+), 1 deletions(-)
10599  create mode 100644 Documentation/ABI/testing/sysfs-bus-rpmsg
10600  create mode 100644 Documentation/remoteproc.txt
10601  create mode 100644 Documentation/rpmsg.txt
10602  create mode 100644 arch/arm/plat-omap/include/plat/remoteproc.h
10603  create mode 100644 drivers/remoteproc/Kconfig
10604  create mode 100644 drivers/remoteproc/Makefile
10605  create mode 100644 drivers/remoteproc/omap_remoteproc.c
10606  create mode 100644 drivers/remoteproc/omap_remoteproc.h
10607  create mode 100644 drivers/remoteproc/remoteproc_core.c
10608  create mode 100644 drivers/remoteproc/remoteproc_debugfs.c
10609  create mode 100644 drivers/remoteproc/remoteproc_internal.h
10610  create mode 100644 drivers/remoteproc/remoteproc_rpmsg.c
10611  create mode 100644 drivers/rpmsg/Kconfig
10612  create mode 100644 drivers/rpmsg/Makefile
10613  create mode 100644 drivers/rpmsg/virtio_rpmsg_bus.c
10614  create mode 100644 include/linux/remoteproc.h
10615  create mode 100644 include/linux/rpmsg.h
10616  create mode 100644 samples/rpmsg/Makefile
10617  create mode 100644 samples/rpmsg/rpmsg_client_sample.c
10618 $ git am -3 ../patches/rpmsg__rename_virtqueue_add_buf_gfp_to_virtqueue_add_buf.patch
10619 Applying: rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf
10620 $ git reset HEAD^
10621 Unstaged changes after reset:
10622 M       drivers/rpmsg/virtio_rpmsg_bus.c
10623 $ git add .
10624 $ git commit -v -a --amend
10625 [master fb2f562] Merge remote-tracking branch 'remoteproc/for-next'
10626 Merging kvmtool/master (102ee3b kvm tools: Get correct 64-bit types on PPC64 and link appropriately)
10627 $ git merge kvmtool/master
10628 Resolved 'include/net/9p/9p.h' using previous resolution.
10629 Resolved 'scripts/kconfig/Makefile' using previous resolution.
10630 Auto-merging scripts/kconfig/Makefile
10631 CONFLICT (content): Merge conflict in scripts/kconfig/Makefile
10632 Auto-merging include/net/9p/9p.h
10633 CONFLICT (content): Merge conflict in include/net/9p/9p.h
10634 Auto-merging arch/x86/Kconfig
10635 Auto-merging MAINTAINERS
10636 Automatic merge failed; fix conflicts and then commit the result.
10637 $ git commit -v -a
10638 [master eb65463] Merge remote-tracking branch 'kvmtool/master'
10639 $ git diff -M --stat --summary HEAD^..
10640  MAINTAINERS                                  |    8 +
10641  arch/powerpc/include/asm/types.h             |    5 +-
10642  arch/x86/Kconfig                             |   30 +
10643  scripts/kconfig/Makefile                     |    6 +-
10644  tools/kvm/.gitignore                         |   11 +
10645  tools/kvm/CREDITS-Git                        |   30 +
10646  tools/kvm/Documentation/kernel-debugging.txt |   15 +
10647  tools/kvm/Documentation/kvm-balloon.txt      |   24 +
10648  tools/kvm/Documentation/kvm-debug.txt        |   16 +
10649  tools/kvm/Documentation/kvm-list.txt         |   16 +
10650  tools/kvm/Documentation/kvm-pause.txt        |   16 +
10651  tools/kvm/Documentation/kvm-resume.txt       |   16 +
10652  tools/kvm/Documentation/kvm-run.txt          |   62 ++
10653  tools/kvm/Documentation/kvm-sandbox.txt      |   16 +
10654  tools/kvm/Documentation/kvm-setup.txt        |   15 +
10655  tools/kvm/Documentation/kvm-stat.txt         |   19 +
10656  tools/kvm/Documentation/kvm-stop.txt         |   16 +
10657  tools/kvm/Documentation/kvm-version.txt      |   21 +
10658  tools/kvm/Documentation/virtio-console.txt   |   41 +
10659  tools/kvm/Makefile                           |  359 +++++++
10660  tools/kvm/README                             |  109 ++
10661  tools/kvm/builtin-balloon.c                  |   90 ++
10662  tools/kvm/builtin-debug.c                    |  100 ++
10663  tools/kvm/builtin-help.c                     |   62 ++
10664  tools/kvm/builtin-list.c                     |  156 +++
10665  tools/kvm/builtin-pause.c                    |   78 ++
10666  tools/kvm/builtin-resume.c                   |   78 ++
10667  tools/kvm/builtin-run.c                      | 1137 ++++++++++++++++++++
10668  tools/kvm/builtin-sandbox.c                  |    9 +
10669  tools/kvm/builtin-setup.c                    |  242 +++++
10670  tools/kvm/builtin-stat.c                     |  131 +++
10671  tools/kvm/builtin-stop.c                     |   78 ++
10672  tools/kvm/builtin-version.c                  |   15 +
10673  tools/kvm/code16gcc.h                        |   15 +
10674  tools/kvm/command-list.txt                   |   15 +
10675  tools/kvm/config/feature-tests.mak           |  168 +++
10676  tools/kvm/config/utilities.mak               |  188 ++++
10677  tools/kvm/disk/blk.c                         |   39 +
10678  tools/kvm/disk/core.c                        |  242 +++++
10679  tools/kvm/disk/qcow.c                        | 1454 ++++++++++++++++++++++++++
10680  tools/kvm/disk/raw.c                         |  140 +++
10681  tools/kvm/framebuffer.c                      |   68 ++
10682  tools/kvm/guest/init.c                       |   38 +
10683  tools/kvm/guest/init_stage2.c                |   45 +
10684  tools/kvm/guest/passwd                       |    1 +
10685  tools/kvm/guest_compat.c                     |   99 ++
10686  tools/kvm/hw/i8042.c                         |  348 ++++++
10687  tools/kvm/hw/pci-shmem.c                     |  262 +++++
10688  tools/kvm/hw/rtc.c                           |  118 +++
10689  tools/kvm/hw/serial.c                        |  357 +++++++
10690  tools/kvm/hw/vesa.c                          |   78 ++
10691  tools/kvm/include/asm/hweight.h              |    8 +
10692  tools/kvm/include/bios/memcpy.h              |    9 +
10693  tools/kvm/include/kvm/8250-serial.h          |   10 +
10694  tools/kvm/include/kvm/apic.h                 |   17 +
10695  tools/kvm/include/kvm/brlock.h               |   41 +
10696  tools/kvm/include/kvm/builtin-balloon.h      |    7 +
10697  tools/kvm/include/kvm/builtin-debug.h        |   23 +
10698  tools/kvm/include/kvm/builtin-help.h         |    6 +
10699  tools/kvm/include/kvm/builtin-list.h         |    7 +
10700  tools/kvm/include/kvm/builtin-pause.h        |    7 +
10701  tools/kvm/include/kvm/builtin-resume.h       |    7 +
10702  tools/kvm/include/kvm/builtin-run.h          |    9 +
10703  tools/kvm/include/kvm/builtin-sandbox.h      |    6 +
10704  tools/kvm/include/kvm/builtin-setup.h        |    9 +
10705  tools/kvm/include/kvm/builtin-stat.h         |    7 +
10706  tools/kvm/include/kvm/builtin-stop.h         |    7 +
10707  tools/kvm/include/kvm/builtin-version.h      |    6 +
10708  tools/kvm/include/kvm/compiler.h             |    6 +
10709  tools/kvm/include/kvm/disk-image.h           |   81 ++
10710  tools/kvm/include/kvm/e820.h                 |   12 +
10711  tools/kvm/include/kvm/framebuffer.h          |   34 +
10712  tools/kvm/include/kvm/guest_compat.h         |    9 +
10713  tools/kvm/include/kvm/i8042.h                |   12 +
10714  tools/kvm/include/kvm/ioeventfd.h            |   27 +
10715  tools/kvm/include/kvm/ioport.h               |   66 ++
10716  tools/kvm/include/kvm/irq.h                  |   31 +
10717  tools/kvm/include/kvm/kvm-cmd.h              |   17 +
10718  tools/kvm/include/kvm/kvm-cpu.h              |   24 +
10719  tools/kvm/include/kvm/kvm-ipc.h              |   27 +
10720  tools/kvm/include/kvm/kvm.h                  |   86 ++
10721  tools/kvm/include/kvm/mutex.h                |   33 +
10722  tools/kvm/include/kvm/parse-options.h        |  213 ++++
10723  tools/kvm/include/kvm/pci-shmem.h            |   28 +
10724  tools/kvm/include/kvm/pci.h                  |   94 ++
10725  tools/kvm/include/kvm/qcow.h                 |  133 +++
10726  tools/kvm/include/kvm/rbtree-interval.h      |   27 +
10727  tools/kvm/include/kvm/read-write.h           |   43 +
10728  tools/kvm/include/kvm/rtc.h                  |    6 +
10729  tools/kvm/include/kvm/rwsem.h                |   39 +
10730  tools/kvm/include/kvm/sdl.h                  |   17 +
10731  tools/kvm/include/kvm/segment.h              |   21 +
10732  tools/kvm/include/kvm/strbuf.h               |   19 +
10733  tools/kvm/include/kvm/symbol.h               |   22 +
10734  tools/kvm/include/kvm/term.h                 |   20 +
10735  tools/kvm/include/kvm/threadpool.h           |   37 +
10736  tools/kvm/include/kvm/types.h                |    7 +
10737  tools/kvm/include/kvm/uip.h                  |  358 +++++++
10738  tools/kvm/include/kvm/util.h                 |   72 ++
10739  tools/kvm/include/kvm/vesa.h                 |   18 +
10740  tools/kvm/include/kvm/virtio-9p.h            |   74 ++
10741  tools/kvm/include/kvm/virtio-balloon.h       |    8 +
10742  tools/kvm/include/kvm/virtio-blk.h           |   13 +
10743  tools/kvm/include/kvm/virtio-console.h       |    9 +
10744  tools/kvm/include/kvm/virtio-net.h           |   23 +
10745  tools/kvm/include/kvm/virtio-pci-dev.h       |   37 +
10746  tools/kvm/include/kvm/virtio-pci.h           |   48 +
10747  tools/kvm/include/kvm/virtio-rng.h           |    9 +
10748  tools/kvm/include/kvm/virtio-trans.h         |   43 +
10749  tools/kvm/include/kvm/virtio.h               |   67 ++
10750  tools/kvm/include/kvm/vnc.h                  |   14 +
10751  tools/kvm/include/linux/bitops.h             |   33 +
10752  tools/kvm/include/linux/byteorder.h          |    7 +
10753  tools/kvm/include/linux/kernel.h             |   39 +
10754  tools/kvm/include/linux/module.h             |    6 +
10755  tools/kvm/include/linux/prefetch.h           |    6 +
10756  tools/kvm/include/linux/types.h              |   51 +
10757  tools/kvm/ioeventfd.c                        |  142 +++
10758  tools/kvm/ioport.c                           |  138 +++
10759  tools/kvm/kvm-cmd.c                          |   93 ++
10760  tools/kvm/kvm-cpu.c                          |  172 +++
10761  tools/kvm/kvm-ipc.c                          |  171 +++
10762  tools/kvm/kvm.c                              |  522 +++++++++
10763  tools/kvm/main.c                             |   19 +
10764  tools/kvm/mmio.c                             |  135 +++
10765  tools/kvm/net/uip/arp.c                      |   30 +
10766  tools/kvm/net/uip/buf.c                      |  114 ++
10767  tools/kvm/net/uip/core.c                     |  190 ++++
10768  tools/kvm/net/uip/csum.c                     |   92 ++
10769  tools/kvm/net/uip/dhcp.c                     |  203 ++++
10770  tools/kvm/net/uip/icmp.c                     |   29 +
10771  tools/kvm/net/uip/ipv4.c                     |   29 +
10772  tools/kvm/net/uip/tcp.c                      |  317 ++++++
10773  tools/kvm/net/uip/udp.c                      |  236 +++++
10774  tools/kvm/pci.c                              |  185 ++++
10775  tools/kvm/powerpc/include/kvm/barrier.h      |    6 +
10776  tools/kvm/powerpc/include/kvm/kvm-arch.h     |   70 ++
10777  tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h |   66 ++
10778  tools/kvm/powerpc/ioport.c                   |   18 +
10779  tools/kvm/powerpc/irq.c                      |   40 +
10780  tools/kvm/powerpc/kvm-cpu.c                  |  233 ++++
10781  tools/kvm/powerpc/kvm.c                      |  187 ++++
10782  tools/kvm/symbol.c                           |   98 ++
10783  tools/kvm/term.c                             |  167 +++
10784  tools/kvm/tests/Makefile                     |   19 +
10785  tools/kvm/tests/boot/Makefile                |   13 +
10786  tools/kvm/tests/boot/init.c                  |   11 +
10787  tools/kvm/tests/kernel/.gitignore            |    2 +
10788  tools/kvm/tests/kernel/Makefile              |   20 +
10789  tools/kvm/tests/kernel/README                |   16 +
10790  tools/kvm/tests/kernel/kernel.S              |    8 +
10791  tools/kvm/tests/pit/.gitignore               |    2 +
10792  tools/kvm/tests/pit/Makefile                 |   20 +
10793  tools/kvm/tests/pit/README                   |   16 +
10794  tools/kvm/tests/pit/tick.S                   |  109 ++
10795  tools/kvm/ui/sdl.c                           |  280 +++++
10796  tools/kvm/ui/vnc.c                           |  218 ++++
10797  tools/kvm/util/KVMTOOLS-VERSION-GEN          |   40 +
10798  tools/kvm/util/generate-cmdlist.sh           |   23 +
10799  tools/kvm/util/kvm-ifup-vbr0                 |    6 +
10800  tools/kvm/util/parse-options.c               |  577 ++++++++++
10801  tools/kvm/util/rbtree-interval.c             |   90 ++
10802  tools/kvm/util/read-write.c                  |  344 ++++++
10803  tools/kvm/util/set_private_br.sh             |   51 +
10804  tools/kvm/util/strbuf.c                      |   39 +
10805  tools/kvm/util/threadpool.c                  |  145 +++
10806  tools/kvm/util/util.c                        |  116 ++
10807  tools/kvm/virtio/9p-pdu.c                    |  287 +++++
10808  tools/kvm/virtio/9p.c                        | 1320 +++++++++++++++++++++++
10809  tools/kvm/virtio/balloon.c                   |  268 +++++
10810  tools/kvm/virtio/blk.c                       |  273 +++++
10811  tools/kvm/virtio/console.c                   |  204 ++++
10812  tools/kvm/virtio/core.c                      |  159 +++
10813  tools/kvm/virtio/net.c                       |  556 ++++++++++
10814  tools/kvm/virtio/pci.c                       |  347 ++++++
10815  tools/kvm/virtio/rng.c                       |  189 ++++
10816  tools/kvm/virtio/trans.c                     |   22 +
10817  tools/kvm/x86/bios.c                         |  174 +++
10818  tools/kvm/x86/bios/.gitignore                |    3 +
10819  tools/kvm/x86/bios/bios-rom.S                |   12 +
10820  tools/kvm/x86/bios/e820.c                    |   72 ++
10821  tools/kvm/x86/bios/entry.S                   |   92 ++
10822  tools/kvm/x86/bios/gen-offsets.sh            |   14 +
10823  tools/kvm/x86/bios/int10.c                   |  110 ++
10824  tools/kvm/x86/bios/int15.c                   |   18 +
10825  tools/kvm/x86/bios/local.S                   |    7 +
10826  tools/kvm/x86/bios/macro.S                   |   25 +
10827  tools/kvm/x86/bios/memcpy.c                  |   23 +
10828  tools/kvm/x86/bios/rom.ld.S                  |   17 +
10829  tools/kvm/x86/cpuid.c                        |   55 +
10830  tools/kvm/x86/include/kvm/assembly.h         |   24 +
10831  tools/kvm/x86/include/kvm/barrier.h          |   16 +
10832  tools/kvm/x86/include/kvm/bios-export.h      |   13 +
10833  tools/kvm/x86/include/kvm/bios.h             |   88 ++
10834  tools/kvm/x86/include/kvm/boot-protocol.h    |   16 +
10835  tools/kvm/x86/include/kvm/cpufeature.h       |   41 +
10836  tools/kvm/x86/include/kvm/interrupt.h        |   26 +
10837  tools/kvm/x86/include/kvm/kvm-arch.h         |   62 ++
10838  tools/kvm/x86/include/kvm/kvm-cpu-arch.h     |   49 +
10839  tools/kvm/x86/include/kvm/mptable.h          |    8 +
10840  tools/kvm/x86/interrupt.c                    |   27 +
10841  tools/kvm/x86/ioport.c                       |   59 +
10842  tools/kvm/x86/irq.c                          |  193 ++++
10843  tools/kvm/x86/kvm-cpu.c                      |  422 ++++++++
10844  tools/kvm/x86/kvm.c                          |  370 +++++++
10845  tools/kvm/x86/mptable.c                      |  276 +++++
10846  206 files changed, 20816 insertions(+), 2 deletions(-)
10847  create mode 100644 tools/kvm/.gitignore
10848  create mode 100644 tools/kvm/CREDITS-Git
10849  create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
10850  create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
10851  create mode 100644 tools/kvm/Documentation/kvm-debug.txt
10852  create mode 100644 tools/kvm/Documentation/kvm-list.txt
10853  create mode 100644 tools/kvm/Documentation/kvm-pause.txt
10854  create mode 100644 tools/kvm/Documentation/kvm-resume.txt
10855  create mode 100644 tools/kvm/Documentation/kvm-run.txt
10856  create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
10857  create mode 100644 tools/kvm/Documentation/kvm-setup.txt
10858  create mode 100644 tools/kvm/Documentation/kvm-stat.txt
10859  create mode 100644 tools/kvm/Documentation/kvm-stop.txt
10860  create mode 100644 tools/kvm/Documentation/kvm-version.txt
10861  create mode 100644 tools/kvm/Documentation/virtio-console.txt
10862  create mode 100644 tools/kvm/Makefile
10863  create mode 100644 tools/kvm/README
10864  create mode 100644 tools/kvm/builtin-balloon.c
10865  create mode 100644 tools/kvm/builtin-debug.c
10866  create mode 100644 tools/kvm/builtin-help.c
10867  create mode 100644 tools/kvm/builtin-list.c
10868  create mode 100644 tools/kvm/builtin-pause.c
10869  create mode 100644 tools/kvm/builtin-resume.c
10870  create mode 100644 tools/kvm/builtin-run.c
10871  create mode 100644 tools/kvm/builtin-sandbox.c
10872  create mode 100644 tools/kvm/builtin-setup.c
10873  create mode 100644 tools/kvm/builtin-stat.c
10874  create mode 100644 tools/kvm/builtin-stop.c
10875  create mode 100644 tools/kvm/builtin-version.c
10876  create mode 100644 tools/kvm/code16gcc.h
10877  create mode 100644 tools/kvm/command-list.txt
10878  create mode 100644 tools/kvm/config/feature-tests.mak
10879  create mode 100644 tools/kvm/config/utilities.mak
10880  create mode 100644 tools/kvm/disk/blk.c
10881  create mode 100644 tools/kvm/disk/core.c
10882  create mode 100644 tools/kvm/disk/qcow.c
10883  create mode 100644 tools/kvm/disk/raw.c
10884  create mode 100644 tools/kvm/framebuffer.c
10885  create mode 100644 tools/kvm/guest/init.c
10886  create mode 100644 tools/kvm/guest/init_stage2.c
10887  create mode 100644 tools/kvm/guest/passwd
10888  create mode 100644 tools/kvm/guest_compat.c
10889  create mode 100644 tools/kvm/hw/i8042.c
10890  create mode 100644 tools/kvm/hw/pci-shmem.c
10891  create mode 100644 tools/kvm/hw/rtc.c
10892  create mode 100644 tools/kvm/hw/serial.c
10893  create mode 100644 tools/kvm/hw/vesa.c
10894  create mode 100644 tools/kvm/include/asm/hweight.h
10895  create mode 100644 tools/kvm/include/bios/memcpy.h
10896  create mode 100644 tools/kvm/include/kvm/8250-serial.h
10897  create mode 100644 tools/kvm/include/kvm/apic.h
10898  create mode 100644 tools/kvm/include/kvm/brlock.h
10899  create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
10900  create mode 100644 tools/kvm/include/kvm/builtin-debug.h
10901  create mode 100644 tools/kvm/include/kvm/builtin-help.h
10902  create mode 100644 tools/kvm/include/kvm/builtin-list.h
10903  create mode 100644 tools/kvm/include/kvm/builtin-pause.h
10904  create mode 100644 tools/kvm/include/kvm/builtin-resume.h
10905  create mode 100644 tools/kvm/include/kvm/builtin-run.h
10906  create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
10907  create mode 100644 tools/kvm/include/kvm/builtin-setup.h
10908  create mode 100644 tools/kvm/include/kvm/builtin-stat.h
10909  create mode 100644 tools/kvm/include/kvm/builtin-stop.h
10910  create mode 100644 tools/kvm/include/kvm/builtin-version.h
10911  create mode 100644 tools/kvm/include/kvm/compiler.h
10912  create mode 100644 tools/kvm/include/kvm/disk-image.h
10913  create mode 100644 tools/kvm/include/kvm/e820.h
10914  create mode 100644 tools/kvm/include/kvm/framebuffer.h
10915  create mode 100644 tools/kvm/include/kvm/guest_compat.h
10916  create mode 100644 tools/kvm/include/kvm/i8042.h
10917  create mode 100644 tools/kvm/include/kvm/ioeventfd.h
10918  create mode 100644 tools/kvm/include/kvm/ioport.h
10919  create mode 100644 tools/kvm/include/kvm/irq.h
10920  create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
10921  create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
10922  create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
10923  create mode 100644 tools/kvm/include/kvm/kvm.h
10924  create mode 100644 tools/kvm/include/kvm/mutex.h
10925  create mode 100644 tools/kvm/include/kvm/parse-options.h
10926  create mode 100644 tools/kvm/include/kvm/pci-shmem.h
10927  create mode 100644 tools/kvm/include/kvm/pci.h
10928  create mode 100644 tools/kvm/include/kvm/qcow.h
10929  create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
10930  create mode 100644 tools/kvm/include/kvm/read-write.h
10931  create mode 100644 tools/kvm/include/kvm/rtc.h
10932  create mode 100644 tools/kvm/include/kvm/rwsem.h
10933  create mode 100644 tools/kvm/include/kvm/sdl.h
10934  create mode 100644 tools/kvm/include/kvm/segment.h
10935  create mode 100644 tools/kvm/include/kvm/strbuf.h
10936  create mode 100644 tools/kvm/include/kvm/symbol.h
10937  create mode 100644 tools/kvm/include/kvm/term.h
10938  create mode 100644 tools/kvm/include/kvm/threadpool.h
10939  create mode 100644 tools/kvm/include/kvm/types.h
10940  create mode 100644 tools/kvm/include/kvm/uip.h
10941  create mode 100644 tools/kvm/include/kvm/util.h
10942  create mode 100644 tools/kvm/include/kvm/vesa.h
10943  create mode 100644 tools/kvm/include/kvm/virtio-9p.h
10944  create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
10945  create mode 100644 tools/kvm/include/kvm/virtio-blk.h
10946  create mode 100644 tools/kvm/include/kvm/virtio-console.h
10947  create mode 100644 tools/kvm/include/kvm/virtio-net.h
10948  create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
10949  create mode 100644 tools/kvm/include/kvm/virtio-pci.h
10950  create mode 100644 tools/kvm/include/kvm/virtio-rng.h
10951  create mode 100644 tools/kvm/include/kvm/virtio-trans.h
10952  create mode 100644 tools/kvm/include/kvm/virtio.h
10953  create mode 100644 tools/kvm/include/kvm/vnc.h
10954  create mode 100644 tools/kvm/include/linux/bitops.h
10955  create mode 100644 tools/kvm/include/linux/byteorder.h
10956  create mode 100644 tools/kvm/include/linux/kernel.h
10957  create mode 100644 tools/kvm/include/linux/module.h
10958  create mode 100644 tools/kvm/include/linux/prefetch.h
10959  create mode 100644 tools/kvm/include/linux/types.h
10960  create mode 100644 tools/kvm/ioeventfd.c
10961  create mode 100644 tools/kvm/ioport.c
10962  create mode 100644 tools/kvm/kvm-cmd.c
10963  create mode 100644 tools/kvm/kvm-cpu.c
10964  create mode 100644 tools/kvm/kvm-ipc.c
10965  create mode 100644 tools/kvm/kvm.c
10966  create mode 100644 tools/kvm/main.c
10967  create mode 100644 tools/kvm/mmio.c
10968  create mode 100644 tools/kvm/net/uip/arp.c
10969  create mode 100644 tools/kvm/net/uip/buf.c
10970  create mode 100644 tools/kvm/net/uip/core.c
10971  create mode 100644 tools/kvm/net/uip/csum.c
10972  create mode 100644 tools/kvm/net/uip/dhcp.c
10973  create mode 100644 tools/kvm/net/uip/icmp.c
10974  create mode 100644 tools/kvm/net/uip/ipv4.c
10975  create mode 100644 tools/kvm/net/uip/tcp.c
10976  create mode 100644 tools/kvm/net/uip/udp.c
10977  create mode 100644 tools/kvm/pci.c
10978  create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
10979  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
10980  create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
10981  create mode 100644 tools/kvm/powerpc/ioport.c
10982  create mode 100644 tools/kvm/powerpc/irq.c
10983  create mode 100644 tools/kvm/powerpc/kvm-cpu.c
10984  create mode 100644 tools/kvm/powerpc/kvm.c
10985  create mode 100644 tools/kvm/symbol.c
10986  create mode 100644 tools/kvm/term.c
10987  create mode 100644 tools/kvm/tests/Makefile
10988  create mode 100644 tools/kvm/tests/boot/Makefile
10989  create mode 100644 tools/kvm/tests/boot/init.c
10990  create mode 100644 tools/kvm/tests/kernel/.gitignore
10991  create mode 100644 tools/kvm/tests/kernel/Makefile
10992  create mode 100644 tools/kvm/tests/kernel/README
10993  create mode 100644 tools/kvm/tests/kernel/kernel.S
10994  create mode 100644 tools/kvm/tests/pit/.gitignore
10995  create mode 100644 tools/kvm/tests/pit/Makefile
10996  create mode 100644 tools/kvm/tests/pit/README
10997  create mode 100644 tools/kvm/tests/pit/tick.S
10998  create mode 100644 tools/kvm/ui/sdl.c
10999  create mode 100644 tools/kvm/ui/vnc.c
11000  create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
11001  create mode 100755 tools/kvm/util/generate-cmdlist.sh
11002  create mode 100755 tools/kvm/util/kvm-ifup-vbr0
11003  create mode 100644 tools/kvm/util/parse-options.c
11004  create mode 100644 tools/kvm/util/rbtree-interval.c
11005  create mode 100644 tools/kvm/util/read-write.c
11006  create mode 100755 tools/kvm/util/set_private_br.sh
11007  create mode 100644 tools/kvm/util/strbuf.c
11008  create mode 100644 tools/kvm/util/threadpool.c
11009  create mode 100644 tools/kvm/util/util.c
11010  create mode 100644 tools/kvm/virtio/9p-pdu.c
11011  create mode 100644 tools/kvm/virtio/9p.c
11012  create mode 100644 tools/kvm/virtio/balloon.c
11013  create mode 100644 tools/kvm/virtio/blk.c
11014  create mode 100644 tools/kvm/virtio/console.c
11015  create mode 100644 tools/kvm/virtio/core.c
11016  create mode 100644 tools/kvm/virtio/net.c
11017  create mode 100644 tools/kvm/virtio/pci.c
11018  create mode 100644 tools/kvm/virtio/rng.c
11019  create mode 100644 tools/kvm/virtio/trans.c
11020  create mode 100644 tools/kvm/x86/bios.c
11021  create mode 100644 tools/kvm/x86/bios/.gitignore
11022  create mode 100644 tools/kvm/x86/bios/bios-rom.S
11023  create mode 100644 tools/kvm/x86/bios/e820.c
11024  create mode 100644 tools/kvm/x86/bios/entry.S
11025  create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
11026  create mode 100644 tools/kvm/x86/bios/int10.c
11027  create mode 100644 tools/kvm/x86/bios/int15.c
11028  create mode 100644 tools/kvm/x86/bios/local.S
11029  create mode 100644 tools/kvm/x86/bios/macro.S
11030  create mode 100644 tools/kvm/x86/bios/memcpy.c
11031  create mode 100644 tools/kvm/x86/bios/rom.ld.S
11032  create mode 100644 tools/kvm/x86/cpuid.c
11033  create mode 100644 tools/kvm/x86/include/kvm/assembly.h
11034  create mode 100644 tools/kvm/x86/include/kvm/barrier.h
11035  create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
11036  create mode 100644 tools/kvm/x86/include/kvm/bios.h
11037  create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
11038  create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
11039  create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
11040  create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
11041  create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
11042  create mode 100644 tools/kvm/x86/include/kvm/mptable.h
11043  create mode 100644 tools/kvm/x86/interrupt.c
11044  create mode 100644 tools/kvm/x86/ioport.c
11045  create mode 100644 tools/kvm/x86/irq.c
11046  create mode 100644 tools/kvm/x86/kvm-cpu.c
11047  create mode 100644 tools/kvm/x86/kvm.c
11048  create mode 100644 tools/kvm/x86/mptable.c
11049 Merging uapi/for-next (1632b9e UAPI: Split trivial #if defined(__KERNEL__) && X conditionals)
11050 $ git merge uapi/for-next
11051 Auto-merging arch/arm/include/asm/swab.h
11052 Merge made by the 'recursive' strategy.
11053  arch/arm/include/asm/hwcap.h       |    4 +++-
11054  arch/arm/include/asm/swab.h        |    7 +++++--
11055  arch/arm/include/asm/unistd.h      |    4 +++-
11056  arch/frv/include/asm/param.h       |   16 +---------------
11057  arch/ia64/include/asm/intrinsics.h |   21 +++++++++++++--------
11058  arch/m32r/include/asm/param.h      |   18 +-----------------
11059  arch/mips/include/asm/Kbuild       |    4 +++-
11060  arch/mips/include/asm/types.h      |   10 +++++++---
11061  arch/mn10300/include/asm/param.h   |   18 +-----------------
11062  arch/s390/include/asm/chpid.h      |    2 +-
11063  arch/s390/include/asm/itcw.h       |    2 +-
11064  arch/s390/include/asm/mman.h       |    4 +++-
11065  arch/sparc/include/asm/siginfo.h   |    2 --
11066  arch/tile/include/asm/signal.h     |    4 +++-
11067  include/asm-generic/param.h        |   13 +++++++------
11068  include/linux/acct.h               |    3 +++
11069  include/linux/cuda.h               |    5 +++++
11070  include/linux/elf.h                |   18 +++++++++---------
11071  include/linux/isdn_divertif.h      |    4 ++++
11072  include/linux/mroute6.h            |    4 +++-
11073  include/linux/patchkey.h           |    4 +++-
11074  include/linux/pmu.h                |    4 ++++
11075  include/linux/sound.h              |    4 ++++
11076  include/linux/soundcard.h          |    4 +++-
11077  include/video/edid.h               |    6 ++----
11078  25 files changed, 92 insertions(+), 93 deletions(-)
11079 Merging scsi-post-merge/merge-base:master ()
11080 $ git clone -s -l -n -q . ../rebase-tmp
11081 $ cd ../rebase-tmp
11082 $ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
11083 From ../next
11084  * [new branch]      quilt/akpm -> akpm
11085 $ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
11086 From ../next
11087  * [new branch]      quilt/akpm-base -> akpm-base
11088 $ git checkout akpm
11089 Switched to branch 'akpm'
11090 $ git rebase --onto master akpm-base
11091 First, rewinding head to replay your work on top of it...
11092 Applying: cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask
11093 Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix
11094 Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix-2
11095 Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix-2-fix-2
11096 Applying: cpusets-stall-when-updating-mems_allowed-for-mempolicy-or-disjoint-nodemask-fix-2-fix-2-fix
11097 Applying: memcg: add mem_cgroup_replace_page_cache() to fix LRU issue
11098 Applying: nilfs2: unbreak compat ioctl
11099 Applying: nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()
11100 Applying: memcg: keep root group unchanged if creation fails
11101 Applying: oom: fix integer overflow of points in oom_badness
11102 Applying: ipmi_watchdog: restore settings when BMC reset
11103 Applying: vmalloc: Remove static declaration of va from __get_vm_area_node
11104 Applying: binary_sysctl(): fix memory leak
11105 Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy
11106 Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
11107 Applying: acerhdf: add support for new hardware
11108 Applying: acerhdf: lowered default temp fanon/fanoff values
11109 Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
11110 Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs
11111 Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-fix
11112 Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2
11113 Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path
11114 Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix
11115 Applying: x86, olpc: add debugfs interface for EC commands
11116 Applying: drivers/platform/x86/sony-laptop.c: fix scancodes
11117 Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes
11118 Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2
11119 Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2-checkpatch-fixes
11120 Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
11121 Applying: arm, exec: remove redundant set_fs(USER_DS)
11122 Applying: hrtimers: Special-case zero length sleeps
11123 Applying: tick-sched: add specific do_timer_cpu value for nohz off mode
11124 Using index info to reconstruct a base tree...
11125 Falling back to patching base and 3-way merge...
11126 Auto-merging kernel/time/tick-sched.c
11127 Auto-merging drivers/base/sys.c
11128 CONFLICT (content): Merge conflict in drivers/base/sys.c
11129 Failed to merge in the changes.
11130 Patch failed at 0032 tick-sched: add specific do_timer_cpu value for nohz off mode
11131
11132 When you have resolved this problem run "git rebase --continue".
11133 If you would prefer to skip this patch, instead run "git rebase --skip".
11134 To check out the original branch and stop rebasing run "git rebase --abort".
11135
11136 $ git rebase --continue
11137 Applying: tick-sched: add specific do_timer_cpu value for nohz off mode
11138 Applying: ia64, exec: remove redundant set_fs(USER_DS)
11139 Applying: kconfig: add merge_config.sh script
11140 Applying: merge_config.sh: use signal names compatible with dash and bash
11141 Applying: merge_config.sh: whitespace cleanup
11142 Applying: merge_config.sh: fix bug in final check
11143 Applying: ctags: remove struct forward declarations
11144 Applying: ipc/mqueue: cleanup definition names and locations
11145 Applying: ipc/mqueue: switch back to using non-max values on create
11146 Applying: ipc/mqueue: enforce hard limits
11147 Applying: ipc/mqueue: update maximums for the mqueue subsystem
11148 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix
11149 Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes
11150 Applying: debugobjects: Fix selftest for static warnings
11151 Applying: ext4: use proper little-endian bitops
11152 Applying: parisc, exec: remove redundant set_fs(USER_DS)
11153 Applying: scsi: fix a header to include linux/types.h
11154 Applying: drivers/scsi/megaraid.c: fix sparse warnings
11155 Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()
11156 Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user()
11157 Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock
11158 Applying: fs: remove unneeded plug in mpage_readpages()
11159 Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media
11160 Applying: slub: document setting min order with debug_guardpage_minorder > 0
11161 Applying: slub-document-setting-min-order-with-debug_guardpage_minorder-0-checkpatch-fixes
11162 Applying: mm/page-writeback.c: make determine_dirtyable_memory static again
11163 Applying: vmscan: promote shared file mapped pages
11164 Applying: vmscan: activate executable pages after first usage
11165 Applying: mm: add free_hot_cold_page_list() helper
11166 Applying: mm-add-free_hot_cold_page_list-helper-v2
11167 Applying: mm-add-free_hot_cold_page_list-helper-v3
11168 Applying: mm: remove unused pagevec_free
11169 Applying: mm-tracepoint: rename page-free events
11170 Applying: mm-tracepoint: fix documentation and examples
11171 Applying: mm: fix page-faults detection in swap-token logic
11172 Applying: mm: add extra free kbytes tunable
11173 Applying: mm-add-extra-free-kbytes-tunable-update
11174 Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
11175 Applying: mm: migrate: one less atomic operation
11176 Applying: mm: do not stall in synchronous compaction for THP allocations
11177 Applying: mm-do-not-stall-in-synchronous-compaction-for-thp-allocations-v3
11178 Applying: mm: reduce the amount of work done when updating min_free_kbytes
11179 Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes
11180 Applying: mm: avoid livelock on !__GFP_FS allocations
11181 Applying: mm: account reaped page cache on inode cache pruning
11182 Applying: hugetlb: detect race upon page allocation failure during COW
11183 Applying: hugetlb: clarify hugetlb_instantiation_mutex usage
11184 Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault
11185 Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix
11186 Applying: kernel.h: add BUILD_BUG() macro
11187 Applying: kernel.h: Add BUILD_BUG() macro.
11188 Applying: hugetlb: replace BUG() with BUILD_BUG() for dummy definitions
11189 Applying: mm: more intensive memory corruption debugging
11190 Applying: mm-more-intensive-memory-corruption-debug-fix
11191 Applying: PM/Hibernate: do not count debug pages as savable
11192 Applying: slub: min order when debug_guardpage_minorder > 0
11193 Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED
11194 Applying: mm, debug: test for online nid when allocating on single node
11195 Applying: vmscan: add task name to warn_scan_unevictable() messages
11196 Applying: mm: exclude reserved pages from dirtyable memory
11197 Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix
11198 Applying: mm: writeback: cleanups in preparation for per-zone dirty limits
11199 Applying: mm: try to distribute dirty pages fairly across zones
11200 Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin()
11201 Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations
11202 Applying: mm: compaction: push isolate search base of compact control one pfn ahead
11203 Applying: bootmem: micro optimize freeing pages in bulk
11204 Applying: mm: fix off-by-two in __zone_watermark_ok()
11205 Applying: mremap: enforce rmap src/dst vma ordering in case of vma_merge() succeeding in copy_vma()
11206 Applying: mremap-enforce-rmap-src-dst-vma-ordering-in-case-of-vma_merge-succeeding-in-copy_vma-update
11207 Applying: mm: simplify find_vma_prev()
11208 Applying: mm-simplify-find_vma_prev-fix
11209 Applying: mm: simplify find_vma_prev
11210 Applying: tracepoint: add tracepoints for debugging oom_score_adj
11211 Applying: hpet: factor timer allocate from open
11212 Applying: intel_idle: fix API misuse
11213 Applying: intel_idle: disable auto_demotion for hotplugged CPUs
11214 Applying: kernel.h: neaten panic prototype
11215 Applying: include/linux/linkage.h: remove unused NORET_AND macro
11216 Applying: treewide: remove useless NORET_TYPE macro and uses
11217 Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn
11218 Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes
11219 Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro
11220 Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL
11221 Applying: mm,x86,um: move CMPXCHG_LOCAL config option
11222 Applying: mm,x86,um: move CMPXCHG_DOUBLE config option
11223 Applying: audit: always follow va_copy() with va_end()
11224 Applying: brlocks/lglocks: clean up code
11225 Applying: brlocks-lglocks-clean-up-code-checkpatch-fixes
11226 Applying: ceph, cifs, nfs, fuse: boolean and / or confusion
11227 Applying: core kernel: add refcount type and refcount misuse debugging
11228 Applying: pipe: fail cleanly when root tries F_SETPIPE_SZ with big size
11229 Applying: get_maintainers.pl: follow renames when looking up commit signers
11230 Applying: MAINTAINERS: update various arm F: patterns
11231 Applying: MAINTAINERS: update adp gpio F: patterns
11232 Applying: MAINTAINERS: update bt8xx gpio F: patterns
11233 Applying: MAINTAINERS: update marvell ccic F: patterns
11234 Applying: MAINTAINERS: update mfd F: patterns
11235 Applying: MAINTAINERS: update sdhci F: patterns
11236 Applying: MAINTAINERS: update tulip F: patterns
11237 Applying: MAINTAINERS: update greth F: patterns
11238 Applying: MAINTAINERS: update encrypted-keys F: patterns
11239 Applying: MAINTAINERS: staging: media: update F: patterns
11240 Applying: MAINTAINERS: serial:blackfin: update F: pattern
11241 Applying: MAINTAINERS: spi: update F: patterns
11242 Applying: devfreq: add devfreq maintainer entry
11243 Applying: backlight: remove ADX backlight device support
11244 Applying: backlight: convert drivers/video/backlight/* to use module_platform_driver()
11245 Applying: backlight/ld9040.c: regulator control in the driver
11246 Applying: drivers/video/backlight/ep93xx_bl.c: remove duplicated header include
11247 Applying: leds: convert led platform drivers to module_platform_driver
11248 Applying: leds: convert led i2c drivers to module_i2c_driver
11249 Applying: leds: convert leds-dac124s085 to module_spi_driver
11250 Applying: drivers/leds/leds-lp5523.c: remove unneeded forward declaration
11251 Applying: drivers/leds/leds-bd2802.c: use gpio_request_one()
11252 Applying: drivers/leds/leds-netxbig.c: use gpio_request_one()
11253 Applying: leds: add driver for TCA6507 LED controller
11254 Applying: leds-add-driver-for-tca6507-led-controller-fix
11255 Applying: leds-add-driver-for-tca6507-led-controller-checkpatch-fixes
11256 Applying: drivers/leds/leds-mc13783.c: fix off-by-one for checking num_leds
11257 Applying: checkpatch: update signature "might be better as" warning
11258 Applying: checkpatch: prefer __printf over __attribute__((format(printf,...)))
11259 Applying: checkpatch: correctly track the end of preprocessor commands in context
11260 Applying: checkpatch: fix up complex macros context format
11261 Applying: checkpatch: check for common memset parameter issues against statments
11262 Applying: checkpatch: improve memset and min/max with cast checking
11263 Applying: checkpatch-improve-memset-and-min-max-with-cast-checking-fix
11264 Applying: checkpatch: ## is not a valid modifier
11265 Applying: checkpatch: optimise statement scanner when mid-statement
11266 Applying: checkpatch: only apply kconfig help checks for options which prompt
11267 Applying: checkpatch: fix EXPORT_SYMBOL handling following a function
11268 Applying: checkpatch: complex macro should allow the empty do while loop
11269 Applying: checkpatch: fix 'return is not a function' square bracket handling
11270 Applying: checkpatch: fix complex macros handling of square brackets
11271 Applying: checkpatch: ensure cast type is unique in the context parser
11272 Applying: checkpatch: typeof may have more complex arguments
11273 Applying: checkpatch: catch all occurences of type and cast spacing errors per line
11274 Applying: checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line-checkpatch-fixes
11275 Applying: crc32: optimize inner loop
11276 Applying: epoll: limit paths
11277 Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization
11278 Applying: MIPS: randomize PIE load address
11279 Applying: init/do_mounts.c: create /root if it does not exist
11280 Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing
11281 Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC
11282 Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix
11283 Applying: drivers/rtc/rtc-mxc.c: make alarm work
11284 Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix
11285 Applying: rtc/ab8500: don't disable IRQ:s when suspending
11286 Applying: rtc/ab8500: set can_wake flag
11287 Applying: drivers/rtc/rtc-ab8500.c: change msleep() to usleep_range()
11288 Applying: rtc/ab8500: add calibration attribute to AB8500 RTC
11289 Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes
11290 Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3
11291 Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3-checkpatch-fixes
11292 Applying: drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler
11293 Applying: drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc()
11294 Applying: reiserfs: delete comments refering to the BKL
11295 Applying: reiserfs: delay reiserfs lock until journal initialization
11296 Applying: reiserfs: don't lock journal_init()
11297 Applying: reiserfs: don't lock root inode searching
11298 Applying: cpusets, cgroups: disallow attaching kthreadd
11299 Applying: mm: memcg: consolidate hierarchy iteration primitives
11300 Applying: mm: vmscan: distinguish global reclaim from global LRU scanning
11301 Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned
11302 Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes
11303 Applying: mm: memcg: per-priority per-zone hierarchy scan generations
11304 Applying: mm: move memcg hierarchy reclaim to generic reclaim code
11305 Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty
11306 Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists
11307 Applying: mm: collect LRU list heads into struct lruvec
11308 Applying: mm: make per-memcg LRU lists exclusive
11309 Applying: mm: memcg: remove unused node/section info from pc->flags
11310 Applying: mm: memcg: remove unused node/section info from pc->flags fix
11311 Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient
11312 Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix
11313 Applying: mm: memcg: shorten preempt-disabled section around event checks
11314 Applying: Documentation/cgroups/memory.txt: fix typo
11315 Applying: memcg: fix pgpgin/pgpgout documentation
11316 Applying: mm: oom_kill: remove memcg argument from oom_kill_task()
11317 Applying: mm: unify remaining mem_cont, mem, etc. variable names to memcg
11318 Applying: mm: memcg: clean up fault accounting
11319 Applying: mm: memcg: lookup_page_cgroup (almost) never returns NULL
11320 Applying: mm: page_cgroup: check page_cgroup arrays in lookup_page_cgroup() only when necessary
11321 Applying: mm: memcg: remove unneeded checks from newpage_charge()
11322 Applying: mm: memcg: remove unneeded checks from uncharge_page()
11323 Applying: page_cgroup: add helper function to get swap_cgroup
11324 Applying: page_cgroup: cleanup lookup_swap_cgroup()
11325 Applying: memcg: free entries in soft_limit_tree if allocation fails
11326 Applying: oom, memcg: fix exclusion of memcg threads after they have detached their mm
11327 Applying: thp: improve the error code path
11328 Applying: thp: remove unnecessary tlb flush for mprotect
11329 Applying: thp: add tlb_remove_pmd_tlb_entry
11330 Applying: thp: improve order in lru list for split huge page
11331 Applying: procfs: make proc_get_link to use dentry instead of inode
11332 Applying: procfs: introduce the /proc/<pid>/map_files/ directory
11333 Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes
11334 Applying: procfs: parse mount options
11335 Applying: procfs: add hidepid= and gid= mount options
11336 Applying: procfs: remove superfluous debug output
11337 Applying: proc: fix task_struct memleak
11338 Applying: workqueue: make alloc_workqueue() take printf fmt and args for name
11339 Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix
11340 Applying: cpumask: update setup_node_to_cpumask_map() comments
11341 Applying: kexec: remove KMSG_DUMP_KEXEC
11342 Applying: kdump: add missing RAM resource in crash_shrink_memory()
11343 Applying: kdump: add udev events for memory online/offline
11344 Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size
11345 Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic()
11346 Applying: ipc/mqueue: simplify reading msgqueue limit
11347 Applying: ipc/sem.c: alternatives to preempt_disable()
11348 Applying: sysctl: add the kernel.ns_last_pid control
11349 Applying: user namespace: make signal.c respect user namespaces
11350 Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2)
11351 Applying: ipc/mqueue: lock() => unlock() typo
11352 Applying: drivers/memstick: use kmemdup rather than duplicating its implementation
11353 Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks()
11354 Applying: vfs: cache request_queue in struct block_device
11355 Applying: dio: optimize cache misses in the submission path
11356 Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes
11357 Applying: dio: using prefetch requires including prefetch.h
11358 Applying: c/r: introduce CHECKPOINT_RESTORE symbol
11359 Applying: c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4
11360 Applying: c-r-procfs-add-start_data-end_data-start_brk-members-to-proc-pid-stat-v4-fix
11361 Applying: c/r: prctl: add PR_SET_MM codes to set up mm_struct entries
11362 Applying: c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix
11363 Applying: ramoops: fix use of rounddown_pow_of_two()
11364 Applying: ramoops: update parameters only after successful init
11365 Applying: unlzo: Fix input buffer free
11366 $ cd ../next
11367 $ git fetch -f ../rebase-tmp akpm:akpm
11368 From ../rebase-tmp
11369  + 61df63b...f3dd800 akpm       -> akpm  (forced update)
11370 $ rm -rf ../rebase-tmp
11371 Merging akpm (f3dd800 unlzo: Fix input buffer free)
11372 $ git merge --no-ff akpm
11373 Removing drivers/video/backlight/adx_bl.c
11374 Merge made by the 'recursive' strategy.
11375  Documentation/ABI/testing/debugfs-olpc             |   16 +
11376  .../sysfs-class-rtc-rtc0-device-rtc_calibration    |   12 +
11377  .../ABI/testing/sysfs-devices-system-timekeeping   |   16 +
11378  Documentation/ABI/testing/sysfs-kernel-slab        |    2 +
11379  Documentation/cgroups/memory.txt                   |    9 +-
11380  Documentation/filesystems/proc.txt                 |   42 +
11381  Documentation/kernel-parameters.txt                |   19 +
11382  Documentation/laptops/sony-laptop.txt              |    5 +
11383  Documentation/sysctl/kernel.txt                    |    8 +
11384  Documentation/sysctl/vm.txt                        |   16 +
11385  Documentation/trace/events-kmem.txt                |   12 +-
11386  .../postprocess/trace-pagealloc-postprocess.pl     |   20 +-
11387  Documentation/trace/tracepoint-analysis.txt        |   40 +-
11388  Documentation/vm/slub.txt                          |    4 +-
11389  MAINTAINERS                                        |   54 +-
11390  arch/Kconfig                                       |   14 +
11391  arch/arm/Kconfig                                   |    1 +
11392  arch/arm/include/asm/processor.h                   |    1 -
11393  arch/arm/mach-ux500/mbox-db5500.c                  |    2 +-
11394  arch/avr32/include/asm/system.h                    |    2 +-
11395  arch/avr32/kernel/traps.c                          |    2 +-
11396  arch/ia64/include/asm/processor.h                  |    1 -
11397  arch/ia64/kernel/machine_kexec.c                   |    4 +-
11398  arch/m68k/amiga/config.c                           |    3 +-
11399  arch/mips/Kconfig                                  |    1 +
11400  arch/mips/include/asm/ptrace.h                     |    2 +-
11401  arch/mips/kernel/traps.c                           |    2 +-
11402  arch/mn10300/include/asm/exceptions.h              |    2 +-
11403  arch/parisc/include/asm/processor.h                |    2 -
11404  arch/parisc/kernel/process.c                       |    1 -
11405  arch/powerpc/kernel/machine_kexec_32.c             |    4 +-
11406  arch/powerpc/kernel/machine_kexec_64.c             |    6 +-
11407  arch/powerpc/mm/numa.c                             |    2 +-
11408  arch/powerpc/platforms/pseries/nvram.c             |    1 -
11409  arch/s390/include/asm/processor.h                  |    2 +-
11410  arch/s390/kernel/nmi.c                             |    2 +-
11411  arch/sh/kernel/process_32.c                        |    2 +-
11412  arch/sh/kernel/process_64.c                        |    2 +-
11413  arch/tile/kernel/machine_kexec.c                   |    6 +-
11414  arch/x86/Kconfig                                   |    4 +
11415  arch/x86/Kconfig.cpu                               |    6 -
11416  arch/x86/mm/numa.c                                 |    2 +-
11417  arch/x86/platform/iris/iris.c                      |   67 ++-
11418  arch/x86/platform/olpc/olpc-xo15-sci.c             |   67 ++
11419  arch/x86/platform/olpc/olpc.c                      |   86 ++
11420  arch/x86/um/Kconfig                                |    8 -
11421  drivers/base/memory.c                              |   17 +-
11422  drivers/base/sys.c                                 |   10 +-
11423  drivers/char/hpet.c                                |   56 +-
11424  drivers/char/ipmi/ipmi_watchdog.c                  |   41 +-
11425  drivers/char/ramoops.c                             |   24 +-
11426  drivers/idle/intel_idle.c                          |   59 +-
11427  drivers/leds/Kconfig                               |    8 +
11428  drivers/leds/Makefile                              |    1 +
11429  drivers/leds/leds-88pm860x.c                       |   12 +-
11430  drivers/leds/leds-adp5520.c                        |   12 +-
11431  drivers/leds/leds-ams-delta.c                      |   13 +-
11432  drivers/leds/leds-asic3.c                          |   16 +-
11433  drivers/leds/leds-atmel-pwm.c                      |   17 +-
11434  drivers/leds/leds-bd2802.c                         |   15 +-
11435  drivers/leds/leds-cobalt-qube.c                    |   17 +-
11436  drivers/leds/leds-da903x.c                         |   12 +-
11437  drivers/leds/leds-dac124s085.c                     |   13 +-
11438  drivers/leds/leds-fsg.c                            |   15 +-
11439  drivers/leds/leds-gpio.c                           |   16 +-
11440  drivers/leds/leds-hp6xx.c                          |   17 +-
11441  drivers/leds/leds-lm3530.c                         |   13 +-
11442  drivers/leds/leds-lp3944.c                         |   13 +-
11443  drivers/leds/leds-lp5521.c                         |   20 +-
11444  drivers/leds/leds-lp5523.c                         |   22 +-
11445  drivers/leds/leds-lt3593.c                         |   16 +-
11446  drivers/leds/leds-mc13783.c                        |   14 +-
11447  drivers/leds/leds-netxbig.c                        |   39 +-
11448  drivers/leds/leds-ns2.c                            |   15 +-
11449  drivers/leds/leds-pca9532.c                        |   14 +-
11450  drivers/leds/leds-pca955x.c                        |   13 +-
11451  drivers/leds/leds-pwm.c                            |   13 +-
11452  drivers/leds/leds-rb532.c                          |   16 +-
11453  drivers/leds/leds-regulator.c                      |   12 +-
11454  drivers/leds/leds-renesas-tpu.c                    |   13 +-
11455  drivers/leds/leds-s3c24xx.c                        |   13 +-
11456  drivers/leds/leds-tca6507.c                        |  687 ++++++++++++++
11457  drivers/leds/leds-wm831x-status.c                  |   12 +-
11458  drivers/leds/leds-wm8350.c                         |   12 +-
11459  drivers/md/dm-thin.c                               |   10 +-
11460  drivers/memstick/core/mspro_block.c                |    3 +-
11461  drivers/mtd/mtdoops.c                              |    3 +-
11462  drivers/platform/x86/acerhdf.c                     |   67 +-
11463  drivers/platform/x86/sony-laptop.c                 |   16 +-
11464  drivers/rtc/rtc-ab8500.c                           |  124 +++-
11465  drivers/rtc/rtc-cmos.c                             |    2 +-
11466  drivers/rtc/rtc-mxc.c                              |  123 ++--
11467  drivers/rtc/rtc-wm831x.c                           |   24 +-
11468  drivers/scsi/aacraid/commctrl.c                    |    1 +
11469  drivers/scsi/megaraid.c                            |    8 +-
11470  drivers/scsi/mpt2sas/mpt2sas_base.c                |    3 +-
11471  drivers/scsi/sg.c                                  |   25 +-
11472  drivers/video/backlight/88pm860x_bl.c              |   12 +-
11473  drivers/video/backlight/Kconfig                    |    8 -
11474  drivers/video/backlight/Makefile                   |    1 -
11475  drivers/video/backlight/adp5520_bl.c               |   12 +-
11476  drivers/video/backlight/adx_bl.c                   |  182 ----
11477  drivers/video/backlight/da903x_bl.c                |   12 +-
11478  drivers/video/backlight/ep93xx_bl.c                |   13 +-
11479  drivers/video/backlight/generic_bl.c               |   13 +-
11480  drivers/video/backlight/jornada720_bl.c            |   13 +-
11481  drivers/video/backlight/jornada720_lcd.c           |   13 +-
11482  drivers/video/backlight/ld9040.c                   |   71 ++-
11483  drivers/video/backlight/max8925_bl.c               |   12 +-
11484  drivers/video/backlight/omap1_bl.c                 |   13 +-
11485  drivers/video/backlight/pcf50633-backlight.c       |   12 +-
11486  drivers/video/backlight/platform_lcd.c             |   13 +-
11487  drivers/video/backlight/pwm_bl.c                   |   12 +-
11488  drivers/video/backlight/wm831x_bl.c                |   12 +-
11489  fs/Kconfig.binfmt                                  |    3 +
11490  fs/binfmt_elf.c                                    |    2 +-
11491  fs/block_dev.c                                     |    3 +
11492  fs/btrfs/file.c                                    |    2 +-
11493  fs/cifs/cifsfs.c                                   |    2 +-
11494  fs/dcache.c                                        |   10 +-
11495  fs/direct-io.c                                     |   57 +-
11496  fs/eventpoll.c                                     |  226 ++++-
11497  fs/exec.c                                          |    4 +
11498  fs/ext4/ext4.h                                     |    7 +-
11499  fs/ext4/ialloc.c                                   |    4 +-
11500  fs/file_table.c                                    |   23 +-
11501  fs/inode.c                                         |    2 +
11502  fs/internal.h                                      |    3 +-
11503  fs/mpage.c                                         |    4 -
11504  fs/namei.c                                         |   26 +-
11505  fs/namespace.c                                     |  124 ++--
11506  fs/nfs/file.c                                      |    2 +-
11507  fs/nilfs2/ioctl.c                                  |   16 +
11508  fs/pipe.c                                          |    2 +-
11509  fs/pnode.c                                         |    4 +-
11510  fs/proc/array.c                                    |    7 +-
11511  fs/proc/base.c                                     |  441 +++++++++-
11512  fs/proc/generic.c                                  |    4 +-
11513  fs/proc/inode.c                                    |   18 +
11514  fs/proc/internal.h                                 |    3 +-
11515  fs/proc/root.c                                     |   73 ++-
11516  fs/reiserfs/bitmap.c                               |    3 -
11517  fs/reiserfs/journal.c                              |   64 +-
11518  fs/reiserfs/super.c                                |   54 +-
11519  include/asm-generic/tlb.h                          |   14 +
11520  include/linux/compiler-gcc4.h                      |    1 +
11521  include/linux/compiler.h                           |    4 +-
11522  include/linux/eventpoll.h                          |    1 +
11523  include/linux/fs.h                                 |    3 +
11524  include/linux/gfp.h                                |   34 +-
11525  include/linux/hpet.h                               |    1 +
11526  include/linux/huge_mm.h                            |   10 +-
11527  include/linux/hugetlb.h                            |   14 +-
11528  include/linux/ipc_namespace.h                      |   40 +-
11529  include/linux/kernel.h                             |   29 +-
11530  include/linux/kmsg_dump.h                          |    1 -
11531  include/linux/leds-tca6507.h                       |   33 +
11532  include/linux/lglock.h                             |  152 +---
11533  include/linux/linkage.h                            |    4 -
11534  include/linux/memcontrol.h                         |  100 ++-
11535  include/linux/mm.h                                 |   29 +
11536  include/linux/mm_inline.h                          |   21 +-
11537  include/linux/mm_types.h                           |   10 +-
11538  include/linux/mmzone.h                             |   18 +-
11539  include/linux/oom.h                                |    2 +-
11540  include/linux/page-debug-flags.h                   |    4 +-
11541  include/linux/page_cgroup.h                        |   38 +-
11542  include/linux/pagevec.h                            |    7 -
11543  include/linux/pid_namespace.h                      |    2 +
11544  include/linux/prctl.h                              |   12 +
11545  include/linux/proc_fs.h                            |    6 +-
11546  include/linux/refcnt.h                             |   90 ++
11547  include/linux/rmap.h                               |    5 +-
11548  include/linux/sched.h                              |    2 +-
11549  include/linux/swap.h                               |   37 +
11550  include/linux/sysdev.h                             |    2 +
11551  include/linux/workqueue.h                          |   47 +-
11552  include/linux/writeback.h                          |    3 +-
11553  include/scsi/scsi_netlink.h                        |    2 +-
11554  include/trace/events/kmem.h                        |    4 +-
11555  include/trace/events/oom.h                         |   35 +
11556  include/trace/events/task.h                        |   63 ++
11557  init/Kconfig                                       |   11 +
11558  init/do_mounts.c                                   |    3 +
11559  ipc/mq_sysctl.c                                    |   31 +-
11560  ipc/mqueue.c                                       |   34 +-
11561  ipc/sem.c                                          |  250 ++++--
11562  kernel/Makefile                                    |    2 +-
11563  kernel/audit.c                                     |    5 +-
11564  kernel/cpuset.c                                    |   36 +-
11565  kernel/exit.c                                      |    6 +-
11566  kernel/fork.c                                      |    7 +
11567  kernel/hrtimer.c                                   |    8 +
11568  kernel/kexec.c                                     |   25 +-
11569  kernel/lglock.c                                    |  101 ++
11570  kernel/panic.c                                     |   20 +-
11571  kernel/pid.c                                       |    4 +-
11572  kernel/pid_namespace.c                             |   31 +
11573  kernel/power/snapshot.c                            |    6 +
11574  kernel/sched/core.c                                |    9 +
11575  kernel/signal.c                                    |   43 +-
11576  kernel/sys.c                                       |  121 +++
11577  kernel/sysctl.c                                    |   11 +-
11578  kernel/sysctl_binary.c                             |    2 +-
11579  kernel/time/tick-sched.c                           |   67 ++
11580  kernel/workqueue.c                                 |   32 +-
11581  lib/Kconfig.debug                                  |    3 +
11582  lib/crc32.c                                        |   21 +-
11583  lib/debugobjects.c                                 |   14 +-
11584  lib/decompress_unlzo.c                             |    2 +-
11585  mm/Kconfig.debug                                   |    5 +
11586  mm/bootmem.c                                       |    4 +-
11587  mm/compaction.c                                    |    4 +-
11588  mm/fadvise.c                                       |    3 +-
11589  mm/filemap.c                                       |   23 +-
11590  mm/huge_memory.c                                   |   83 ++-
11591  mm/hugetlb.c                                       |   14 +-
11592  mm/memcontrol.c                                    |  978 ++++++++++----------
11593  mm/memory.c                                        |   17 +-
11594  mm/migrate.c                                       |   10 +-
11595  mm/mmap.c                                          |   60 +-
11596  mm/mremap.c                                        |    9 +
11597  mm/oom_kill.c                                      |   50 +-
11598  mm/page-writeback.c                                |  290 ++++---
11599  mm/page_alloc.c                                    |  268 +++++--
11600  mm/page_cgroup.c                                   |  134 +--
11601  mm/rmap.c                                          |   68 ++-
11602  mm/slub.c                                          |   12 +-
11603  mm/swap.c                                          |   38 +-
11604  mm/swapfile.c                                      |   15 +-
11605  mm/vmalloc.c                                       |   11 +-
11606  mm/vmscan.c                                        |  430 +++++----
11607  mm/vmstat.c                                        |    2 +-
11608  net/netfilter/nf_conntrack_netlink.c               |    5 +
11609  scripts/checkpatch.pl                              |  236 +++--
11610  scripts/get_maintainer.pl                          |    2 +-
11611  scripts/kconfig/merge_config.sh                    |  117 +++
11612  scripts/tags.sh                                    |    2 +
11613  tools/perf/Documentation/examples.txt              |   34 +-
11614  239 files changed, 5713 insertions(+), 2952 deletions(-)
11615  create mode 100644 Documentation/ABI/testing/debugfs-olpc
11616  create mode 100644 Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration
11617  create mode 100644 Documentation/ABI/testing/sysfs-devices-system-timekeeping
11618  create mode 100644 drivers/leds/leds-tca6507.c
11619  delete mode 100644 drivers/video/backlight/adx_bl.c
11620  create mode 100644 include/linux/leds-tca6507.h
11621  create mode 100644 include/linux/refcnt.h
11622  create mode 100644 include/trace/events/oom.h
11623  create mode 100644 include/trace/events/task.h
11624  create mode 100644 kernel/lglock.c
11625  create mode 100644 scripts/kconfig/merge_config.sh
11626 $ git revert aef714db6205
11627 [master d01b1ac] Revert "core kernel: add refcount type and refcount misuse debugging"
11628  7 files changed, 11 insertions(+), 105 deletions(-)
11629  delete mode 100644 include/linux/refcnt.h