Next/merge.log

   1 $ git checkout master
   2 Already on 'master'
   3 $ git reset --hard stable
   4 HEAD is now at 2f666bc Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
   5 Merging origin/master
   6 $ git merge origin/master
   7 Updating 2f666bc..5dd12af
   8 Fast-forward
   9  Documentation/hwmon/max16064               |   62 ++++++++++++++++
  10  Documentation/hwmon/max34440               |   79 ++++++++++++++++++++
  11  Documentation/hwmon/max8688                |   69 ++++++++++++++++++
  12  Documentation/hwmon/pmbus                  |   34 ++-------
  13  Documentation/hwmon/smm665                 |    8 +-
  14  Documentation/hwmon/submitting-patches     |  109 ++++++++++++++++++++++++++++
  15  Documentation/md.txt                       |   10 +++
  16  Documentation/sound/alsa/SB-Live-mixer.txt |    6 +-
  17  MAINTAINERS                                |    2 +-
  18  arch/arm/include/asm/cputype.h             |    1 +
  19  arch/arm/include/asm/unistd.h              |    4 +
  20  arch/arm/kernel/calls.S                    |    4 +
  21  arch/arm/mach-s3c2440/mach-gta02.c         |    5 ++
  22  arch/x86/include/asm/numa.h                |    2 +-
  23  arch/x86/kernel/apm_32.c                   |    5 ++
  24  arch/x86/kernel/cpu/perf_event.c           |    6 ++-
  25  arch/x86/kernel/cpu/perf_event_intel.c     |    9 ++-
  26  arch/x86/kernel/cpu/perf_event_p4.c        |    2 +-
  27  arch/x86/kernel/smpboot.c                  |   23 ------
  28  arch/x86/mm/numa.c                         |   31 ++++-----
  29  arch/x86/mm/numa_emulation.c               |   20 ++----
  30  arch/x86/xen/mmu.c                         |   13 +++-
  31  arch/x86/xen/setup.c                       |    2 +-
  32  arch/xtensa/kernel/irq.c                   |   18 ++---
  33  block/blk-core.c                           |   13 +---
  34  block/blk-sysfs.c                          |    8 ++-
  35  block/blk.h                                |    1 -
  36  block/cfq-iosched.c                        |   20 ++----
  37  block/elevator.c                           |    3 +-
  38  block/genhd.c                              |    8 ++-
  39  drivers/ata/ahci.c                         |    8 ++-
  40  drivers/ata/ahci.h                         |    4 +
  41  drivers/ata/ata_piix.c                     |    8 ++
  42  drivers/ata/libahci.c                      |   60 +++++++++++++++-
  43  drivers/ata/libata-core.c                  |    3 +-
  44  drivers/ata/libata-eh.c                    |    6 +-
  45  drivers/ata/pata_at91.c                    |   22 +++++-
  46  drivers/base/syscore.c                     |    2 +
  47  drivers/char/agp/generic.c                 |   19 ++++-
  48  drivers/char/virtio_console.c              |   11 ---
  49  drivers/gpu/drm/i915/intel_display.c       |   73 ++++++++++---------
  50  drivers/gpu/drm/i915/intel_tv.c            |    9 ++-
  51  drivers/gpu/drm/radeon/evergreen.c         |    2 +-
  52  drivers/gpu/drm/radeon/r600.c              |    2 +-
  53  drivers/hwmon/pmbus_core.c                 |    1 -
  54  drivers/ide/ide-cd.c                       |    1 -
  55  drivers/ide/ide-cd_ioctl.c                 |    6 ++
  56  drivers/ide/ide-gd.c                       |    7 ++-
  57  drivers/md/md.c                            |    1 +
  58  drivers/md/raid5.c                         |    5 +-
  59  drivers/parport/parport_pc.c               |    8 +--
  60  drivers/pci/intel-iommu.c                  |   55 +++++++++++---
  61  drivers/scsi/scsi_lib.c                    |   17 +----
  62  drivers/scsi/scsi_transport_fc.c           |   19 +----
  63  drivers/tty/n_gsm.c                        |    8 ++-
  64  drivers/tty/serial/imx.c                   |    3 +-
  65  drivers/virtio/virtio_pci.c                |   15 ++--
  66  drivers/virtio/virtio_ring.c               |    1 +
  67  drivers/xen/manage.c                       |    9 ++-
  68  fs/dcache.c                                |   81 +++++++++------------
  69  fs/nfsd/nfs4state.c                        |    3 +-
  70  fs/nfsd/vfs.c                              |    9 ++-
  71  fs/ubifs/recovery.c                        |   26 +++++++
  72  fs/ubifs/super.c                           |   29 ++++++--
  73  fs/xattr.c                                 |    2 +-
  74  fs/xfs/linux-2.6/xfs_message.c             |    4 +-
  75  include/linux/blkdev.h                     |   26 ++++----
  76  include/linux/dcache.h                     |    4 +-
  77  include/linux/libata.h                     |    3 +-
  78  include/linux/security.h                   |    2 +-
  79  kernel/kexec.c                             |    7 ++
  80  kernel/power/hibernate.c                   |   10 ++-
  81  kernel/power/suspend.c                     |    5 +-
  82  scripts/kconfig/conf.c                     |    2 +-
  83  security/capability.c                      |    2 +-
  84  security/security.c                        |    6 +-
  85  security/selinux/hooks.c                   |    6 ++-
  86  security/smack/smack_lsm.c                 |    6 ++-
  87  sound/pci/hda/hda_codec.c                  |    4 +
  88  sound/pci/hda/patch_realtek.c              |   25 ++++++-
  89  sound/soc/codecs/jz4740.c                  |    2 -
  90  sound/soc/codecs/sn95031.c                 |    2 +-
  91  sound/soc/codecs/wm8903.c                  |   38 ++++++----
  92  sound/soc/codecs/wm8994.c                  |   16 ++++
  93  sound/soc/codecs/wm_hubs.c                 |    8 +-
  94  sound/soc/mid-x86/sst_platform.c           |   10 ++-
  95  sound/soc/samsung/pcm.c                    |    4 +-
  96  sound/soc/sh/fsi.c                         |   22 ++++--
  97  sound/soc/soc-core.c                       |    5 +-
  98  sound/soc/tegra/harmony.c                  |    1 +
  99  90 files changed, 937 insertions(+), 395 deletions(-)
 100  create mode 100644 Documentation/hwmon/max16064
 101  create mode 100644 Documentation/hwmon/max34440
 102  create mode 100644 Documentation/hwmon/max8688
 103  create mode 100644 Documentation/hwmon/submitting-patches
 104 Merging fixes/fixes
 105 $ git merge fixes/fixes
 106 Already up-to-date.
 107 Merging kbuild-current/rc-fixes
 108 $ git merge kbuild-current/rc-fixes
 109 Already up-to-date.
 110 Merging arm-current/master
 111 $ git merge arm-current/master
 112 Already up-to-date.
 113 Merging m68k-current/for-linus
 114 $ git merge m68k-current/for-linus
 115 Merge made by recursive.
 116 Merging powerpc-merge/merge
 117 $ git merge powerpc-merge/merge
 118 Already up-to-date.
 119 Merging 52xx-and-virtex-current/powerpc/merge
 120 $ git merge 52xx-and-virtex-current/powerpc/merge
 121 Already up-to-date.
 122 Merging sparc-current/master
 123 $ git merge sparc-current/master
 124 Already up-to-date.
 125 Merging scsi-rc-fixes/master
 126 $ git merge scsi-rc-fixes/master
 127 Merge made by recursive.
 128  drivers/scsi/device_handler/scsi_dh.c |    9 ++++++---
 129  drivers/scsi/mpt2sas/mpt2sas_ctl.c    |   23 +++++++++++++++++++++--
 130  drivers/scsi/pmcraid.c                |    3 +++
 131  drivers/scsi/scsi_sysfs.c             |   16 ++++++++--------
 132  4 files changed, 38 insertions(+), 13 deletions(-)
 133 Merging net-current/master
 134 $ git merge net-current/master
 135 Merge made by recursive.
 136  arch/powerpc/include/asm/8xx_immap.h        |    4 +-
 137  drivers/net/atl1c/atl1c.h                   |    6 +-
 138  drivers/net/atl1c/atl1c_main.c              |   14 ++---
 139  drivers/net/benet/be_main.c                 |    1 +
 140  drivers/net/bnx2x/bnx2x_cmn.c               |   34 +++++++---
 141  drivers/net/bonding/bond_3ad.c              |    7 ++-
 142  drivers/net/ehea/ehea_main.c                |    9 ++-
 143  drivers/net/fs_enet/mac-fec.c               |    8 +-
 144  drivers/net/netconsole.c                    |    8 ++
 145  drivers/net/r8169.c                         |   99 +++++++++++++++++++--------
 146  drivers/net/usb/cdc_ncm.c                   |    4 +-
 147  drivers/net/wireless/ath/ath9k/recv.c       |    2 +-
 148  drivers/net/wireless/iwlegacy/iwl-4965-tx.c |   10 ++-
 149  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c |    7 +--
 150  drivers/net/wireless/iwlwifi/iwl-agn-tx.c   |   10 ++-
 151  net/bluetooth/hci_core.c                    |    5 +-
 152  net/bluetooth/hci_event.c                   |    2 -
 153  net/bluetooth/l2cap_core.c                  |    1 +
 154  net/bluetooth/sco.c                         |    9 +++
 155  net/bridge/br_input.c                       |    2 +-
 156  net/can/bcm.c                               |    7 ++-
 157  net/can/raw.c                               |    7 ++-
 158  net/ipv4/route.c                            |    7 ++
 159  net/ipv6/route.c                            |    8 ++-
 160  net/ipv6/udp.c                              |    2 +-
 161  net/mac80211/cfg.c                          |    2 +
 162  net/mac80211/debugfs_netdev.c               |    4 +-
 163  27 files changed, 191 insertions(+), 88 deletions(-)
 164 Merging sound-current/for-linus
 165 $ git merge sound-current/for-linus
 166 Already up-to-date.
 167 Merging pci-current/for-linus
 168 $ git merge pci-current/for-linus
 169 Already up-to-date.
 170 Merging wireless-current/master
 171 $ git merge wireless-current/master
 172 Already up-to-date.
 173 Merging driver-core.current/driver-core-linus
 174 $ git merge driver-core.current/driver-core-linus
 175 Already up-to-date.
 176 Merging tty.current/tty-linus
 177 $ git merge tty.current/tty-linus
 178 Already up-to-date.
 179 Merging usb.current/usb-linus
 180 $ git merge usb.current/usb-linus
 181 Already up-to-date.
 182 Merging staging.current/staging-linus
 183 $ git merge staging.current/staging-linus
 184 Merge made by recursive.
 185  drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   |    4 ----
 186  drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c |    3 ---
 187  drivers/staging/gma500/Kconfig                     |    2 +-
 188  drivers/staging/intel_sst/intelmid_v1_control.c    |    1 +
 189  drivers/staging/intel_sst/intelmid_v2_control.c    |    1 +
 190  drivers/staging/olpc_dcon/olpc_dcon_xo_1.c         |    1 +
 191  drivers/staging/rts_pstor/debug.h                  |    2 +-
 192  drivers/staging/rts_pstor/ms.c                     |    1 +
 193  drivers/staging/rts_pstor/rtsx_chip.c              |    5 +++--
 194  drivers/staging/rts_pstor/rtsx_scsi.c              |    1 +
 195  drivers/staging/rts_pstor/sd.c                     |    4 ++--
 196  drivers/staging/rts_pstor/trace.h                  |    2 +-
 197  drivers/staging/rts_pstor/xd.c                     |    1 +
 198  drivers/staging/solo6x10/Kconfig                   |    1 +
 199  drivers/staging/usbip/vhci_hcd.c                   |    9 ++++-----
 200  drivers/staging/usbip/vhci_sysfs.c                 |    7 ++++---
 201  16 files changed, 23 insertions(+), 22 deletions(-)
 202 Merging cpufreq-current/fixes
 203 $ git merge cpufreq-current/fixes
 204 Already up-to-date.
 205 Merging input-current/for-linus
 206 $ git merge input-current/for-linus
 207 Already up-to-date.
 208 Merging md-current/for-linus
 209 $ git merge md-current/for-linus
 210 Merge made by recursive.
 211 Merging audit-current/for-linus
 212 $ git merge audit-current/for-linus
 213 Already up-to-date.
 214 Merging crypto-current/master
 215 $ git merge crypto-current/master
 216 Already up-to-date.
 217 Merging ide-curent/master
 218 $ git merge ide-curent/master
 219 Already up-to-date.
 220 Merging dwmw2/master
 221 $ git merge dwmw2/master
 222 Already up-to-date.
 223 Merging sh-current/sh-fixes-for-linus
 224 $ git merge sh-current/sh-fixes-for-linus
 225 Merge made by recursive.
 226  arch/sh/boards/mach-ecovec24/setup.c |   18 +++++++++---------
 227  arch/sh/configs/ecovec24_defconfig   |    2 +-
 228  arch/sh/configs/sh7757lcr_defconfig  |    2 +-
 229  arch/sh/kernel/cpu/Makefile          |    4 +---
 230  drivers/i2c/busses/i2c-sh_mobile.c   |    1 +
 231  drivers/sh/clk/cpg.c                 |    2 +-
 232  6 files changed, 14 insertions(+), 15 deletions(-)
 233 Merging rmobile-current/rmobile-fixes-for-linus
 234 $ git merge rmobile-current/rmobile-fixes-for-linus
 235 Merge made by recursive.
 236  arch/arm/mach-shmobile/clock-sh7372.c |    3 ---
 237  1 files changed, 0 insertions(+), 3 deletions(-)
 238 Merging fbdev-current/fbdev-fixes-for-linus
 239 $ git merge fbdev-current/fbdev-fixes-for-linus
 240 Merge made by recursive.
 241  drivers/video/efifb.c                  |    4 ++--
 242  drivers/video/omap2/displays/Kconfig   |    9 +++++----
 243  drivers/video/omap2/dss/dsi.c          |   14 +++++++++-----
 244  drivers/video/omap2/dss/dss.c          |   10 ++++++++--
 245  drivers/video/omap2/dss/dss_features.c |    2 +-
 246  drivers/video/omap2/dss/dss_features.h |    2 ++
 247  drivers/video/s3c-fb.c                 |   11 +++++++++--
 248  drivers/video/via/hw.c                 |    8 ++++++--
 249  drivers/video/via/viamode.c            |    2 +-
 250  9 files changed, 43 insertions(+), 19 deletions(-)
 251 Merging devicetree-current/devicetree/merge
 252 $ git merge devicetree-current/devicetree/merge
 253 Removing arch/powerpc/boot/dtc-src/.gitignore
 254 Merge made by recursive.
 255  arch/powerpc/boot/.gitignore         |    1 -
 256  arch/powerpc/boot/dtc-src/.gitignore |    3 ---
 257  2 files changed, 0 insertions(+), 4 deletions(-)
 258  delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore
 259 Merging spi-current/spi/merge
 260 $ git merge spi-current/spi/merge
 261 Already up-to-date.
 262 Merging arm/for-next
 263 $ git merge arm/for-next
 264 Removing arch/arm/mach-exynos4/include/mach/smp.h
 265 Removing arch/arm/mach-msm/include/mach/smp.h
 266 Removing arch/arm/mach-realview/include/mach/smp.h
 267 Removing arch/arm/mach-shmobile/include/mach/smp.h
 268 Removing arch/arm/mach-tegra/include/mach/smp.h
 269 Removing arch/arm/mach-ux500/include/mach/smp.h
 270 Removing arch/arm/mach-vexpress/include/mach/smp.h
 271 Removing arch/arm/plat-omap/include/plat/smp.h
 272 Merge made by recursive.
 273  arch/arm/include/asm/sizes.h                    |   42 +---------------------
 274  arch/arm/include/asm/smp.h                      |    6 +--
 275  arch/arm/kernel/smp.c                           |    7 ++++
 276  arch/arm/mach-exynos4/include/mach/smp.h        |   19 ----------
 277  arch/arm/mach-exynos4/platsmp.c                 |    5 ++-
 278  arch/arm/mach-msm/include/mach/smp.h            |   23 ------------
 279  arch/arm/mach-msm/platsmp.c                     |    4 ++-
 280  arch/arm/mach-omap2/include/mach/omap4-common.h |    7 ++++
 281  arch/arm/mach-omap2/omap-smp.c                  |    5 ++-
 282  arch/arm/mach-realview/include/mach/smp.h       |   14 -------
 283  arch/arm/mach-realview/platsmp.c                |    3 ++
 284  arch/arm/mach-shmobile/include/mach/smp.h       |   16 ---------
 285  arch/arm/mach-shmobile/platsmp.c                |    3 ++
 286  arch/arm/mach-tegra/include/mach/smp.h          |   14 -------
 287  arch/arm/mach-tegra/platsmp.c                   |    3 ++
 288  arch/arm/mach-ux500/include/mach/smp.h          |   24 -------------
 289  arch/arm/mach-ux500/platsmp.c                   |    5 ++-
 290  arch/arm/mach-vexpress/ct-ca9x4.c               |    2 +
 291  arch/arm/mach-vexpress/include/mach/smp.h       |   13 -------
 292  arch/arm/plat-omap/include/plat/smp.h           |   36 -------------------
 293  arch/arm/plat-versatile/platsmp.c               |    3 +-
 294  21 files changed, 46 insertions(+), 208 deletions(-)
 295  delete mode 100644 arch/arm/mach-exynos4/include/mach/smp.h
 296  delete mode 100644 arch/arm/mach-msm/include/mach/smp.h
 297  delete mode 100644 arch/arm/mach-realview/include/mach/smp.h
 298  delete mode 100644 arch/arm/mach-shmobile/include/mach/smp.h
 299  delete mode 100644 arch/arm/mach-tegra/include/mach/smp.h
 300  delete mode 100644 arch/arm/mach-ux500/include/mach/smp.h
 301  delete mode 100644 arch/arm/mach-vexpress/include/mach/smp.h
 302  delete mode 100644 arch/arm/plat-omap/include/plat/smp.h
 303 Merging at91/at91-next
 304 $ git merge at91/at91-next
 305 Auto-merging arch/arm/configs/at91sam9261_defconfig
 306 Auto-merging arch/arm/configs/at91sam9263_defconfig
 307 Removing arch/arm/configs/neocore926_defconfig
 308 Removing arch/arm/configs/usb-a9263_defconfig
 309 Removing arch/arm/mach-at91/at91rm9200_time.c
 310 Removing arch/arm/mach-at91/at91sam926x_time.c
 311 Removing arch/arm/mach-at91/board-usb-a9260.c
 312 Auto-merging arch/arm/mach-at91/board-usb-a926x.c
 313 Auto-merging drivers/gpio/at91_gpio.c
 314 Merge made by recursive.
 315  MAINTAINERS                                        |    2 +
 316  arch/arm/Kconfig                                   |    1 +
 317  ...91sam9261ek_defconfig => at91sam9261_defconfig} |   85 +++++-
 318  ...91sam9263ek_defconfig => at91sam9263_defconfig} |   84 +++++-
 319  arch/arm/configs/at91x40_defconfig                 |   48 +++
 320  arch/arm/configs/neocore926_defconfig              |  104 ------
 321  arch/arm/configs/usb-a9263_defconfig               |  106 -------
 322  arch/arm/mach-at91/Kconfig                         |   28 +--
 323  arch/arm/mach-at91/Makefile                        |   26 +-
 324  arch/arm/mach-at91/at572d940hf.c                   |  124 +++++---
 325  arch/arm/mach-at91/at572d940hf_devices.c           |   26 +-
 326  arch/arm/mach-at91/at91cap9.c                      |  125 +++++---
 327  arch/arm/mach-at91/at91cap9_devices.c              |   32 +-
 328  arch/arm/mach-at91/at91rm9200.c                    |  121 +++++---
 329  arch/arm/mach-at91/at91rm9200_devices.c            |   32 +-
 330  arch/arm/mach-at91/at91rm9200_time.c               |  209 ------------
 331  arch/arm/mach-at91/at91sam9260.c                   |  138 +++++----
 332  arch/arm/mach-at91/at91sam9260_devices.c           |   35 +--
 333  arch/arm/mach-at91/at91sam9261.c                   |  119 +++++---
 334  arch/arm/mach-at91/at91sam9261_devices.c           |   30 +-
 335  arch/arm/mach-at91/at91sam9263.c                   |  125 +++++---
 336  arch/arm/mach-at91/at91sam9263_devices.c           |   28 +-
 337  arch/arm/mach-at91/at91sam926x_time.c              |  188 -----------
 338  arch/arm/mach-at91/at91sam9g45.c                   |  154 ++++++----
 339  arch/arm/mach-at91/at91sam9g45_devices.c           |   35 +--
 340  arch/arm/mach-at91/at91sam9rl.c                    |  121 +++++---
 341  arch/arm/mach-at91/at91sam9rl_devices.c            |   31 +-
 342  arch/arm/mach-at91/at91x40.c                       |    5 -
 343  arch/arm/mach-at91/board-1arm.c                    |   10 +-
 344  arch/arm/mach-at91/board-afeb-9260v1.c             |    6 +-
 345  arch/arm/mach-at91/board-at572d940hf_ek.c          |   13 +-
 346  arch/arm/mach-at91/board-cam60.c                   |    6 +-
 347  arch/arm/mach-at91/board-cap9adk.c                 |   13 +-
 348  arch/arm/mach-at91/board-carmeva.c                 |    6 +-
 349  arch/arm/mach-at91/board-cpu9krea.c                |    6 +-
 350  arch/arm/mach-at91/board-cpuat91.c                 |   10 +-
 351  arch/arm/mach-at91/board-csb337.c                  |    6 +-
 352  arch/arm/mach-at91/board-csb637.c                  |    6 +-
 353  arch/arm/mach-at91/board-eb01.c                    |    7 +-
 354  arch/arm/mach-at91/board-eb9200.c                  |    6 +-
 355  arch/arm/mach-at91/board-ecbat91.c                 |   10 +-
 356  arch/arm/mach-at91/board-eco920.c                  |   30 +--
 357  arch/arm/mach-at91/board-flexibity.c               |    6 +-
 358  arch/arm/mach-at91/board-foxg20.c                  |    6 +-
 359  arch/arm/mach-at91/board-gsia18s.c                 |    4 +-
 360  arch/arm/mach-at91/board-kafa.c                    |   10 +-
 361  arch/arm/mach-at91/board-kb9202.c                  |   11 +-
 362  arch/arm/mach-at91/board-neocore926.c              |    6 +-
 363  arch/arm/mach-at91/board-pcontrol-g20.c            |    4 +-
 364  arch/arm/mach-at91/board-picotux200.c              |    6 +-
 365  arch/arm/mach-at91/board-qil-a9260.c               |    6 +-
 366  arch/arm/mach-at91/board-rm9200dk.c                |    6 +-
 367  arch/arm/mach-at91/board-rm9200ek.c                |    6 +-
 368  arch/arm/mach-at91/board-sam9-l9260.c              |    6 +-
 369  arch/arm/mach-at91/board-sam9260ek.c               |   13 +-
 370  arch/arm/mach-at91/board-sam9261ek.c               |   13 +-
 371  arch/arm/mach-at91/board-sam9263ek.c               |   13 +-
 372  arch/arm/mach-at91/board-sam9g20ek.c               |   15 +-
 373  arch/arm/mach-at91/board-sam9m10g45ek.c            |   13 +-
 374  arch/arm/mach-at91/board-sam9rlek.c                |    6 +-
 375  arch/arm/mach-at91/board-snapper9260.c             |    6 +-
 376  arch/arm/mach-at91/board-stamp9g20.c               |    8 +-
 377  arch/arm/mach-at91/board-usb-a9260.c               |  236 --------------
 378  .../{board-usb-a9263.c => board-usb-a926x.c}       |   62 +++-
 379  arch/arm/mach-at91/board-yl-9200.c                 |   10 +-
 380  arch/arm/mach-at91/clock.c                         |   54 +---
 381  arch/arm/mach-at91/clock.h                         |   25 ++-
 382  arch/arm/mach-at91/cpu.h                           |  181 +++++++++++
 383  arch/arm/mach-at91/devices.c                       |   15 +
 384  arch/arm/mach-at91/devices.h                       |   55 ++++
 385  arch/arm/mach-at91/generic.h                       |   41 +--
 386  arch/arm/mach-at91/include/mach/at572d940hf.h      |    1 -
 387  arch/arm/mach-at91/include/mach/at91_pit.h         |    8 +-
 388  arch/arm/mach-at91/include/mach/at91_st.h          |   20 +-
 389  arch/arm/mach-at91/include/mach/at91cap9.h         |    1 -
 390  arch/arm/mach-at91/include/mach/at91rm9200.h       |    1 -
 391  arch/arm/mach-at91/include/mach/at91sam9260.h      |    5 +-
 392  arch/arm/mach-at91/include/mach/at91sam9261.h      |    1 -
 393  arch/arm/mach-at91/include/mach/at91sam9263.h      |    1 -
 394  arch/arm/mach-at91/include/mach/at91sam9g45.h      |    1 -
 395  arch/arm/mach-at91/include/mach/at91sam9rl.h       |    1 -
 396  arch/arm/mach-at91/include/mach/board.h            |    1 +
 397  arch/arm/mach-at91/include/mach/clkdev.h           |    7 +
 398  arch/arm/mach-at91/include/mach/cpu.h              |  172 +++++------
 399  arch/arm/mach-at91/include/mach/hardware.h         |   14 +
 400  arch/arm/mach-at91/include/mach/system_rev.h       |   25 ++
 401  arch/arm/mach-at91/soc.c                           |  281 +++++++++++++++++
 402  arch/arm/mach-at91/soc.h                           |   31 ++
 403  arch/avr32/mach-at32ap/at32ap700x.c                |    4 +-
 404  arch/avr32/mach-at32ap/include/mach/board.h        |    1 +
 405  drivers/clk/clkdev.c                               |   43 +++-
 406  drivers/clocksource/Makefile                       |    2 +
 407  drivers/clocksource/at91_pit.c                     |  333 ++++++++++++++++++++
 408  drivers/gpio/Makefile                              |    1 +
 409  .../mach-at91/gpio.c => drivers/gpio/at91_gpio.c   |   78 +++--
 410  drivers/tty/serial/atmel_serial.c                  |    2 +-
 411  include/linux/clk.h                                |   41 +++-
 412  97 files changed, 2446 insertions(+), 1770 deletions(-)
 413  rename arch/arm/configs/{at91sam9261ek_defconfig => at91sam9261_defconfig} (53%)
 414  rename arch/arm/configs/{at91sam9263ek_defconfig => at91sam9263_defconfig} (57%)
 415  create mode 100644 arch/arm/configs/at91x40_defconfig
 416  delete mode 100644 arch/arm/configs/neocore926_defconfig
 417  delete mode 100644 arch/arm/configs/usb-a9263_defconfig
 418  delete mode 100644 arch/arm/mach-at91/at91rm9200_time.c
 419  delete mode 100644 arch/arm/mach-at91/at91sam926x_time.c
 420  delete mode 100644 arch/arm/mach-at91/board-usb-a9260.c
 421  rename arch/arm/mach-at91/{board-usb-a9263.c => board-usb-a926x.c} (83%)
 422  create mode 100644 arch/arm/mach-at91/cpu.h
 423  create mode 100644 arch/arm/mach-at91/devices.c
 424  create mode 100644 arch/arm/mach-at91/devices.h
 425  create mode 100644 arch/arm/mach-at91/include/mach/clkdev.h
 426  create mode 100644 arch/arm/mach-at91/include/mach/system_rev.h
 427  create mode 100644 arch/arm/mach-at91/soc.c
 428  create mode 100644 arch/arm/mach-at91/soc.h
 429  create mode 100644 drivers/clocksource/at91_pit.c
 430  rename arch/arm/mach-at91/gpio.c => drivers/gpio/at91_gpio.c (90%)
 431 Merging davinci/davinci-next
 432 $ git merge davinci/davinci-next
 433 Already up-to-date.
 434 Merging i.MX/for-next
 435 $ git merge i.MX/for-next
 436 Auto-merging arch/arm/mach-imx/clock-imx31.c
 437 Auto-merging arch/arm/mach-imx/clock-imx35.c
 438 Auto-merging arch/arm/mach-imx/cpu-imx31.c
 439 Auto-merging arch/arm/mach-imx/devices-imx31.h
 440 Auto-merging arch/arm/mach-imx/devices-imx35.h
 441 Auto-merging arch/arm/mach-imx/ehci-imx31.c
 442 Auto-merging arch/arm/mach-imx/ehci-imx35.c
 443 Auto-merging arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
 444 Auto-merging arch/arm/mach-imx/mach-armadillo5x0.c
 445 Auto-merging arch/arm/mach-imx/mach-bug.c
 446 Auto-merging arch/arm/mach-imx/mach-cpuimx35.c
 447 Auto-merging arch/arm/mach-imx/mach-kzm_arm11_01.c
 448 Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c
 449 Auto-merging arch/arm/mach-imx/mach-mx31ads.c
 450 Auto-merging arch/arm/mach-imx/mach-mx31lilly.c
 451 Auto-merging arch/arm/mach-imx/mach-mx31lite.c
 452 Auto-merging arch/arm/mach-imx/mach-mx31moboard.c
 453 Auto-merging arch/arm/mach-imx/mach-mx35_3ds.c
 454 Auto-merging arch/arm/mach-imx/mach-pcm037.c
 455 Auto-merging arch/arm/mach-imx/mach-pcm037_eet.c
 456 Auto-merging arch/arm/mach-imx/mach-pcm043.c
 457 Auto-merging arch/arm/mach-imx/mach-qong.c
 458 Auto-merging arch/arm/mach-imx/mach-vpr200.c
 459 Auto-merging arch/arm/mach-imx/mx31lilly-db.c
 460 Auto-merging arch/arm/mach-imx/mx31lite-db.c
 461 Auto-merging arch/arm/mach-imx/mx31moboard-devboard.c
 462 Auto-merging arch/arm/mach-imx/mx31moboard-marxbot.c
 463 Auto-merging arch/arm/mach-imx/mx31moboard-smartbot.c
 464 Removing arch/arm/mach-mx3/Kconfig
 465 Removing arch/arm/mach-mx3/Makefile
 466 Removing arch/arm/mach-mx3/Makefile.boot
 467 Removing arch/arm/mach-mx3/devices.c
 468 Removing arch/arm/mach-mx3/devices.h
 469 Removing arch/arm/mach-mx3/mm.c
 470 Removing arch/arm/mach-mxc91231/Kconfig
 471 Removing arch/arm/mach-mxc91231/Makefile
 472 Removing arch/arm/mach-mxc91231/Makefile.boot
 473 Removing arch/arm/mach-mxc91231/clock.c
 474 Removing arch/arm/mach-mxc91231/crm_regs.h
 475 Removing arch/arm/mach-mxc91231/devices.c
 476 Removing arch/arm/mach-mxc91231/devices.h
 477 Removing arch/arm/mach-mxc91231/iomux.c
 478 Removing arch/arm/mach-mxc91231/magx-zn5.c
 479 Removing arch/arm/mach-mxc91231/mm.c
 480 Removing arch/arm/mach-mxc91231/system.c
 481 Removing arch/arm/plat-mxc/include/mach/iomux-mxc91231.h
 482 Removing arch/arm/plat-mxc/include/mach/mxc91231.h
 483 Merge made by recursive.
 484  arch/arm/Makefile                                  |    3 +-
 485  arch/arm/configs/mx1_defconfig                     |   11 +-
 486  arch/arm/configs/mx21_defconfig                    |   10 +-
 487  arch/arm/configs/mx27_defconfig                    |   46 ++-
 488  arch/arm/configs/mx3_defconfig                     |   43 +-
 489  arch/arm/configs/mx51_defconfig                    |   57 ++-
 490  arch/arm/mach-imx/Kconfig                          |  305 +++++++++-
 491  arch/arm/mach-imx/Makefile                         |   37 +-
 492  arch/arm/mach-imx/Makefile.boot                    |    4 +
 493  arch/arm/mach-imx/cache-l2x0.c                     |   56 ++
 494  arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c      |    3 +-
 495  arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c      |    1 -
 496  arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c}  |   38 +--
 497  arch/arm/mach-imx/cpu-imx35.c                      |   44 ++
 498  .../crm_regs.h => mach-imx/crmregs-imx31.h}        |    0
 499  arch/arm/mach-imx/devices-imx1.h                   |    8 +-
 500  arch/arm/mach-imx/devices-imx21.h                  |   22 +-
 501  arch/arm/mach-imx/devices-imx25.h                  |   35 +-
 502  arch/arm/mach-imx/devices-imx27.h                  |   30 +-
 503  arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h    |   36 +-
 504  arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h    |   37 +-
 505  arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c       |    1 -
 506  arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c       |    1 -
 507  arch/arm/mach-imx/eukrea_mbimx27-baseboard.c       |    1 -
 508  arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c     |   17 +-
 509  .../eukrea_mbimxsd35-baseboard.c}                  |   29 +-
 510  arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c      |    0
 511  .../arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c |   29 +-
 512  arch/arm/{mach-mx3 => mach-imx}/mach-bug.c         |    1 -
 513  arch/arm/mach-imx/mach-cpuimx27.c                  |    1 -
 514  arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c    |    2 -
 515  arch/arm/mach-imx/mach-eukrea_cpuimx25.c           |    2 -
 516  arch/arm/mach-imx/mach-imx27_visstrim_m10.c        |   14 +-
 517  .../arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c |    1 -
 518  arch/arm/mach-imx/mach-mx1ads.c                    |    1 -
 519  arch/arm/mach-imx/mach-mx21ads.c                   |    1 -
 520  arch/arm/mach-imx/mach-mx25_3ds.c                  |   13 +-
 521  arch/arm/mach-imx/mach-mx27ads.c                   |    1 -
 522  arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c    |   50 +-
 523  arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c     |    1 -
 524  arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c   |    1 -
 525  arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c    |    1 -
 526  arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c |   75 ++-
 527  arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c    |    1 -
 528  arch/arm/mach-imx/mach-mxt_td60.c                  |    1 -
 529  arch/arm/mach-imx/mach-pca100.c                    |    1 -
 530  arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c      |   65 ++-
 531  arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c  |   17 +-
 532  arch/arm/mach-imx/mach-pcm038.c                    |    1 -
 533  arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c      |   17 +-
 534  arch/arm/{mach-mx3 => mach-imx}/mach-qong.c        |   15 +-
 535  arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c      |   36 +-
 536  arch/arm/mach-imx/mm-imx31.c                       |   66 ++
 537  arch/arm/mach-imx/mm-imx35.c                       |   63 ++
 538  arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c     |   13 +-
 539  arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c      |    3 +-
 540  .../{mach-mx3 => mach-imx}/mx31moboard-devboard.c  |    1 -
 541  .../{mach-mx3 => mach-imx}/mx31moboard-marxbot.c   |    2 -
 542  .../{mach-mx3 => mach-imx}/mx31moboard-smartbot.c  |    1 -
 543  arch/arm/{mach-mx3 => mach-imx}/pcm037.h           |    0
 544  arch/arm/mach-mx3/Kconfig                          |  257 --------
 545  arch/arm/mach-mx3/Makefile                         |   26 -
 546  arch/arm/mach-mx3/Makefile.boot                    |    3 -
 547  arch/arm/mach-mx3/devices.c                        |  115 ----
 548  arch/arm/mach-mx3/devices.h                        |    4 -
 549  arch/arm/mach-mx3/mm.c                             |  141 -----
 550  arch/arm/mach-mx5/Kconfig                          |   58 ++-
 551  arch/arm/mach-mx5/board-cpuimx51.c                 |    2 -
 552  arch/arm/mach-mx5/board-cpuimx51sd.c               |    2 -
 553  arch/arm/mach-mx5/board-mx50_rdp.c                 |    1 -
 554  arch/arm/mach-mx5/board-mx51_babbage.c             |   18 +-
 555  arch/arm/mach-mx5/board-mx51_efikamx.c             |    5 +-
 556  arch/arm/mach-mx5/board-mx51_efikasb.c             |    5 +-
 557  arch/arm/mach-mx5/board-mx53_evk.c                 |    2 -
 558  arch/arm/mach-mx5/board-mx53_loco.c                |    4 +-
 559  arch/arm/mach-mx5/board-mx53_smd.c                 |   30 +-
 560  arch/arm/mach-mx5/clock-mx51-mx53.c                |    1 +
 561  arch/arm/mach-mx5/cpu.c                            |   23 +
 562  arch/arm/mach-mx5/devices-imx50.h                  |    6 +-
 563  arch/arm/mach-mx5/devices-imx51.h                  |   25 +-
 564  arch/arm/mach-mx5/devices-imx53.h                  |   13 +-
 565  arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c       |    2 -
 566  arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c       |   16 +-
 567  arch/arm/mach-mx5/mx51_efika.c                     |    3 -
 568  arch/arm/mach-mxc91231/Kconfig                     |   11 -
 569  arch/arm/mach-mxc91231/Makefile                    |    2 -
 570  arch/arm/mach-mxc91231/Makefile.boot               |    3 -
 571  arch/arm/mach-mxc91231/clock.c                     |  640 --------------------
 572  arch/arm/mach-mxc91231/crm_regs.h                  |  394 ------------
 573  arch/arm/mach-mxc91231/devices.c                   |  251 --------
 574  arch/arm/mach-mxc91231/devices.h                   |   13 -
 575  arch/arm/mach-mxc91231/iomux.c                     |  177 ------
 576  arch/arm/mach-mxc91231/magx-zn5.c                  |   62 --
 577  arch/arm/mach-mxc91231/mm.c                        |   62 --
 578  arch/arm/mach-mxc91231/system.c                    |   51 --
 579  arch/arm/mach-mxs/clock-mx28.c                     |    7 +-
 580  arch/arm/mach-mxs/devices-mx28.h                   |    2 +-
 581  arch/arm/mach-mxs/devices/platform-mxs-i2c.c       |    5 +-
 582  arch/arm/mach-mxs/include/mach/devices-common.h    |    5 +-
 583  arch/arm/mach-mxs/include/mach/mx23.h              |    2 +-
 584  arch/arm/mach-mxs/mach-mx23evk.c                   |    2 +-
 585  arch/arm/mach-mxs/mach-mx28evk.c                   |    4 +-
 586  arch/arm/plat-mxc/Kconfig                          |   54 +-
 587  arch/arm/plat-mxc/devices/Kconfig                  |    7 +-
 588  arch/arm/plat-mxc/devices/Makefile                 |    2 +
 589  arch/arm/plat-mxc/devices/platform-ipu-core.c      |  129 ++++
 590  arch/arm/plat-mxc/devices/platform-mxc_rtc.c       |   40 ++
 591  arch/arm/plat-mxc/devices/platform-spi_imx.c       |    2 +-
 592  arch/arm/plat-mxc/gpio.c                           |    7 +
 593  arch/arm/plat-mxc/include/mach/common.h            |    8 +-
 594  arch/arm/plat-mxc/include/mach/debug-macro.S       |    7 -
 595  arch/arm/plat-mxc/include/mach/devices-common.h    |   27 +
 596  arch/arm/plat-mxc/include/mach/hardware.h          |   17 +-
 597  arch/arm/plat-mxc/include/mach/io.h                |   23 +-
 598  arch/arm/plat-mxc/include/mach/iomux-mx25.h        |    3 +
 599  arch/arm/plat-mxc/include/mach/iomux-mxc91231.h    |  283 ---------
 600  arch/arm/plat-mxc/include/mach/irqs.h              |    2 -
 601  arch/arm/plat-mxc/include/mach/memory.h            |    3 -
 602  arch/arm/plat-mxc/include/mach/mx27.h              |    4 +-
 603  arch/arm/plat-mxc/include/mach/mx53.h              |   13 -
 604  arch/arm/plat-mxc/include/mach/mxc.h               |   22 +-
 605  arch/arm/plat-mxc/include/mach/mxc91231.h          |  256 --------
 606  arch/arm/plat-mxc/include/mach/system.h            |    6 -
 607  arch/arm/plat-mxc/include/mach/timex.h             |    2 -
 608  arch/arm/plat-mxc/ssi-fiq.S                        |    2 +
 609  arch/arm/plat-mxc/system.c                         |    6 -
 610  arch/arm/plat-mxc/time.c                           |    2 +-
 611  drivers/video/Kconfig                              |    5 +-
 612  drivers/video/imxfb.c                              |   28 +-
 613  129 files changed, 1360 insertions(+), 3427 deletions(-)
 614  create mode 100644 arch/arm/mach-imx/cache-l2x0.c
 615  rename arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c (99%)
 616  rename arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c (99%)
 617  rename arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} (72%)
 618  create mode 100644 arch/arm/mach-imx/cpu-imx35.c
 619  rename arch/arm/{mach-mx3/crm_regs.h => mach-imx/crmregs-imx31.h} (100%)
 620  rename arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h (67%)
 621  rename arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h (69%)
 622  rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c (99%)
 623  rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c (99%)
 624  rename arch/arm/{mach-mx3/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd35-baseboard.c} (92%)
 625  rename arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c (100%)
 626  rename arch/arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c (95%)
 627  rename arch/arm/{mach-mx3 => mach-imx}/mach-bug.c (98%)
 628  rename arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c (99%)
 629  rename arch/arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c (99%)
 630  rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c (96%)
 631  rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c (99%)
 632  rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c (99%)
 633  rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c (99%)
 634  rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c (92%)
 635  rename arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c (99%)
 636  rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c (94%)
 637  rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c (92%)
 638  rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c (97%)
 639  rename arch/arm/{mach-mx3 => mach-imx}/mach-qong.c (95%)
 640  rename arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c (92%)
 641  create mode 100644 arch/arm/mach-imx/mm-imx31.c
 642  create mode 100644 arch/arm/mach-imx/mm-imx35.c
 643  rename arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c (95%)
 644  rename arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c (98%)
 645  rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-devboard.c (99%)
 646  rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-marxbot.c (99%)
 647  rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-smartbot.c (99%)
 648  rename arch/arm/{mach-mx3 => mach-imx}/pcm037.h (100%)
 649  delete mode 100644 arch/arm/mach-mx3/Kconfig
 650  delete mode 100644 arch/arm/mach-mx3/Makefile
 651  delete mode 100644 arch/arm/mach-mx3/Makefile.boot
 652  delete mode 100644 arch/arm/mach-mx3/devices.c
 653  delete mode 100644 arch/arm/mach-mx3/devices.h
 654  delete mode 100644 arch/arm/mach-mx3/mm.c
 655  delete mode 100644 arch/arm/mach-mxc91231/Kconfig
 656  delete mode 100644 arch/arm/mach-mxc91231/Makefile
 657  delete mode 100644 arch/arm/mach-mxc91231/Makefile.boot
 658  delete mode 100644 arch/arm/mach-mxc91231/clock.c
 659  delete mode 100644 arch/arm/mach-mxc91231/crm_regs.h
 660  delete mode 100644 arch/arm/mach-mxc91231/devices.c
 661  delete mode 100644 arch/arm/mach-mxc91231/devices.h
 662  delete mode 100644 arch/arm/mach-mxc91231/iomux.c
 663  delete mode 100644 arch/arm/mach-mxc91231/magx-zn5.c
 664  delete mode 100644 arch/arm/mach-mxc91231/mm.c
 665  delete mode 100644 arch/arm/mach-mxc91231/system.c
 666  create mode 100644 arch/arm/plat-mxc/devices/platform-ipu-core.c
 667  create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rtc.c
 668  delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h
 669  delete mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h
 670 Merging linux-spec/for-next
 671 $ git merge linux-spec/for-next
 672 Already up-to-date.
 673 Merging msm/for-next
 674 $ git merge msm/for-next
 675 Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
 676 Merge made by recursive.
 677  arch/arm/mach-msm/Makefile                      |    5 +-
 678  arch/arm/mach-msm/acpuclock-arm11.c             |    2 +-
 679  arch/arm/mach-msm/board-halibut.c               |    1 +
 680  arch/arm/mach-msm/board-mahimahi.c              |    1 +
 681  arch/arm/mach-msm/board-msm7x30.c               |    1 +
 682  arch/arm/mach-msm/board-msm8960.c               |   18 +
 683  arch/arm/mach-msm/board-msm8x60.c               |    9 +-
 684  arch/arm/mach-msm/board-qsd8x50.c               |    1 +
 685  arch/arm/mach-msm/board-trout.c                 |    1 +
 686  arch/arm/mach-msm/clock-dummy.c                 |   81 +++++
 687  arch/arm/mach-msm/clock.h                       |   11 +
 688  arch/arm/mach-msm/devices-msm7x00.c             |   21 ++-
 689  arch/arm/mach-msm/devices-msm7x30.c             |   21 ++-
 690  arch/arm/mach-msm/devices-msm8960.c             |  181 +++++++++++
 691  arch/arm/mach-msm/devices-msm8x60.c             |   56 ++++
 692  arch/arm/mach-msm/devices-qsd8x50.c             |   21 ++-
 693  arch/arm/mach-msm/devices.h                     |    8 +
 694  arch/arm/mach-msm/dma.c                         |  391 ++++++++++++++++++-----
 695  arch/arm/mach-msm/include/mach/dma.h            |   84 +++---
 696  arch/arm/mach-msm/include/mach/msm_iomap-7x00.h |    5 +-
 697  arch/arm/mach-msm/include/mach/msm_iomap-7x30.h |    5 +-
 698  arch/arm/mach-msm/include/mach/msm_iomap-8960.h |    3 +
 699  arch/arm/mach-msm/include/mach/msm_iomap-8x50.h |    5 +-
 700  arch/arm/mach-msm/include/mach/msm_iomap-8x60.h |    6 +
 701  arch/arm/mach-msm/io.c                          |    3 -
 702  25 files changed, 808 insertions(+), 133 deletions(-)
 703  create mode 100644 arch/arm/mach-msm/clock-dummy.c
 704  create mode 100644 arch/arm/mach-msm/devices-msm8x60.c
 705 Merging omap/for-next
 706 $ git merge omap/for-next
 707 Merge made by recursive.
 708  arch/arm/mach-omap2/Makefile                |    2 +-
 709  arch/arm/mach-omap2/board-cm-t35.c          |   84 +++------------------
 710  arch/arm/mach-omap2/board-igep0020.c        |   53 ++-----------
 711  arch/arm/mach-omap2/board-ldp.c             |   65 ++--------------
 712  arch/arm/mach-omap2/board-omap3evm.c        |   71 +++---------------
 713  arch/arm/mach-omap2/board-omap3logic.c      |    1 -
 714  arch/arm/mach-omap2/board-omap3stalker.c    |   48 ++----------
 715  arch/arm/mach-omap2/board-overo.c           |  108 ++++-----------------------
 716  arch/arm/mach-omap2/board-rx51.c            |    9 ++-
 717  arch/arm/mach-omap2/board-zoom-debugboard.c |   56 ++------------
 718  arch/arm/mach-omap2/gpmc-smsc911x.c         |    7 +-
 719  arch/arm/mach-omap2/omap_l3_noc.c           |   51 ++++++-------
 720  arch/arm/mach-omap2/omap_l3_smx.c           |   46 ++++-------
 721  arch/arm/mach-omap2/pm.c                    |    1 +
 722  arch/arm/mach-omap2/pm44xx.c                |    2 -
 723  arch/arm/mach-omap2/smartreflex.c           |   23 +++++-
 724  arch/arm/mach-omap2/voltage.c               |    2 -
 725  17 files changed, 137 insertions(+), 492 deletions(-)
 726 Merging pxa/for-next
 727 $ git merge pxa/for-next
 728 Already up-to-date.
 729 Merging samsung/next-samsung
 730 $ git merge samsung/next-samsung
 731 Already up-to-date.
 732 Merging s5p/for-next
 733 $ git merge s5p/for-next
 734 Merge made by recursive.
 735  arch/arm/configs/exynos4_defconfig |    2 +
 736  arch/arm/mach-exynos4/Kconfig      |    2 +
 737  arch/arm/mach-exynos4/Makefile     |    1 +
 738  arch/arm/mach-exynos4/cpuidle.c    |   86 ++++++++++++++++++++++++++++++++++
 739  arch/arm/mach-exynos4/mach-nuri.c  |   89 ++++++++++++++++++++++++++++++++++++
 740  5 files changed, 180 insertions(+), 0 deletions(-)
 741  create mode 100644 arch/arm/mach-exynos4/cpuidle.c
 742 Merging tegra/for-next
 743 $ git merge tegra/for-next
 744 Already up-to-date.
 745 Merging ux500-core/ux500-core
 746 $ git merge ux500-core/ux500-core
 747 Removing arch/arm/mach-ux500/cpufreq.c
 748 Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h
 749 Removing arch/arm/mach-ux500/include/mach/prcmu.h
 750 Removing arch/arm/mach-ux500/prcmu.c
 751 Merge made by recursive.
 752  arch/arm/configs/u8500_defconfig                   |   29 +-
 753  arch/arm/mach-ux500/Kconfig                        |   16 +-
 754  arch/arm/mach-ux500/Makefile                       |   11 +-
 755  arch/arm/mach-ux500/board-mop500-regulators.c      |    9 +-
 756  arch/arm/mach-ux500/board-mop500-sdi.c             |   41 +-
 757  arch/arm/mach-ux500/board-mop500.c                 |   22 +-
 758  arch/arm/mach-ux500/board-mop500.h                 |    5 +
 759  arch/arm/mach-ux500/board-snowball-pins.c          |  133 ++
 760  arch/arm/mach-ux500/board-snowball.c               |  359 ++++
 761  arch/arm/mach-ux500/board-snowball.h               |   12 +
 762  arch/arm/mach-ux500/clock-db8500.c                 | 1288 +++++++++++++
 763  arch/arm/mach-ux500/clock.c                        |  904 +++-------
 764  arch/arm/mach-ux500/clock.h                        |  225 +--
 765  arch/arm/mach-ux500/cpu-db5500.c                   |    2 +
 766  arch/arm/mach-ux500/cpu-db8500.c                   |  190 ++
 767  arch/arm/mach-ux500/cpu.c                          |    7 +-
 768  arch/arm/mach-ux500/cpufreq.c                      |  211 --
 769  arch/arm/mach-ux500/include/mach/db5500-regs.h     |   20 +-
 770  arch/arm/mach-ux500/include/mach/db8500-regs.h     |   37 +-
 771  arch/arm/mach-ux500/include/mach/hardware.h        |    1 +
 772  arch/arm/mach-ux500/include/mach/id.h              |   20 +
 773  .../mach-ux500/include/mach/irqs-board-mop500.h    |    5 +
 774  .../arm/mach-ux500/include/mach/irqs-board-u5500.h |   21 +
 775  arch/arm/mach-ux500/include/mach/irqs-db5500.h     |   27 +
 776  arch/arm/mach-ux500/include/mach/irqs-db8500.h     |   54 +
 777  arch/arm/mach-ux500/include/mach/irqs.h            |   46 +-
 778  arch/arm/mach-ux500/include/mach/prcmu-db5500.h    |   45 +
 779  arch/arm/mach-ux500/include/mach/prcmu-defs.h      |   30 -
 780  arch/arm/mach-ux500/include/mach/prcmu-fw-api.h    |  523 +++++
 781  .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h |  467 +++++
 782  arch/arm/mach-ux500/include/mach/prcmu-regs.h      |   27 +-
 783  arch/arm/mach-ux500/include/mach/prcmu.h           |   28 -
 784  arch/arm/mach-ux500/include/mach/uncompress.h      |    3 +-
 785  arch/arm/mach-ux500/pins-db8500.h                  |  142 +-
 786  arch/arm/mach-ux500/pm/Kconfig                     |    6 +
 787  arch/arm/mach-ux500/pm/Makefile                    |    4 +
 788  arch/arm/mach-ux500/pm/cpufreq.c                   |  171 ++
 789  arch/arm/mach-ux500/prcmu-db5500.c                 |  449 +++++
 790  arch/arm/mach-ux500/prcmu-db8500.c                 | 2018 ++++++++++++++++++++
 791  arch/arm/mach-ux500/prcmu-regs-db8500.h            |  162 ++
 792  arch/arm/mach-ux500/prcmu.c                        |  394 ----
 793  arch/arm/mach-ux500/regulator-db8500.c             |  562 ++++++
 794  arch/arm/mach-ux500/regulator-db8500.h             |   45 +
 795  arch/arm/plat-nomadik/include/plat/pincfg.h        |    5 -
 796  drivers/mfd/ab8500-i2c.c                           |    2 +-
 797  45 files changed, 7196 insertions(+), 1582 deletions(-)
 798  create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c
 799  create mode 100644 arch/arm/mach-ux500/board-snowball.c
 800  create mode 100644 arch/arm/mach-ux500/board-snowball.h
 801  create mode 100644 arch/arm/mach-ux500/clock-db8500.c
 802  delete mode 100644 arch/arm/mach-ux500/cpufreq.c
 803  create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h
 804  create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h
 805  delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h
 806  create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h
 807  create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h
 808  delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h
 809  create mode 100644 arch/arm/mach-ux500/pm/Kconfig
 810  create mode 100644 arch/arm/mach-ux500/pm/Makefile
 811  create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c
 812  create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c
 813  create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c
 814  create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h
 815  delete mode 100644 arch/arm/mach-ux500/prcmu.c
 816  create mode 100644 arch/arm/mach-ux500/regulator-db8500.c
 817  create mode 100644 arch/arm/mach-ux500/regulator-db8500.h
 818 Merging xilinx/arm-next
 819 $ git merge xilinx/arm-next
 820 Auto-merging arch/arm/Kconfig
 821 Auto-merging arch/arm/Makefile
 822 Merge made by recursive.
 823  arch/arm/Kconfig                              |   14 ++
 824  arch/arm/Makefile                             |    1 +
 825  arch/arm/mach-zynq/Kconfig                    |   14 ++
 826  arch/arm/mach-zynq/Makefile                   |    7 +
 827  arch/arm/mach-zynq/Makefile.boot              |    3 +
 828  arch/arm/mach-zynq/board_ep107.c              |   85 +++++++
 829  arch/arm/mach-zynq/common.c                   |  114 ++++++++++
 830  arch/arm/mach-zynq/common.h                   |   30 +++
 831  arch/arm/mach-zynq/include/mach/clkdev.h      |   33 +++
 832  arch/arm/mach-zynq/include/mach/debug-macro.S |   36 +++
 833  arch/arm/mach-zynq/include/mach/entry-macro.S |   30 +++
 834  arch/arm/mach-zynq/include/mach/hardware.h    |   18 ++
 835  arch/arm/mach-zynq/include/mach/io.h          |   33 +++
 836  arch/arm/mach-zynq/include/mach/irqs.h        |   29 +++
 837  arch/arm/mach-zynq/include/mach/memory.h      |   23 ++
 838  arch/arm/mach-zynq/include/mach/system.h      |   28 +++
 839  arch/arm/mach-zynq/include/mach/timex.h       |   23 ++
 840  arch/arm/mach-zynq/include/mach/uart.h        |   25 ++
 841  arch/arm/mach-zynq/include/mach/uncompress.h  |   51 +++++
 842  arch/arm/mach-zynq/include/mach/vmalloc.h     |   20 ++
 843  arch/arm/mach-zynq/include/mach/zynq_soc.h    |   48 ++++
 844  arch/arm/mach-zynq/timer.c                    |  297 +++++++++++++++++++++++++
 845  arch/arm/mm/Kconfig                           |    2 +-
 846  23 files changed, 963 insertions(+), 1 deletions(-)
 847  create mode 100644 arch/arm/mach-zynq/Kconfig
 848  create mode 100644 arch/arm/mach-zynq/Makefile
 849  create mode 100644 arch/arm/mach-zynq/Makefile.boot
 850  create mode 100644 arch/arm/mach-zynq/board_ep107.c
 851  create mode 100644 arch/arm/mach-zynq/common.c
 852  create mode 100644 arch/arm/mach-zynq/common.h
 853  create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h
 854  create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S
 855  create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S
 856  create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
 857  create mode 100644 arch/arm/mach-zynq/include/mach/io.h
 858  create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
 859  create mode 100644 arch/arm/mach-zynq/include/mach/memory.h
 860  create mode 100644 arch/arm/mach-zynq/include/mach/system.h
 861  create mode 100644 arch/arm/mach-zynq/include/mach/timex.h
 862  create mode 100644 arch/arm/mach-zynq/include/mach/uart.h
 863  create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
 864  create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h
 865  create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
 866  create mode 100644 arch/arm/mach-zynq/timer.c
 867 Merging avr32/avr32-arch
 868 $ git merge avr32/avr32-arch
 869 Already up-to-date.
 870 Merging blackfin/for-linus
 871 $ git merge blackfin/for-linus
 872 Merge made by recursive.
 873  arch/blackfin/Kconfig.debug                       |    2 +-
 874  arch/blackfin/configs/BF527-EZKIT-V2_defconfig    |   12 +-
 875  arch/blackfin/configs/BF527-EZKIT_defconfig       |   14 +-
 876  arch/blackfin/include/asm/bfin-global.h           |   10 -
 877  arch/blackfin/include/asm/cacheflush.h            |   23 +-
 878  arch/blackfin/include/asm/cpu.h                   |    3 -
 879  arch/blackfin/include/asm/irq_handler.h           |   25 +
 880  arch/blackfin/include/asm/kgdb.h                  |    6 +-
 881  arch/blackfin/include/asm/ptrace.h                |    2 -
 882  arch/blackfin/include/mach-common/irq.h           |   57 +
 883  arch/blackfin/kernel/Makefile                     |    2 +
 884  arch/blackfin/kernel/bfin_gpio.c                  |    3 +-
 885  arch/blackfin/kernel/bfin_ksyms.c                 |    1 +
 886  arch/blackfin/kernel/debug-mmrs.c                 | 1860 +++++++++++++++++++++
 887  arch/blackfin/kernel/ipipe.c                      |    1 +
 888  arch/blackfin/kernel/irqchip.c                    |    1 +
 889  arch/blackfin/kernel/setup.c                      |   50 +-
 890  arch/blackfin/mach-bf518/include/mach/cdefBF512.h |   16 +-
 891  arch/blackfin/mach-bf518/include/mach/defBF512.h  |    8 +-
 892  arch/blackfin/mach-bf518/include/mach/irq.h       |  262 ++--
 893  arch/blackfin/mach-bf527/include/mach/cdefBF522.h |   16 +-
 894  arch/blackfin/mach-bf527/include/mach/defBF522.h  |    8 +-
 895  arch/blackfin/mach-bf527/include/mach/irq.h       |  266 ++--
 896  arch/blackfin/mach-bf533/include/mach/irq.h       |  168 +--
 897  arch/blackfin/mach-bf537/include/mach/irq.h       |  365 ++---
 898  arch/blackfin/mach-bf537/ints-priority.c          |  163 ++
 899  arch/blackfin/mach-bf538/include/mach/irq.h       |   89 +-
 900  arch/blackfin/mach-bf548/include/mach/irq.h       |   89 +-
 901  arch/blackfin/mach-bf561/include/mach/irq.h       |  505 ++----
 902  arch/blackfin/mach-bf561/smp.c                    |    3 -
 903  arch/blackfin/mach-common/ints-priority.c         |  476 ++----
 904  arch/blackfin/mach-common/smp.c                   |    1 +
 905  32 files changed, 2989 insertions(+), 1518 deletions(-)
 906  create mode 100644 arch/blackfin/include/mach-common/irq.h
 907  create mode 100644 arch/blackfin/kernel/debug-mmrs.c
 908 Merging cris/for-next
 909 $ git merge cris/for-next
 910 Auto-merging drivers/net/cris/eth_v10.c
 911 Merge made by recursive.
 912  Documentation/cris/README               |   62 +++++++++++++++---------------
 913  arch/cris/arch-v32/drivers/cryptocop.c  |    6 +--
 914  arch/cris/arch-v32/kernel/ptrace.c      |    2 -
 915  arch/cris/include/arch-v32/arch/cache.h |    2 +-
 916  drivers/net/cris/eth_v10.c              |    1 -
 917  5 files changed, 34 insertions(+), 39 deletions(-)
 918 Merging ia64/test
 919 $ git merge ia64/test
 920 Merge made by recursive.
 921  arch/ia64/oprofile/backtrace.c |    2 +-
 922  1 files changed, 1 insertions(+), 1 deletions(-)
 923 Merging m68k/for-next
 924 $ git merge m68k/for-next
 925 Already up-to-date.
 926 Merging m68knommu/for-next
 927 $ git merge m68knommu/for-next
 928 Removing arch/m68k/kernel/asm-offsets_mm.c
 929 Removing arch/m68k/kernel/asm-offsets_no.c
 930 Removing arch/m68k/kernel/m68k_ksyms_mm.c
 931 Removing arch/m68k/kernel/m68k_ksyms_no.c
 932 Removing arch/m68k/lib/Makefile_mm
 933 Removing arch/m68k/lib/Makefile_no
 934 Removing arch/m68k/lib/checksum.c
 935 Removing arch/m68k/lib/muldi3_mm.c
 936 Removing arch/m68k/lib/muldi3_no.c
 937 Removing arch/m68k/mm/Makefile_mm
 938 Removing arch/m68k/mm/Makefile_no
 939 Removing arch/m68k/mm/kmap_mm.c
 940 Removing arch/m68k/mm/kmap_no.c
 941 Merge made by recursive.
 942  arch/m68k/include/asm/bitops_no.h   |   18 +--
 943  arch/m68k/include/asm/io_no.h       |    8 +-
 944  arch/m68k/kernel/asm-offsets.c      |  106 ++++++++++-
 945  arch/m68k/kernel/asm-offsets_mm.c   |  100 ----------
 946  arch/m68k/kernel/asm-offsets_no.c   |   76 -------
 947  arch/m68k/kernel/entry_no.S         |    1 -
 948  arch/m68k/kernel/m68k_ksyms.c       |   35 +++-
 949  arch/m68k/kernel/m68k_ksyms_mm.c    |   16 --
 950  arch/m68k/kernel/m68k_ksyms_no.c    |   78 --------
 951  arch/m68k/kernel/process_no.c       |    2 +
 952  arch/m68k/kernel/syscalltable.S     |    1 -
 953  arch/m68k/lib/Makefile              |   13 +-
 954  arch/m68k/lib/Makefile_mm           |    6 -
 955  arch/m68k/lib/Makefile_no           |    7 -
 956  arch/m68k/lib/checksum.c            |    5 -
 957  arch/m68k/lib/checksum_no.c         |    3 +
 958  arch/m68k/lib/memcpy.c              |  128 +++++++------
 959  arch/m68k/lib/memmove.c             |    2 -
 960  arch/m68k/lib/memset.c              |  114 +++++++----
 961  arch/m68k/lib/muldi3.c              |   99 +++++++++-
 962  arch/m68k/lib/muldi3_mm.c           |   63 ------
 963  arch/m68k/lib/muldi3_no.c           |   86 --------
 964  arch/m68k/lib/string.c              |  223 ---------------------
 965  arch/m68k/mm/Makefile               |   14 +-
 966  arch/m68k/mm/Makefile_mm            |    8 -
 967  arch/m68k/mm/Makefile_no            |    5 -
 968  arch/m68k/mm/init_no.c              |   51 +-----
 969  arch/m68k/mm/kmap.c                 |  368 ++++++++++++++++++++++++++++++++++-
 970  arch/m68k/mm/kmap_mm.c              |  367 ----------------------------------
 971  arch/m68k/mm/kmap_no.c              |   45 -----
 972  arch/m68k/platform/68328/entry.S    |    7 +-
 973  arch/m68k/platform/68360/entry.S    |    7 +-
 974  arch/m68k/platform/coldfire/dma.c   |    3 +
 975  arch/m68k/platform/coldfire/entry.S |   11 +-
 976  arch/m68k/platform/coldfire/head.S  |    1 -
 977  35 files changed, 788 insertions(+), 1289 deletions(-)
 978  delete mode 100644 arch/m68k/kernel/asm-offsets_mm.c
 979  delete mode 100644 arch/m68k/kernel/asm-offsets_no.c
 980  delete mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c
 981  delete mode 100644 arch/m68k/kernel/m68k_ksyms_no.c
 982  delete mode 100644 arch/m68k/lib/Makefile_mm
 983  delete mode 100644 arch/m68k/lib/Makefile_no
 984  delete mode 100644 arch/m68k/lib/checksum.c
 985  delete mode 100644 arch/m68k/lib/muldi3_mm.c
 986  delete mode 100644 arch/m68k/lib/muldi3_no.c
 987  delete mode 100644 arch/m68k/mm/Makefile_mm
 988  delete mode 100644 arch/m68k/mm/Makefile_no
 989  delete mode 100644 arch/m68k/mm/kmap_mm.c
 990  delete mode 100644 arch/m68k/mm/kmap_no.c
 991 Merging microblaze/next
 992 $ git merge microblaze/next
 993 Already up-to-date.
 994 Merging mips/mips-for-linux-next
 995 $ git merge mips/mips-for-linux-next
 996 Merge made by recursive.
 997  arch/mips/Kbuild.platforms                         |    1 +
 998  arch/mips/Kconfig                                  |   19 +
 999  arch/mips/include/asm/mach-lantiq/lantiq.h         |   59 ++
1000  .../mips/include/asm/mach-lantiq/lantiq_platform.h |   46 ++
1001  arch/mips/include/asm/mach-lantiq/war.h            |   24 +
1002  arch/mips/include/asm/mach-lantiq/xway/irq.h       |   18 +
1003  .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h |   62 ++
1004  .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h |  139 ++++
1005  arch/mips/kernel/vmlinux.lds.S                     |    1 +
1006  arch/mips/lantiq/Kconfig                           |   23 +
1007  arch/mips/lantiq/Makefile                          |   11 +
1008  arch/mips/lantiq/Platform                          |    8 +
1009  arch/mips/lantiq/clk.c                             |  140 ++++
1010  arch/mips/lantiq/clk.h                             |   18 +
1011  arch/mips/lantiq/devices.c                         |  125 ++++
1012  arch/mips/lantiq/devices.h                         |   20 +
1013  arch/mips/lantiq/early_printk.c                    |   33 +
1014  arch/mips/lantiq/irq.c                             |  326 +++++++++
1015  arch/mips/lantiq/machtypes.h                       |   20 +
1016  arch/mips/lantiq/prom.c                            |   71 ++
1017  arch/mips/lantiq/prom.h                            |   24 +
1018  arch/mips/lantiq/setup.c                           |   65 ++
1019  arch/mips/lantiq/xway/Kconfig                      |   23 +
1020  arch/mips/lantiq/xway/Makefile                     |    7 +
1021  arch/mips/lantiq/xway/clk-ase.c                    |   48 ++
1022  arch/mips/lantiq/xway/clk-xway.c                   |  223 ++++++
1023  arch/mips/lantiq/xway/devices.c                    |   77 ++
1024  arch/mips/lantiq/xway/devices.h                    |   17 +
1025  arch/mips/lantiq/xway/ebu.c                        |   53 ++
1026  arch/mips/lantiq/xway/gpio.c                       |  195 +++++
1027  arch/mips/lantiq/xway/gpio_ebu.c                   |  126 ++++
1028  arch/mips/lantiq/xway/gpio_stp.c                   |  157 ++++
1029  arch/mips/lantiq/xway/mach-easy50601.c             |   69 ++
1030  arch/mips/lantiq/xway/mach-easy50712.c             |   74 ++
1031  arch/mips/lantiq/xway/pmu.c                        |   70 ++
1032  arch/mips/lantiq/xway/prom-ase.c                   |   39 +
1033  arch/mips/lantiq/xway/prom-xway.c                  |   54 ++
1034  arch/mips/lantiq/xway/reset.c                      |   79 ++
1035  arch/mips/pci/Makefile                             |    1 +
1036  arch/mips/pci/ops-lantiq.c                         |  116 +++
1037  arch/mips/pci/pci-lantiq.c                         |  297 ++++++++
1038  arch/mips/pci/pci-lantiq.h                         |   18 +
1039  arch/mips/sgi-ip27/ip27-timer.c                    |   13 +-
1040  drivers/mtd/maps/Kconfig                           |    9 +
1041  drivers/mtd/maps/Makefile                          |    1 +
1042  drivers/mtd/maps/lantiq-flash.c                    |  251 +++++++
1043  drivers/tty/serial/Kconfig                         |    8 +
1044  drivers/tty/serial/Makefile                        |    1 +
1045  drivers/tty/serial/lantiq.c                        |  756 ++++++++++++++++++++
1046  lib/Kconfig.debug                                  |    2 +-
1047  50 files changed, 4024 insertions(+), 13 deletions(-)
1048  create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq.h
1049  create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_platform.h
1050  create mode 100644 arch/mips/include/asm/mach-lantiq/war.h
1051  create mode 100644 arch/mips/include/asm/mach-lantiq/xway/irq.h
1052  create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h
1053  create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h
1054  create mode 100644 arch/mips/lantiq/Kconfig
1055  create mode 100644 arch/mips/lantiq/Makefile
1056  create mode 100644 arch/mips/lantiq/Platform
1057  create mode 100644 arch/mips/lantiq/clk.c
1058  create mode 100644 arch/mips/lantiq/clk.h
1059  create mode 100644 arch/mips/lantiq/devices.c
1060  create mode 100644 arch/mips/lantiq/devices.h
1061  create mode 100644 arch/mips/lantiq/early_printk.c
1062  create mode 100644 arch/mips/lantiq/irq.c
1063  create mode 100644 arch/mips/lantiq/machtypes.h
1064  create mode 100644 arch/mips/lantiq/prom.c
1065  create mode 100644 arch/mips/lantiq/prom.h
1066  create mode 100644 arch/mips/lantiq/setup.c
1067  create mode 100644 arch/mips/lantiq/xway/Kconfig
1068  create mode 100644 arch/mips/lantiq/xway/Makefile
1069  create mode 100644 arch/mips/lantiq/xway/clk-ase.c
1070  create mode 100644 arch/mips/lantiq/xway/clk-xway.c
1071  create mode 100644 arch/mips/lantiq/xway/devices.c
1072  create mode 100644 arch/mips/lantiq/xway/devices.h
1073  create mode 100644 arch/mips/lantiq/xway/ebu.c
1074  create mode 100644 arch/mips/lantiq/xway/gpio.c
1075  create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c
1076  create mode 100644 arch/mips/lantiq/xway/gpio_stp.c
1077  create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c
1078  create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c
1079  create mode 100644 arch/mips/lantiq/xway/pmu.c
1080  create mode 100644 arch/mips/lantiq/xway/prom-ase.c
1081  create mode 100644 arch/mips/lantiq/xway/prom-xway.c
1082  create mode 100644 arch/mips/lantiq/xway/reset.c
1083  create mode 100644 arch/mips/pci/ops-lantiq.c
1084  create mode 100644 arch/mips/pci/pci-lantiq.c
1085  create mode 100644 arch/mips/pci/pci-lantiq.h
1086  create mode 100644 drivers/mtd/maps/lantiq-flash.c
1087  create mode 100644 drivers/tty/serial/lantiq.c
1088 Merging parisc/for-next
1089 $ git merge parisc/for-next
1090 Merge made by recursive.
1091  arch/parisc/include/asm/cacheflush.h |    5 +-
1092  arch/parisc/include/asm/pgtable.h    |    9 +-
1093  arch/parisc/include/asm/unistd.h     |    8 +-
1094  arch/parisc/kernel/cache.c           |   13 ++-
1095  arch/parisc/kernel/entry.S           |    3 +
1096  arch/parisc/kernel/head.S            |    5 +-
1097  arch/parisc/kernel/module.c          |   10 ++-
1098  arch/parisc/kernel/pacache.S         |    6 +-
1099  arch/parisc/kernel/sys_parisc32.c    |    8 +
1100  arch/parisc/kernel/syscall_table.S   |    6 +
1101  arch/parisc/kernel/vmlinux.lds.S     |    1 +
1102  arch/parisc/mm/init.c                |  264 +++++++++++++++++++---------------
1103  12 files changed, 208 insertions(+), 130 deletions(-)
1104 Merging powerpc/next
1105 $ git merge powerpc/next
1106 Already up-to-date.
1107 Merging 4xx/next
1108 $ git merge 4xx/next
1109 Already up-to-date.
1110 Merging 52xx-and-virtex/powerpc/next
1111 $ git merge 52xx-and-virtex/powerpc/next
1112 Already up-to-date.
1113 Merging galak/next
1114 $ git merge galak/next
1115 Already up-to-date.
1116 Merging s390/features
1117 $ git merge s390/features
1118 Removing drivers/s390/char/tape_block.c
1119 Merge made by recursive.
1120  arch/s390/Kconfig                   |   11 -
1121  arch/s390/appldata/appldata_base.c  |    2 -
1122  arch/s390/crypto/prng.c             |    2 +-
1123  arch/s390/include/asm/cmpxchg.h     |    1 -
1124  arch/s390/include/asm/elf.h         |   12 -
1125  arch/s390/include/asm/hugetlb.h     |   17 +-
1126  arch/s390/include/asm/mmu.h         |    3 -
1127  arch/s390/include/asm/mmu_context.h |    3 -
1128  arch/s390/include/asm/percpu.h      |   68 ++++++
1129  arch/s390/include/asm/pgalloc.h     |   28 +--
1130  arch/s390/include/asm/pgtable.h     |   38 ---
1131  arch/s390/include/asm/tlbflush.h    |   11 +-
1132  arch/s390/kernel/setup.c            |   31 +---
1133  arch/s390/kernel/smp.c              |    2 +-
1134  arch/s390/kernel/vdso32/Makefile    |    3 +
1135  arch/s390/kernel/vdso64/Makefile    |    3 +
1136  arch/s390/kvm/sie64a.S              |    4 +-
1137  arch/s390/mm/extmem.c               |    6 +-
1138  arch/s390/mm/fault.c                |   43 +----
1139  arch/s390/mm/hugetlbpage.c          |   10 -
1140  arch/s390/mm/pageattr.c             |    5 +-
1141  arch/s390/mm/pgtable.c              |   68 +-----
1142  drivers/crypto/Kconfig              |    2 +
1143  drivers/s390/block/dasd.c           |   40 ++--
1144  drivers/s390/block/dasd_alias.c     |    4 -
1145  drivers/s390/block/dasd_devmap.c    |   30 +++
1146  drivers/s390/block/dasd_eckd.c      |   16 +-
1147  drivers/s390/block/dasd_genhd.c     |    2 +-
1148  drivers/s390/block/dasd_int.h       |    3 +
1149  drivers/s390/block/dasd_ioctl.c     |  128 +++++++----
1150  drivers/s390/char/Kconfig           |   12 -
1151  drivers/s390/char/Makefile          |    1 -
1152  drivers/s390/char/monwriter.c       |    4 +-
1153  drivers/s390/char/raw3270.c         |    2 -
1154  drivers/s390/char/sclp_sdias.c      |    3 -
1155  drivers/s390/char/tape_3590.c       |   11 +-
1156  drivers/s390/char/tape_block.c      |  445 -----------------------------------
1157  drivers/s390/char/tape_std.c        |    3 +-
1158  drivers/s390/cio/device_fsm.c       |    3 -
1159  drivers/s390/cio/device_ops.c       |    3 -
1160  drivers/s390/cio/qdio_main.c        |   17 +-
1161  drivers/s390/crypto/ap_bus.c        |    8 +-
1162  42 files changed, 277 insertions(+), 831 deletions(-)
1163  delete mode 100644 drivers/s390/char/tape_block.c
1164 Merging sh/sh-latest
1165 $ git merge sh/sh-latest
1166 Already up-to-date.
1167 Merging rmobile/rmobile-latest
1168 $ git merge rmobile/rmobile-latest
1169 Already up-to-date.
1170 Merging sparc/master
1171 $ git merge sparc/master
1172 Merge made by recursive.
1173  arch/sparc/Kconfig                 |    6 +-
1174  arch/sparc/include/asm/floppy_32.h |   40 ++-
1175  arch/sparc/include/asm/irq_32.h    |    6 +-
1176  arch/sparc/include/asm/leon.h      |   36 +--
1177  arch/sparc/include/asm/pcic.h      |   12 +-
1178  arch/sparc/include/asm/system_32.h |    5 -
1179  arch/sparc/kernel/Makefile         |    4 -
1180  arch/sparc/kernel/entry.S          |   16 --
1181  arch/sparc/kernel/irq.h            |   45 ++--
1182  arch/sparc/kernel/irq_32.c         |  503 ++++++++----------------------------
1183  arch/sparc/kernel/kernel.h         |    1 +
1184  arch/sparc/kernel/leon_kernel.c    |  360 +++++++++++++++++---------
1185  arch/sparc/kernel/leon_smp.c       |   12 +-
1186  arch/sparc/kernel/pcic.c           |   83 ++++--
1187  arch/sparc/kernel/sun4c_irq.c      |  150 +++++++-----
1188  arch/sparc/kernel/sun4d_irq.c      |  480 ++++++++++++----------------------
1189  arch/sparc/kernel/sun4m_irq.c      |  179 +++++++------
1190  arch/sparc/kernel/sun4m_smp.c      |   16 +-
1191  arch/sparc/kernel/time_32.c        |   10 +-
1192  19 files changed, 847 insertions(+), 1117 deletions(-)
1193 Merging tile/master
1194 $ git merge tile/master
1195 Already up-to-date.
1196 Merging unicore32/unicore32
1197 $ git merge unicore32/unicore32
1198 Already up-to-date.
1199 Merging xtensa/master
1200 $ git merge xtensa/master
1201 Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution.
1202 Auto-merging arch/xtensa/Kconfig
1203 Auto-merging arch/xtensa/Makefile
1204 Auto-merging arch/xtensa/boot/Makefile
1205 Auto-merging arch/xtensa/configs/iss_defconfig
1206 CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
1207 Auto-merging arch/xtensa/include/asm/coprocessor.h
1208 Auto-merging arch/xtensa/kernel/Makefile
1209 Auto-merging arch/xtensa/kernel/time.c
1210 Automatic merge failed; fix conflicts and then commit the result.
1211 $ git commit -v -a
1212 [master c838b70] Merge remote-tracking branch 'xtensa/master'
1213 $ git diff -M --stat --summary HEAD^..
1214  arch/xtensa/Kconfig                                |   17 +-
1215  arch/xtensa/Makefile                               |    5 +-
1216  arch/xtensa/boot/Makefile                          |    1 +
1217  arch/xtensa/include/asm/coprocessor.h              |    9 +-
1218  arch/xtensa/include/asm/io.h                       |   40 ++--
1219  arch/xtensa/include/asm/irq.h                      |    7 +-
1220  arch/xtensa/include/asm/serial.h                   |   12 +-
1221  arch/xtensa/kernel/Makefile                        |    4 +-
1222  arch/xtensa/kernel/time.c                          |    2 +-
1223  arch/xtensa/platforms/xtavnet/Makefile             |   10 +
1224  .../platforms/xtavnet/include/platform/hardware.h  |   85 ++++++
1225  .../platforms/xtavnet/include/platform/lcd.h       |   22 ++
1226  .../platforms/xtavnet/include/platform/serial.h    |    1 +
1227  arch/xtensa/platforms/xtavnet/lcd.c                |   79 ++++++
1228  arch/xtensa/platforms/xtavnet/setup.c              |  269 ++++++++++++++++++++
1229  15 files changed, 526 insertions(+), 37 deletions(-)
1230  create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
1231  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
1232  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
1233  create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
1234  create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
1235  create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
1236 Merging ceph/for-next
1237 $ git merge ceph/for-next
1238 Already up-to-date.
1239 Merging cifs/master
1240 $ git merge cifs/master
1241 Merge made by recursive.
1242  fs/cifs/connect.c |    5 +++--
1243  1 files changed, 3 insertions(+), 2 deletions(-)
1244 Merging configfs/linux-next
1245 $ git merge configfs/linux-next
1246 Already up-to-date.
1247 Merging ecryptfs/next
1248 $ git merge ecryptfs/next
1249 Merge made by recursive.
1250  fs/ecryptfs/crypto.c          |   21 ++++++++++++
1251  fs/ecryptfs/ecryptfs_kernel.h |    7 +++-
1252  fs/ecryptfs/file.c            |   25 +++++++-------
1253  fs/ecryptfs/inode.c           |   60 ++++++++++++++++++----------------
1254  fs/ecryptfs/kthread.c         |    6 ++--
1255  fs/ecryptfs/main.c            |   72 ++++++++++++++++++++++++++++------------
1256  fs/ecryptfs/super.c           |   16 ++-------
1257  7 files changed, 128 insertions(+), 79 deletions(-)
1258 Merging ext3/for_next
1259 $ git merge ext3/for_next
1260 Already up-to-date.
1261 Merging ext4/next
1262 $ git merge ext4/next
1263 Already up-to-date.
1264 Merging fatfs/master
1265 $ git merge fatfs/master
1266 Merge made by recursive.
1267  fs/fat/cache.c       |    7 +++++
1268  fs/fat/dir.c         |   32 +++++++++++----------
1269  fs/fat/fat.h         |   15 +++++-----
1270  fs/fat/fatent.c      |    4 +-
1271  fs/fat/inode.c       |   74 ++++++++++++++++++++++++-------------------------
1272  fs/fat/misc.c        |   44 ++++++++++++++++++++---------
1273  fs/fat/namei_msdos.c |    4 +-
1274  fs/fat/namei_vfat.c  |    4 +-
1275  8 files changed, 104 insertions(+), 80 deletions(-)
1276 Merging fuse/for-next
1277 $ git merge fuse/for-next
1278 Already up-to-date.
1279 Merging gfs2/master
1280 $ git merge gfs2/master
1281 Merge made by recursive.
1282  fs/gfs2/dir.c        |  186 +++++++++++++++++++++----------------------------
1283  fs/gfs2/export.c     |    2 +-
1284  fs/gfs2/file.c       |   36 ++++------
1285  fs/gfs2/glock.c      |   89 +++++++++++++-----------
1286  fs/gfs2/glock.h      |    3 +-
1287  fs/gfs2/glops.c      |   59 +++++++++++-----
1288  fs/gfs2/glops.h      |    2 +
1289  fs/gfs2/incore.h     |    7 +-
1290  fs/gfs2/inode.c      |   63 +----------------
1291  fs/gfs2/inode.h      |    3 +-
1292  fs/gfs2/log.c        |  174 ++++++++++++++++++++++++-----------------------
1293  fs/gfs2/log.h        |    2 +
1294  fs/gfs2/lops.c       |   39 +++++++---
1295  fs/gfs2/main.c       |    1 +
1296  fs/gfs2/meta_io.c    |    2 +
1297  fs/gfs2/meta_io.h    |    2 -
1298  fs/gfs2/rgrp.c       |   20 ++++-
1299  fs/gfs2/super.c      |  103 +++++++++++++++++++++++++---
1300  fs/gfs2/trace_gfs2.h |   38 +++++++++-
1301  19 files changed, 456 insertions(+), 375 deletions(-)
1302 Merging hfsplus/for-next
1303 $ git merge hfsplus/for-next
1304 Merge made by recursive.
1305  fs/hfsplus/extents.c |    9 ++++++---
1306  fs/hfsplus/super.c   |    9 +++++++++
1307  fs/hfsplus/unicode.c |   35 +++++++++++++++++++++++++++--------
1308  fs/hfsplus/wrapper.c |    9 +++------
1309  4 files changed, 45 insertions(+), 17 deletions(-)
1310 Merging jfs/next
1311 $ git merge jfs/next
1312 Already up-to-date.
1313 Merging logfs/master
1314 $ git merge logfs/master
1315 Resolved 'fs/logfs/logfs.h' using previous resolution.
1316 Auto-merging fs/logfs/logfs.h
1317 CONFLICT (content): Merge conflict in fs/logfs/logfs.h
1318 Automatic merge failed; fix conflicts and then commit the result.
1319 $ git commit -v -a
1320 [master 2610496] Merge remote-tracking branch 'logfs/master'
1321 $ git diff -M --stat --summary HEAD^..
1322 Merging nfs/linux-next
1323 $ git merge nfs/linux-next
1324 Merge made by recursive.
1325  fs/nfs/namespace.c             |    4 +-
1326  fs/nfs/nfs4proc.c              |   60 +++++++++++++++++++++++++++++----------
1327  fs/nfs/nfs4state.c             |    4 +-
1328  fs/nfs/nfs4xdr.c               |   11 ++++--
1329  fs/nfs/pnfs.c                  |    8 ++++-
1330  fs/nfs/super.c                 |    4 +-
1331  fs/nfs/write.c                 |    4 +--
1332  include/linux/sunrpc/sched.h   |    2 +
1333  net/sunrpc/Kconfig             |    9 ++---
1334  net/sunrpc/auth_gss/auth_gss.c |    8 +++--
1335  net/sunrpc/xprt.c              |    1 +
1336  11 files changed, 77 insertions(+), 38 deletions(-)
1337 Merging nfsd/nfsd-next
1338 $ git merge nfsd/nfsd-next
1339 Merge made by recursive.
1340  include/linux/sunrpc/svcsock.h |    1 +
1341  net/sunrpc/svcsock.c           |  336 ++++++++++++++++++++++------------------
1342  2 files changed, 189 insertions(+), 148 deletions(-)
1343 Merging nilfs2/for-next
1344 $ git merge nilfs2/for-next
1345 Merge made by recursive.
1346  fs/nilfs2/file.c          |    1 -
1347  fs/nilfs2/inode.c         |   13 +++-
1348  fs/nilfs2/page.c          |   53 +---------------
1349  fs/nilfs2/page.h          |    4 -
1350  fs/nilfs2/segbuf.c        |   12 ----
1351  fs/nilfs2/segment.c       |  161 ++++++---------------------------------------
1352  fs/nilfs2/segment.h       |    2 -
1353  include/linux/nilfs2_fs.h |    1 +
1354  8 files changed, 34 insertions(+), 213 deletions(-)
1355 Merging ocfs2/linux-next
1356 $ git merge ocfs2/linux-next
1357 Already up-to-date.
1358 Merging omfs/for-next
1359 $ git merge omfs/for-next
1360 Already up-to-date.
1361 Merging squashfs/master
1362 $ git merge squashfs/master
1363 Already up-to-date.
1364 Merging udf/for_next
1365 $ git merge udf/for_next
1366 Already up-to-date.
1367 Merging v9fs/for-next
1368 $ git merge v9fs/for-next
1369 Already up-to-date.
1370 Merging ubifs/linux-next
1371 $ git merge ubifs/linux-next
1372 Recorded preimage for 'fs/ubifs/super.c'
1373 Auto-merging fs/ubifs/super.c
1374 CONFLICT (content): Merge conflict in fs/ubifs/super.c
1375 Automatic merge failed; fix conflicts and then commit the result.
1376 $ git commit -v -a
1377 Recorded resolution for 'fs/ubifs/super.c'.
1378 [master 55e7f8d] Merge remote-tracking branch 'ubifs/linux-next'
1379 $ git diff -M --stat --summary HEAD^..
1380  Documentation/filesystems/ubifs.txt |    1 -
1381  fs/ubifs/budget.c                   |  104 ++++++++++++++++----------------
1382  fs/ubifs/commit.c                   |    2 +-
1383  fs/ubifs/debug.c                    |  112 ++++++++++++++++++++---------------
1384  fs/ubifs/debug.h                    |   31 +++++----
1385  fs/ubifs/dir.c                      |    4 +-
1386  fs/ubifs/file.c                     |   27 +++++----
1387  fs/ubifs/find.c                     |   10 ++--
1388  fs/ubifs/io.c                       |    4 +-
1389  fs/ubifs/journal.c                  |    4 +-
1390  fs/ubifs/lpt_commit.c               |   55 +++++++++++++++++-
1391  fs/ubifs/master.c                   |    8 +-
1392  fs/ubifs/orphan.c                   |    3 +-
1393  fs/ubifs/replay.c                   |    8 +-
1394  fs/ubifs/super.c                    |   31 +++++-----
1395  fs/ubifs/tnc.c                      |   10 ++--
1396  fs/ubifs/tnc_commit.c               |   18 +++---
1397  fs/ubifs/ubifs-media.h              |   28 ++++----
1398  fs/ubifs/ubifs.h                    |   81 +++++++++++++------------
1399  fs/ubifs/xattr.c                    |    8 +-
1400  20 files changed, 314 insertions(+), 235 deletions(-)
1401 Merging xfs/master
1402 $ git merge xfs/master
1403 Already up-to-date.
1404 Merging vfs/for-next
1405 $ git merge vfs/for-next
1406 Already up-to-date.
1407 Merging vfs-scale/vfs-scale-working
1408 $ git merge vfs-scale/vfs-scale-working
1409 Already up-to-date.
1410 Merging pci/linux-next
1411 $ git merge pci/linux-next
1412 Merge made by recursive.
1413  arch/x86/include/asm/pci.h        |    2 -
1414  arch/x86/kernel/pci-dma.c         |   64 -------------------------------------
1415  arch/x86/kernel/setup.c           |    1 -
1416  arch/x86/pci/direct.c             |   17 +++------
1417  arch/x86/pci/irq.c                |    4 ++-
1418  drivers/pci/access.c              |   18 +++++++++--
1419  drivers/pci/pci.c                 |   15 +++++++++
1420  drivers/pci/pcie/aer/aer_inject.c |    2 +-
1421  drivers/pci/pcie/aspm.c           |    2 +-
1422  drivers/pci/quirks.c              |   14 +++++++-
1423  include/linux/pci_ids.h           |    3 ++
1424  11 files changed, 56 insertions(+), 86 deletions(-)
1425 Merging hid/for-next
1426 $ git merge hid/for-next
1427 Auto-merging drivers/hid/Kconfig
1428 Removing drivers/hid/hid-3m-pct.c
1429 Removing drivers/hid/hid-cando.c
1430 Auto-merging drivers/hid/hid-core.c
1431 Auto-merging drivers/hid/hid-ids.h
1432 Removing drivers/hid/hid-mosart.c
1433 Removing drivers/hid/hid-stantum.c
1434 Auto-merging samples/Kconfig
1435 Merge made by recursive.
1436  Documentation/{usb => hid}/hiddev.txt |    0
1437  Documentation/hid/hidraw.txt          |  119 +++++++++++++
1438  drivers/hid/Kconfig                   |   29 +---
1439  drivers/hid/Makefile                  |    4 -
1440  drivers/hid/hid-3m-pct.c              |  305 ---------------------------------
1441  drivers/hid/hid-cando.c               |  276 -----------------------------
1442  drivers/hid/hid-core.c                |    1 +
1443  drivers/hid/hid-ids.h                 |    3 +
1444  drivers/hid/hid-mosart.c              |  296 --------------------------------
1445  drivers/hid/hid-multitouch.c          |  166 +++++++++++++++---
1446  drivers/hid/hid-stantum.c             |  286 -------------------------------
1447  drivers/hid/hidraw.c                  |   16 +-
1448  drivers/hid/usbhid/hiddev.c           |    2 +-
1449  net/bluetooth/hidp/hidp.h             |    2 +-
1450  samples/Kconfig                       |    6 +
1451  samples/Makefile                      |    2 +-
1452  samples/hidraw/Makefile               |   10 +
1453  samples/hidraw/hid-example.c          |  178 +++++++++++++++++++
1454  18 files changed, 475 insertions(+), 1226 deletions(-)
1455  rename Documentation/{usb => hid}/hiddev.txt (100%)
1456  create mode 100644 Documentation/hid/hidraw.txt
1457  delete mode 100644 drivers/hid/hid-3m-pct.c
1458  delete mode 100644 drivers/hid/hid-cando.c
1459  delete mode 100644 drivers/hid/hid-mosart.c
1460  delete mode 100644 drivers/hid/hid-stantum.c
1461  create mode 100644 samples/hidraw/Makefile
1462  create mode 100644 samples/hidraw/hid-example.c
1463 Merging quilt/i2c
1464 $ git merge quilt/i2c
1465 Recorded preimage for 'include/linux/pci_ids.h'
1466 Auto-merging include/linux/pci_ids.h
1467 CONFLICT (content): Merge conflict in include/linux/pci_ids.h
1468 Automatic merge failed; fix conflicts and then commit the result.
1469 $ git commit -v -a
1470 Recorded resolution for 'include/linux/pci_ids.h'.
1471 [master f50f2b4] Merge branch 'quilt/i2c'
1472 $ git diff -M --stat --summary HEAD^..
1473  Documentation/i2c/busses/i2c-i801 |    1 +
1474  drivers/i2c/busses/Kconfig        |    1 +
1475  drivers/i2c/busses/i2c-i801.c     |    8 ++++++++
1476  include/linux/pci_ids.h           |    4 ----
1477  4 files changed, 10 insertions(+), 4 deletions(-)
1478 Merging bjdooks-i2c/next-i2c
1479 $ git merge bjdooks-i2c/next-i2c
1480 Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution.
1481 Resolved 'drivers/i2c/busses/i2c-designware-core.c' using previous resolution.
1482 Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution.
1483 Auto-merging MAINTAINERS
1484 Auto-merging arch/arm/mach-pxa/tosa.c
1485 CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
1486 Auto-merging drivers/i2c/busses/Kconfig
1487 Auto-merging drivers/i2c/busses/Makefile
1488 Auto-merging drivers/i2c/busses/i2c-designware-core.c
1489 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c
1490 CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree.
1491 Auto-merging drivers/i2c/busses/i2c-pxa.c
1492 CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c
1493 Automatic merge failed; fix conflicts and then commit the result.
1494 $ git rm -f drivers/i2c/busses/i2c-intel-mid.c
1495 arch/arm/mach-pxa/tosa.c: needs merge
1496 drivers/i2c/busses/i2c-designware-core.c: needs merge
1497 drivers/i2c/busses/i2c-intel-mid.c: needs merge
1498 drivers/i2c/busses/i2c-pxa.c: needs merge
1499 rm 'drivers/i2c/busses/i2c-intel-mid.c'
1500 $ git commit -v -a
1501 [master 0ca153a] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
1502 $ git diff -M --stat --summary HEAD^..
1503  MAINTAINERS                                        |    6 +
1504  drivers/i2c/busses/Kconfig                         |   25 +-
1505  drivers/i2c/busses/Makefile                        |    6 +-
1506  .../{i2c-designware.c => i2c-designware-core.c}    |  383 ++-----
1507  drivers/i2c/busses/i2c-designware-core.h           |  106 ++
1508  drivers/i2c/busses/i2c-designware-pcidrv.c         |  405 +++++++
1509  drivers/i2c/busses/i2c-designware-platdrv.c        |  215 ++++
1510  drivers/i2c/busses/i2c-intel-mid.c                 | 1135 --------------------
1511  8 files changed, 868 insertions(+), 1413 deletions(-)
1512  rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%)
1513  create mode 100644 drivers/i2c/busses/i2c-designware-core.h
1514  create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c
1515  create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c
1516  delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c
1517 $ git am -3 ../patches/0001-i2c-designware-mdelay-use-needs-linux-delay.h-inclus.patch
1518 Applying: i2c-designware: mdelay use needs linux/delay.h inclusion
1519 $ git reset HEAD^
1520 Unstaged changes after reset:
1521 M       drivers/i2c/busses/i2c-designware-core.c
1522 $ git add .
1523 $ git commit -v -a --amend
1524 [master b9297b6] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
1525 $ git am -3 ../patches/i2c__designware-pcidrv_depends_on_PCI.patch
1526 Applying: i2c: designware-pcidrv depends on PCI
1527 $ git reset HEAD^
1528 Unstaged changes after reset:
1529 M       drivers/i2c/busses/Kconfig
1530 $ git add .
1531 $ git commit -v -a --amend
1532 [master 839c863] Merge remote-tracking branch 'bjdooks-i2c/next-i2c'
1533 Merging quilt/jdelvare-hwmon
1534 $ git merge quilt/jdelvare-hwmon
1535 Auto-merging MAINTAINERS
1536 Merge made by recursive.
1537  Documentation/hwmon/adm1021      |   36 +++---
1538  Documentation/hwmon/fam15h_power |   37 ++++++
1539  Documentation/hwmon/k10temp      |    3 +-
1540  Documentation/hwmon/lm90         |   29 ++++--
1541  MAINTAINERS                      |    7 +
1542  drivers/hwmon/Kconfig            |   25 +++--
1543  drivers/hwmon/Makefile           |    1 +
1544  drivers/hwmon/adcxx.c            |   16 ++--
1545  drivers/hwmon/fam15h_power.c     |  229 ++++++++++++++++++++++++++++++++++++++
1546  drivers/hwmon/ibmaem.c           |   10 +-
1547  drivers/hwmon/jc42.c             |    2 +-
1548  drivers/hwmon/k10temp.c          |   11 +-
1549  drivers/hwmon/k8temp.c           |    8 +-
1550  drivers/hwmon/lm70.c             |   10 +-
1551  drivers/hwmon/lm90.c             |   22 +++-
1552  drivers/hwmon/ultra45_env.c      |    4 +-
1553  include/linux/i2c.h              |    2 +-
1554  17 files changed, 379 insertions(+), 73 deletions(-)
1555  create mode 100644 Documentation/hwmon/fam15h_power
1556  create mode 100644 drivers/hwmon/fam15h_power.c
1557 Merging hwmon-staging/hwmon-next
1558 $ git merge hwmon-staging/hwmon-next
1559 Auto-merging drivers/hwmon/Kconfig
1560 Auto-merging drivers/hwmon/Makefile
1561 Merge made by recursive.
1562  Documentation/hwmon/adm1275  |   60 +++
1563  Documentation/hwmon/max16065 |   98 +++++
1564  Documentation/hwmon/max6642  |   21 +
1565  Documentation/hwmon/sht15    |   74 ++++
1566  Documentation/hwmon/ucd9000  |  110 +++++
1567  Documentation/hwmon/ucd9200  |  112 +++++
1568  drivers/hwmon/Kconfig        |   59 +++
1569  drivers/hwmon/Makefile       |    5 +
1570  drivers/hwmon/adm1275.c      |  121 ++++++
1571  drivers/hwmon/max16065.c     |  717 +++++++++++++++++++++++++++++++
1572  drivers/hwmon/max34440.c     |    6 +-
1573  drivers/hwmon/max6642.c      |  356 ++++++++++++++++
1574  drivers/hwmon/max8688.c      |    4 +-
1575  drivers/hwmon/pmbus.h        |   10 +-
1576  drivers/hwmon/pmbus_core.c   |  970 +++++++++++++++++++-----------------------
1577  drivers/hwmon/sht15.c        |  747 +++++++++++++++++++++++++--------
1578  drivers/hwmon/ucd9000.c      |  278 ++++++++++++
1579  drivers/hwmon/ucd9200.c      |  210 +++++++++
1580  include/linux/sht15.h        |   18 +-
1581  19 files changed, 3264 insertions(+), 712 deletions(-)
1582  create mode 100644 Documentation/hwmon/adm1275
1583  create mode 100644 Documentation/hwmon/max16065
1584  create mode 100644 Documentation/hwmon/max6642
1585  create mode 100644 Documentation/hwmon/sht15
1586  create mode 100644 Documentation/hwmon/ucd9000
1587  create mode 100644 Documentation/hwmon/ucd9200
1588  create mode 100644 drivers/hwmon/adm1275.c
1589  create mode 100644 drivers/hwmon/max16065.c
1590  create mode 100644 drivers/hwmon/max6642.c
1591  create mode 100644 drivers/hwmon/ucd9000.c
1592  create mode 100644 drivers/hwmon/ucd9200.c
1593 Merging quilt/kernel-doc
1594 $ git merge quilt/kernel-doc
1595 Merge made by recursive.
1596  Documentation/dontdiff      |   58 ++++++++++++++++++++++++++++++++++---------
1597  Documentation/sysctl/fs.txt |    7 -----
1598  2 files changed, 46 insertions(+), 19 deletions(-)
1599 Merging v4l-dvb/master
1600 $ git merge v4l-dvb/master
1601 Removing drivers/media/dvb/frontends/drx397xD.c
1602 Removing drivers/media/dvb/frontends/drx397xD.h
1603 Removing drivers/media/dvb/frontends/drx397xD_fw.h
1604 Merge made by recursive.
1605  Documentation/DocBook/media-entities.tmpl          |    2 +
1606  Documentation/DocBook/v4l/media-ioc-setup-link.xml |    2 +-
1607  Documentation/DocBook/v4l/pixfmt-y10b.xml          |   43 +
1608  Documentation/DocBook/v4l/pixfmt-y12.xml           |   79 +
1609  Documentation/DocBook/v4l/pixfmt.xml               |    2 +
1610  Documentation/DocBook/v4l/subdev-formats.xml       |   59 +
1611  Documentation/DocBook/v4l/videodev2.h.xml          |    3 +
1612  Documentation/video4linux/CARDLIST.em28xx          |    2 +-
1613  Documentation/video4linux/gspca.txt                |    1 +
1614  Documentation/video4linux/sh_mobile_ceu_camera.txt |    6 +-
1615  drivers/media/common/saa7146_core.c                |    7 +-
1616  drivers/media/common/tuners/Kconfig                |    8 +
1617  drivers/media/common/tuners/Makefile               |    1 +
1618  drivers/media/common/tuners/tda18212.c             |  265 ++
1619  drivers/media/common/tuners/tda18212.h             |   48 +
1620  drivers/media/common/tuners/tda18212_priv.h        |   44 +
1621  drivers/media/common/tuners/tda18271-common.c      |   11 +-
1622  drivers/media/common/tuners/tda18271-fe.c          |   21 +-
1623  drivers/media/common/tuners/tda18271-maps.c        |   12 +-
1624  drivers/media/common/tuners/xc5000.c               |   32 +-
1625  drivers/media/dvb/b2c2/flexcop-pci.c               |    6 +-
1626  drivers/media/dvb/bt8xx/bt878.c                    |    2 +-
1627  drivers/media/dvb/dvb-usb/Kconfig                  |    5 +-
1628  drivers/media/dvb/dvb-usb/anysee.c                 |  519 +++-
1629  drivers/media/dvb/dvb-usb/anysee.h                 |   22 +-
1630  drivers/media/dvb/dvb-usb/dib0700_devices.c        |    6 +-
1631  drivers/media/dvb/dvb-usb/dibusb-common.c          |    2 +-
1632  drivers/media/dvb/dvb-usb/lmedm04.c                |   12 +-
1633  drivers/media/dvb/dvb-usb/m920x.c                  |   16 +-
1634  drivers/media/dvb/dvb-usb/nova-t-usb2.c            |    2 +-
1635  drivers/media/dvb/frontends/Kconfig                |   12 +-
1636  drivers/media/dvb/frontends/Makefile               |    3 +-
1637  drivers/media/dvb/frontends/drx397xD.c             | 1511 ----------
1638  drivers/media/dvb/frontends/drx397xD.h             |  130 -
1639  drivers/media/dvb/frontends/drx397xD_fw.h          |   40 -
1640  drivers/media/dvb/frontends/drxd.h                 |   61 +
1641  drivers/media/dvb/frontends/drxd_firm.c            |  929 ++++++
1642  drivers/media/dvb/frontends/drxd_firm.h            |  115 +
1643  drivers/media/dvb/frontends/drxd_hard.c            | 3000 ++++++++++++++++++++
1644  drivers/media/dvb/frontends/drxd_map_firm.h        | 1013 +++++++
1645  drivers/media/dvb/mantis/hopper_cards.c            |    2 +-
1646  drivers/media/dvb/mantis/mantis_cards.c            |    2 +-
1647  drivers/media/dvb/mantis/mantis_pci.c              |    5 +-
1648  drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c  |   60 +-
1649  drivers/media/media-entity.c                       |    8 +-
1650  drivers/media/rc/keymaps/Makefile                  |    1 +
1651  drivers/media/rc/keymaps/rc-avermedia-cardbus.c    |    2 +-
1652  drivers/media/rc/keymaps/rc-imon-mce.c             |    2 +-
1653  drivers/media/rc/keymaps/rc-imon-pad.c             |    6 +-
1654  .../media/rc/keymaps/rc-kworld-plus-tv-analog.c    |    2 +-
1655  drivers/media/rc/keymaps/rc-rc6-mce.c              |    4 +-
1656  drivers/media/rc/keymaps/rc-tivo.c                 |   98 +
1657  drivers/media/rc/mceusb.c                          |   16 +-
1658  drivers/media/rc/nuvoton-cir.c                     |   62 +-
1659  drivers/media/rc/nuvoton-cir.h                     |   17 +-
1660  drivers/media/video/Kconfig                        |    2 +-
1661  drivers/media/video/bt8xx/bttv-driver.c            |    2 +-
1662  drivers/media/video/cx18/Kconfig                   |    3 +
1663  drivers/media/video/cx18/cx18-cards.c              |   18 +-
1664  drivers/media/video/cx18/cx18-cards.h              |    2 +-
1665  drivers/media/video/cx18/cx18-driver.c             |   27 +-
1666  drivers/media/video/cx18/cx18-streams.c            |   10 +-
1667  drivers/media/video/cx18/cx18-version.h            |    2 +-
1668  drivers/media/video/cx23885/Kconfig                |    1 +
1669  drivers/media/video/cx23885/cx23885-core.c         |    2 +-
1670  drivers/media/video/cx88/cx88-mpeg.c               |    2 +-
1671  drivers/media/video/cx88/cx88-video.c              |    2 +-
1672  drivers/media/video/em28xx/Kconfig                 |    1 +
1673  drivers/media/video/em28xx/em28xx-cards.c          |   21 +-
1674  drivers/media/video/em28xx/em28xx-dvb.c            |   22 +-
1675  drivers/media/video/em28xx/em28xx.h                |    2 +-
1676  drivers/media/video/gspca/Kconfig                  |    9 +
1677  drivers/media/video/gspca/Makefile                 |    2 +
1678  drivers/media/video/gspca/jeilinj.c                |  581 +++--
1679  drivers/media/video/gspca/kinect.c                 |  427 +++
1680  drivers/media/video/gspca/zc3xx.c                  |   42 +-
1681  drivers/media/video/imx074.c                       |    2 +-
1682  drivers/media/video/ivtv/ivtv-driver.c             |    4 +-
1683  drivers/media/video/omap3isp/isp.c                 |   31 +-
1684  drivers/media/video/omap3isp/isp.h                 |   12 +-
1685  drivers/media/video/omap3isp/ispccdc.c             |   37 +-
1686  drivers/media/video/omap3isp/isppreview.c          |    2 +-
1687  drivers/media/video/omap3isp/ispqueue.c            |    6 +-
1688  drivers/media/video/omap3isp/ispresizer.c          |   75 +-
1689  drivers/media/video/omap3isp/ispstat.h             |    6 +-
1690  drivers/media/video/omap3isp/ispvideo.c            |  108 +-
1691  drivers/media/video/omap3isp/ispvideo.h            |    3 +
1692  drivers/media/video/s5p-fimc/fimc-capture.c        |    8 +-
1693  drivers/media/video/s5p-fimc/fimc-core.c           |   74 +-
1694  drivers/media/video/saa7134/saa7134-core.c         |    2 +-
1695  drivers/media/video/saa7164/saa7164-core.c         |    2 +-
1696  drivers/media/video/sh_mobile_ceu_camera.c         |   10 +-
1697  drivers/media/video/sh_mobile_csi2.c               |   11 +-
1698  drivers/media/video/soc_camera.c                   |    7 +-
1699  drivers/media/video/tveeprom.c                     |   32 +-
1700  drivers/media/video/v4l2-dev.c                     |   15 +-
1701  drivers/media/video/videobuf2-core.c               |   17 +-
1702  drivers/media/video/videobuf2-dma-contig.c         |    2 +-
1703  drivers/media/video/zoran/zoran_card.c             |    2 +-
1704  drivers/staging/easycap/easycap_ioctl.c            |    3 +-
1705  drivers/staging/lirc/lirc_sasem.c                  |   13 +-
1706  drivers/staging/tm6000/tm6000-video.c              |    4 +-
1707  include/linux/v4l2-mediabus.h                      |    7 +-
1708  include/linux/videodev2.h                          |    4 +
1709  include/media/rc-map.h                             |    1 +
1710  include/media/soc_camera_platform.h                |   50 +
1711  include/media/v4l2-device.h                        |    2 +-
1712  107 files changed, 7767 insertions(+), 2306 deletions(-)
1713  create mode 100644 Documentation/DocBook/v4l/pixfmt-y10b.xml
1714  create mode 100644 Documentation/DocBook/v4l/pixfmt-y12.xml
1715  create mode 100644 drivers/media/common/tuners/tda18212.c
1716  create mode 100644 drivers/media/common/tuners/tda18212.h
1717  create mode 100644 drivers/media/common/tuners/tda18212_priv.h
1718  delete mode 100644 drivers/media/dvb/frontends/drx397xD.c
1719  delete mode 100644 drivers/media/dvb/frontends/drx397xD.h
1720  delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h
1721  create mode 100644 drivers/media/dvb/frontends/drxd.h
1722  create mode 100644 drivers/media/dvb/frontends/drxd_firm.c
1723  create mode 100644 drivers/media/dvb/frontends/drxd_firm.h
1724  create mode 100644 drivers/media/dvb/frontends/drxd_hard.c
1725  create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h
1726  create mode 100644 drivers/media/rc/keymaps/rc-tivo.c
1727  create mode 100644 drivers/media/video/gspca/kinect.c
1728 Merging kbuild/for-next
1729 $ git merge kbuild/for-next
1730 Auto-merging Documentation/kbuild/kbuild.txt
1731 Auto-merging Makefile
1732 Auto-merging drivers/edac/cpc925_edac.c
1733 Auto-merging drivers/edac/i5000_edac.c
1734 Auto-merging drivers/edac/i5400_edac.c
1735 Auto-merging drivers/edac/i7300_edac.c
1736 Auto-merging drivers/edac/i7core_edac.c
1737 Auto-merging drivers/edac/r82600_edac.c
1738 Auto-merging drivers/media/video/cx231xx/cx231xx-avcore.c
1739 Auto-merging drivers/scsi/pmcraid.c
1740 Auto-merging drivers/scsi/pmcraid.h
1741 Auto-merging drivers/scsi/wd33c93.c
1742 Auto-merging drivers/tty/nozomi.c
1743 Auto-merging scripts/gen_initramfs_list.sh
1744 Merge made by recursive.
1745  Documentation/kbuild/kbuild.txt              |   13 ++++++
1746  Documentation/kbuild/makefiles.txt           |    5 ++
1747  Makefile                                     |   17 ++++++--
1748  drivers/edac/amd76x_edac.c                   |    2 +-
1749  drivers/edac/amd8111_edac.c                  |    2 +-
1750  drivers/edac/amd8131_edac.c                  |    2 +-
1751  drivers/edac/cpc925_edac.c                   |    2 +-
1752  drivers/edac/e752x_edac.c                    |    2 +-
1753  drivers/edac/e7xxx_edac.c                    |    2 +-
1754  drivers/edac/edac_module.c                   |    2 +-
1755  drivers/edac/i5000_edac.c                    |    2 +-
1756  drivers/edac/i5400_edac.c                    |    2 +-
1757  drivers/edac/i7300_edac.c                    |    2 +-
1758  drivers/edac/i7core_edac.c                   |    2 +-
1759  drivers/edac/i82860_edac.c                   |    2 +-
1760  drivers/edac/i82875p_edac.c                  |    2 +-
1761  drivers/edac/i82975x_edac.c                  |    2 +-
1762  drivers/edac/mpc85xx_edac.h                  |    2 +-
1763  drivers/edac/mv64x60_edac.h                  |    2 +-
1764  drivers/edac/ppc4xx_edac.c                   |    2 +-
1765  drivers/edac/r82600_edac.c                   |    2 +-
1766  drivers/media/radio/radio-maxiradio.c        |    3 +-
1767  drivers/media/video/cx231xx/cx231xx-avcore.c |    2 +-
1768  drivers/scsi/aacraid/linit.c                 |    3 +-
1769  drivers/scsi/in2000.c                        |    2 +-
1770  drivers/scsi/pmcraid.c                       |    9 ++--
1771  drivers/scsi/pmcraid.h                       |    1 -
1772  drivers/scsi/wd33c93.c                       |    7 +--
1773  drivers/staging/generic_serial/rio/rioinit.c |    2 +-
1774  drivers/tty/cyclades.c                       |    3 +-
1775  drivers/tty/nozomi.c                         |    3 +-
1776  init/Kconfig                                 |   30 ++++++---------
1777  scripts/Kbuild.include                       |    5 ++
1778  scripts/Makefile.build                       |    4 +-
1779  scripts/Makefile.lib                         |    2 +-
1780  scripts/gen_initramfs_list.sh                |   13 +++++-
1781  scripts/kconfig/confdata.c                   |    8 +---
1782  scripts/kconfig/expr.h                       |    4 --
1783  scripts/kconfig/lex.zconf.c_shipped          |   33 +++++++++-------
1784  scripts/kconfig/nconf.c                      |   14 +++---
1785  scripts/kconfig/zconf.l                      |   33 +++++++++-------
1786  scripts/mkcompile_h                          |   30 +++++++--------
1787  scripts/patch-kernel                         |    2 +-
1788  usr/gen_init_cpio.c                          |   53 +++++++++++++++++++------
1789  44 files changed, 194 insertions(+), 143 deletions(-)
1790 Merging kconfig/for-next
1791 $ git merge kconfig/for-next
1792 Already up-to-date!
1793 Merge made by recursive.
1794 Merging ide/master
1795 $ git merge ide/master
1796 Already up-to-date.
1797 Merging libata/NEXT
1798 $ git merge libata/NEXT
1799 Already up-to-date.
1800 Merging infiniband/for-next
1801 $ git merge infiniband/for-next
1802 Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c
1803 Merge made by recursive.
1804  drivers/infiniband/hw/cxgb4/cm.c        |   16 +++++++---------
1805  drivers/infiniband/hw/cxgb4/device.c    |    6 +++---
1806  drivers/infiniband/hw/cxgb4/iw_cxgb4.h  |    4 ++--
1807  drivers/infiniband/hw/cxgb4/qp.c        |    3 +--
1808  drivers/infiniband/hw/qib/qib_iba7322.c |    3 ++-
1809  5 files changed, 15 insertions(+), 17 deletions(-)
1810 Merging acpi/test
1811 $ git merge acpi/test
1812 Already up-to-date.
1813 Merging idle-test/idle-test
1814 $ git merge idle-test/idle-test
1815 Already up-to-date.
1816 Merging powertools/tools-test
1817 $ git merge powertools/tools-test
1818 Already up-to-date.
1819 Merging cpupowerutils/master
1820 $ git merge cpupowerutils/master
1821 Auto-merging MAINTAINERS
1822 Merge made by recursive.
1823  CREDITS                                            |   17 +-
1824  MAINTAINERS                                        |    6 +
1825  tools/power/cpupower/.gitignore                    |   22 +
1826  tools/power/cpupower/Makefile                      |  279 ++++++
1827  tools/power/cpupower/README                        |   49 +
1828  tools/power/cpupower/ToDo                          |   11 +
1829  tools/power/cpupower/bench/Makefile                |   29 +
1830  tools/power/cpupower/bench/README-BENCH            |  124 +++
1831  tools/power/cpupower/bench/benchmark.c             |  194 ++++
1832  tools/power/cpupower/bench/benchmark.h             |   29 +
1833  tools/power/cpupower/bench/config.h                |   36 +
1834  tools/power/cpupower/bench/cpufreq-bench_plot.sh   |  104 +++
1835  tools/power/cpupower/bench/cpufreq-bench_script.sh |  101 ++
1836  tools/power/cpupower/bench/example.cfg             |   11 +
1837  tools/power/cpupower/bench/main.c                  |  202 ++++
1838  tools/power/cpupower/bench/parse.c                 |  225 +++++
1839  tools/power/cpupower/bench/parse.h                 |   53 ++
1840  tools/power/cpupower/bench/system.c                |  191 ++++
1841  tools/power/cpupower/bench/system.h                |   29 +
1842  tools/power/cpupower/debug/i386/Makefile           |   20 +
1843  tools/power/cpupower/debug/i386/centrino-decode.c  |  113 +++
1844  tools/power/cpupower/debug/i386/dump_psb.c         |  196 ++++
1845  tools/power/cpupower/debug/i386/intel_gsic.c       |   78 ++
1846  .../power/cpupower/debug/i386/powernow-k8-decode.c |   96 ++
1847  tools/power/cpupower/debug/kernel/Makefile         |   23 +
1848  .../power/cpupower/debug/kernel/cpufreq-test_tsc.c |  113 +++
1849  tools/power/cpupower/debug/x86_64/Makefile         |   14 +
1850  .../power/cpupower/debug/x86_64/centrino-decode.c  |    1 +
1851  .../cpupower/debug/x86_64/powernow-k8-decode.c     |    1 +
1852  tools/power/cpupower/lib/cpufreq.c                 |  208 +++++
1853  tools/power/cpupower/lib/cpufreq.h                 |  223 +++++
1854  tools/power/cpupower/lib/sysfs.c                   |  672 ++++++++++++++
1855  tools/power/cpupower/lib/sysfs.h                   |   31 +
1856  tools/power/cpupower/man/cpupower-frequency-info.1 |   76 ++
1857  tools/power/cpupower/man/cpupower-frequency-set.1  |   54 ++
1858  tools/power/cpupower/man/cpupower-info.1           |   19 +
1859  tools/power/cpupower/man/cpupower-monitor.1        |  179 ++++
1860  tools/power/cpupower/man/cpupower-set.1            |  103 +++
1861  tools/power/cpupower/man/cpupower.1                |   72 ++
1862  tools/power/cpupower/po/cs.po                      |  944 +++++++++++++++++++
1863  tools/power/cpupower/po/de.po                      |  961 ++++++++++++++++++++
1864  tools/power/cpupower/po/fr.po                      |  947 +++++++++++++++++++
1865  tools/power/cpupower/po/it.po                      |  961 ++++++++++++++++++++
1866  tools/power/cpupower/po/pt.po                      |  957 +++++++++++++++++++
1867  tools/power/cpupower/utils/builtin.h               |   18 +
1868  tools/power/cpupower/utils/cpufreq-info.c          |  678 ++++++++++++++
1869  tools/power/cpupower/utils/cpufreq-set.c           |  358 ++++++++
1870  tools/power/cpupower/utils/cpuidle-info.c          |  244 +++++
1871  tools/power/cpupower/utils/cpupower-info.c         |  153 ++++
1872  tools/power/cpupower/utils/cpupower-set.c          |  153 ++++
1873  tools/power/cpupower/utils/cpupower.c              |  203 ++++
1874  tools/power/cpupower/utils/helpers/amd.c           |  137 +++
1875  tools/power/cpupower/utils/helpers/bitmask.c       |  292 ++++++
1876  tools/power/cpupower/utils/helpers/bitmask.h       |   33 +
1877  tools/power/cpupower/utils/helpers/cpuid.c         |  143 +++
1878  tools/power/cpupower/utils/helpers/helpers.h       |  180 ++++
1879  tools/power/cpupower/utils/helpers/misc.c          |   35 +
1880  tools/power/cpupower/utils/helpers/msr.c           |  122 +++
1881  tools/power/cpupower/utils/helpers/pci.c           |   44 +
1882  tools/power/cpupower/utils/helpers/sysfs.c         |  358 ++++++++
1883  tools/power/cpupower/utils/helpers/sysfs.h         |   28 +
1884  tools/power/cpupower/utils/helpers/topology.c      |  108 +++
1885  .../cpupower/utils/idle_monitor/amd_fam14h_idle.c  |  338 +++++++
1886  .../cpupower/utils/idle_monitor/cpuidle_sysfs.c    |  196 ++++
1887  .../cpupower/utils/idle_monitor/cpupower-monitor.c |  448 +++++++++
1888  .../cpupower/utils/idle_monitor/cpupower-monitor.h |   68 ++
1889  .../cpupower/utils/idle_monitor/idle_monitors.def  |    7 +
1890  .../cpupower/utils/idle_monitor/idle_monitors.h    |   18 +
1891  .../cpupower/utils/idle_monitor/mperf_monitor.c    |  255 ++++++
1892  tools/power/cpupower/utils/idle_monitor/nhm_idle.c |  216 +++++
1893  tools/power/cpupower/utils/idle_monitor/snb_idle.c |  190 ++++
1894  tools/power/cpupower/utils/version-gen.sh          |   35 +
1895  72 files changed, 13831 insertions(+), 1 deletions(-)
1896  create mode 100644 tools/power/cpupower/.gitignore
1897  create mode 100644 tools/power/cpupower/Makefile
1898  create mode 100644 tools/power/cpupower/README
1899  create mode 100644 tools/power/cpupower/ToDo
1900  create mode 100644 tools/power/cpupower/bench/Makefile
1901  create mode 100644 tools/power/cpupower/bench/README-BENCH
1902  create mode 100644 tools/power/cpupower/bench/benchmark.c
1903  create mode 100644 tools/power/cpupower/bench/benchmark.h
1904  create mode 100644 tools/power/cpupower/bench/config.h
1905  create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh
1906  create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh
1907  create mode 100644 tools/power/cpupower/bench/example.cfg
1908  create mode 100644 tools/power/cpupower/bench/main.c
1909  create mode 100644 tools/power/cpupower/bench/parse.c
1910  create mode 100644 tools/power/cpupower/bench/parse.h
1911  create mode 100644 tools/power/cpupower/bench/system.c
1912  create mode 100644 tools/power/cpupower/bench/system.h
1913  create mode 100644 tools/power/cpupower/debug/i386/Makefile
1914  create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c
1915  create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c
1916  create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c
1917  create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c
1918  create mode 100644 tools/power/cpupower/debug/kernel/Makefile
1919  create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c
1920  create mode 100644 tools/power/cpupower/debug/x86_64/Makefile
1921  create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c
1922  create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c
1923  create mode 100644 tools/power/cpupower/lib/cpufreq.c
1924  create mode 100644 tools/power/cpupower/lib/cpufreq.h
1925  create mode 100644 tools/power/cpupower/lib/sysfs.c
1926  create mode 100644 tools/power/cpupower/lib/sysfs.h
1927  create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1
1928  create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1
1929  create mode 100644 tools/power/cpupower/man/cpupower-info.1
1930  create mode 100644 tools/power/cpupower/man/cpupower-monitor.1
1931  create mode 100644 tools/power/cpupower/man/cpupower-set.1
1932  create mode 100644 tools/power/cpupower/man/cpupower.1
1933  create mode 100644 tools/power/cpupower/po/cs.po
1934  create mode 100644 tools/power/cpupower/po/de.po
1935  create mode 100644 tools/power/cpupower/po/fr.po
1936  create mode 100644 tools/power/cpupower/po/it.po
1937  create mode 100644 tools/power/cpupower/po/pt.po
1938  create mode 100644 tools/power/cpupower/utils/builtin.h
1939  create mode 100644 tools/power/cpupower/utils/cpufreq-info.c
1940  create mode 100644 tools/power/cpupower/utils/cpufreq-set.c
1941  create mode 100644 tools/power/cpupower/utils/cpuidle-info.c
1942  create mode 100644 tools/power/cpupower/utils/cpupower-info.c
1943  create mode 100644 tools/power/cpupower/utils/cpupower-set.c
1944  create mode 100644 tools/power/cpupower/utils/cpupower.c
1945  create mode 100644 tools/power/cpupower/utils/helpers/amd.c
1946  create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c
1947  create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h
1948  create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c
1949  create mode 100644 tools/power/cpupower/utils/helpers/helpers.h
1950  create mode 100644 tools/power/cpupower/utils/helpers/misc.c
1951  create mode 100644 tools/power/cpupower/utils/helpers/msr.c
1952  create mode 100644 tools/power/cpupower/utils/helpers/pci.c
1953  create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c
1954  create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h
1955  create mode 100644 tools/power/cpupower/utils/helpers/topology.c
1956  create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c
1957  create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c
1958  create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c
1959  create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h
1960  create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def
1961  create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h
1962  create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c
1963  create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c
1964  create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c
1965  create mode 100755 tools/power/cpupower/utils/version-gen.sh
1966 Merging ieee1394/for-next
1967 $ git merge ieee1394/for-next
1968 Merge made by recursive.
1969  drivers/firewire/ohci.c |   45 +++++++++++++++++++++++++++------------------
1970  1 files changed, 27 insertions(+), 18 deletions(-)
1971 Merging ubi/linux-next
1972 $ git merge ubi/linux-next
1973 Merge made by recursive.
1974  drivers/mtd/ubi/cdev.c      |   14 +++++++-------
1975  drivers/mtd/ubi/debug.c     |   18 +++++++++---------
1976  drivers/mtd/ubi/io.c        |    6 +++---
1977  drivers/mtd/ubi/scan.c      |    2 +-
1978  drivers/mtd/ubi/ubi-media.h |    6 +++---
1979  drivers/mtd/ubi/ubi.h       |    4 ++--
1980  drivers/mtd/ubi/wl.c        |    3 ++-
1981  include/linux/mtd/ubi.h     |    4 ++--
1982  include/mtd/ubi-user.h      |   40 +++++++++++++++++++++-------------------
1983  9 files changed, 50 insertions(+), 47 deletions(-)
1984 Merging kvm/linux-next
1985 $ git merge kvm/linux-next
1986 Auto-merging arch/x86/include/asm/msr-index.h
1987 Merge made by recursive.
1988  Documentation/kvm/api.txt           |   23 +
1989  arch/powerpc/include/asm/kvm_host.h |    1 +
1990  arch/powerpc/kvm/powerpc.c          |    4 +
1991  arch/powerpc/kvm/timing.c           |   10 +-
1992  arch/x86/include/asm/kvm_emulate.h  |  198 ++++-
1993  arch/x86/include/asm/kvm_host.h     |   53 +-
1994  arch/x86/include/asm/msr-index.h    |    1 +
1995  arch/x86/kvm/emulate.c              | 1614 ++++++++++++++++++++++++-----------
1996  arch/x86/kvm/i8254.h                |    2 -
1997  arch/x86/kvm/irq.h                  |    2 -
1998  arch/x86/kvm/mmu.c                  |   16 +-
1999  arch/x86/kvm/paging_tmpl.h          |   57 +-
2000  arch/x86/kvm/svm.c                  |  409 ++++++++--
2001  arch/x86/kvm/vmx.c                  |  124 +++-
2002  arch/x86/kvm/x86.c                  |  514 ++++++++----
2003  arch/x86/kvm/x86.h                  |    2 +-
2004  include/linux/kvm.h                 |    5 +
2005  include/linux/kvm_host.h            |   21 +-
2006  virt/kvm/ioapic.c                   |    2 +-
2007  virt/kvm/kvm_main.c                 |   17 -
2008  20 files changed, 2207 insertions(+), 868 deletions(-)
2009 Merging dlm/next
2010 $ git merge dlm/next
2011 Merge made by recursive.
2012  fs/dlm/user.c |    1 -
2013  1 files changed, 0 insertions(+), 1 deletions(-)
2014 Merging swiotlb/master
2015 $ git merge swiotlb/master
2016 Already up-to-date.
2017 Merging ibft/master
2018 $ git merge ibft/master
2019 Merge made by recursive.
2020  drivers/firmware/iscsi_ibft_find.c |   51 ++++++++++++++++++++++-------------
2021  1 files changed, 32 insertions(+), 19 deletions(-)
2022 Merging scsi/master
2023 $ git merge scsi/master
2024 Auto-merging MAINTAINERS
2025 Merge made by recursive.
2026  MAINTAINERS                      |    4 ++--
2027  drivers/scsi/be2iscsi/be.h       |   10 +++++-----
2028  drivers/scsi/be2iscsi/be_cmds.c  |   11 ++++++-----
2029  drivers/scsi/be2iscsi/be_cmds.h  |   10 +++++-----
2030  drivers/scsi/be2iscsi/be_iscsi.c |   13 ++++++-------
2031  drivers/scsi/be2iscsi/be_iscsi.h |   13 ++++++-------
2032  drivers/scsi/be2iscsi/be_main.c  |   33 ++++++++++++++++++++-------------
2033  drivers/scsi/be2iscsi/be_main.h  |   13 ++++++-------
2034  drivers/scsi/be2iscsi/be_mgmt.c  |   13 ++++++-------
2035  drivers/scsi/be2iscsi/be_mgmt.h  |   13 ++++++-------
2036  drivers/scsi/constants.c         |    1 +
2037  drivers/scsi/scsi_error.c        |    6 ++++++
2038  12 files changed, 75 insertions(+), 65 deletions(-)
2039 Merging async_tx/next
2040 $ git merge async_tx/next
2041 Already up-to-date.
2042 Merging net/master
2043 $ git merge net/master
2044 Auto-merging Documentation/feature-removal-schedule.txt
2045 Auto-merging MAINTAINERS
2046 Removing drivers/isdn/capi/capifs.c
2047 Removing drivers/isdn/capi/capifs.h
2048 Auto-merging drivers/net/atl1c/atl1c_main.c
2049 Auto-merging drivers/net/benet/be_main.c
2050 Auto-merging drivers/net/bnx2x/bnx2x_cmn.c
2051 Auto-merging drivers/net/bonding/bond_3ad.c
2052 Auto-merging drivers/net/cris/eth_v10.c
2053 Auto-merging drivers/net/ehea/ehea_main.c
2054 Auto-merging drivers/net/r8169.c
2055 Removing drivers/net/wireless/ath/ar9170/Kconfig
2056 Removing drivers/net/wireless/ath/ar9170/Makefile
2057 Removing drivers/net/wireless/ath/ar9170/ar9170.h
2058 Removing drivers/net/wireless/ath/ar9170/cmd.c
2059 Removing drivers/net/wireless/ath/ar9170/cmd.h
2060 Removing drivers/net/wireless/ath/ar9170/eeprom.h
2061 Removing drivers/net/wireless/ath/ar9170/hw.h
2062 Removing drivers/net/wireless/ath/ar9170/led.c
2063 Removing drivers/net/wireless/ath/ar9170/mac.c
2064 Removing drivers/net/wireless/ath/ar9170/main.c
2065 Removing drivers/net/wireless/ath/ar9170/phy.c
2066 Removing drivers/net/wireless/ath/ar9170/usb.c
2067 Removing drivers/net/wireless/ath/ar9170/usb.h
2068 Auto-merging drivers/net/wireless/ath/ath9k/recv.c
2069 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
2070 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c
2071 Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex
2072 Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex
2073 Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex
2074 Auto-merging net/9p/client.c
2075 Auto-merging net/bluetooth/hci_core.c
2076 Auto-merging net/bluetooth/hci_event.c
2077 Auto-merging net/bluetooth/hidp/hidp.h
2078 Auto-merging net/bluetooth/l2cap_core.c
2079 Auto-merging net/bridge/br_input.c
2080 Auto-merging net/ipv4/route.c
2081 Auto-merging net/ipv6/route.c
2082 Auto-merging net/ipv6/udp.c
2083 Auto-merging net/mac80211/cfg.c
2084 Merge made by recursive.
2085  Documentation/feature-removal-schedule.txt        |   21 -
2086  Documentation/networking/igb.txt                  |   13 +
2087  MAINTAINERS                                       |   13 +-
2088  drivers/atm/eni.c                                 |    5 -
2089  drivers/atm/he.c                                  |    4 +-
2090  drivers/atm/idt77252.c                            |   52 +-
2091  drivers/atm/iphase.c                              |   14 +-
2092  drivers/atm/solos-pci.c                           |    3 +-
2093  drivers/infiniband/hw/nes/nes_hw.c                |    5 +-
2094  drivers/infiniband/hw/nes/nes_hw.h                |    1 -
2095  drivers/infiniband/hw/nes/nes_nic.c               |   55 +-
2096  drivers/infiniband/ulp/ipoib/ipoib.h              |    1 -
2097  drivers/infiniband/ulp/ipoib/ipoib_cm.c           |   11 +-
2098  drivers/infiniband/ulp/ipoib/ipoib_ethtool.c      |   28 -
2099  drivers/infiniband/ulp/ipoib/ipoib_ib.c           |    2 +-
2100  drivers/infiniband/ulp/ipoib/ipoib_main.c         |   24 +-
2101  drivers/isdn/capi/Kconfig                         |   15 -
2102  drivers/isdn/capi/Makefile                        |    1 -
2103  drivers/isdn/capi/capi.c                          |   24 +-
2104  drivers/isdn/capi/capifs.c                        |  239 -
2105  drivers/isdn/capi/capifs.h                        |   28 -
2106  drivers/isdn/gigaset/bas-gigaset.c                |    5 -
2107  drivers/isdn/gigaset/ev-layer.c                   |   26 +-
2108  drivers/isdn/hardware/eicon/debug.c               |    3 +-
2109  drivers/isdn/hardware/eicon/message.c             |   23 +-
2110  drivers/isdn/hardware/mISDN/hfcpci.c              |    6 +-
2111  drivers/isdn/hardware/mISDN/hfcsusb.c             |    5 +-
2112  drivers/isdn/hisax/arcofi.c                       |    4 +-
2113  drivers/isdn/hisax/elsa_cs.c                      |    2 -
2114  drivers/isdn/hisax/elsa_ser.c                     |    3 +-
2115  drivers/isdn/hisax/hfc_usb.c                      |    6 +-
2116  drivers/isdn/hisax/ipacx.c                        |    4 +-
2117  drivers/isdn/hisax/jade.c                         |    3 +-
2118  drivers/isdn/hisax/l3dss1.c                       |    4 +-
2119  drivers/isdn/hisax/l3ni1.c                        |    4 +-
2120  drivers/isdn/hisax/teles_cs.c                     |    2 -
2121  drivers/isdn/hysdn/hysdn_proclog.c                |   11 +-
2122  drivers/isdn/i4l/isdn_common.c                    |   11 +-
2123  drivers/isdn/i4l/isdn_net.c                       |    2 -
2124  drivers/isdn/i4l/isdn_tty.c                       |    2 -
2125  drivers/isdn/mISDN/layer2.c                       |   20 +-
2126  drivers/isdn/mISDN/socket.c                       |    3 +
2127  drivers/net/3c509.c                               |   14 +-
2128  drivers/net/3c59x.c                               |    4 +-
2129  drivers/net/8139cp.c                              |   46 +-
2130  drivers/net/atl1c/atl1c_ethtool.c                 |    8 -
2131  drivers/net/atl1c/atl1c_main.c                    |   25 +-
2132  drivers/net/atl1e/atl1e_ethtool.c                 |    3 -
2133  drivers/net/atl1e/atl1e_main.c                    |   14 +-
2134  drivers/net/atlx/atl1.c                           |   20 +-
2135  drivers/net/atlx/atl2.c                           |   14 +-
2136  drivers/net/bcm63xx_enet.c                        |    4 +-
2137  drivers/net/benet/be.h                            |   31 +-
2138  drivers/net/benet/be_cmds.c                       |  113 +-
2139  drivers/net/benet/be_cmds.h                       |   23 +-
2140  drivers/net/benet/be_ethtool.c                    |  109 +-
2141  drivers/net/benet/be_hw.h                         |    4 +
2142  drivers/net/benet/be_main.c                       |  202 +-
2143  drivers/net/bna/bfa_ioc.c                         |   13 +-
2144  drivers/net/bna/bna_ctrl.c                        |   21 -
2145  drivers/net/bna/bna_txrx.c                        |    7 +-
2146  drivers/net/bna/bnad.c                            |   22 +-
2147  drivers/net/bna/bnad.h                            |    2 -
2148  drivers/net/bna/bnad_ethtool.c                    |   63 -
2149  drivers/net/bnx2.c                                |  165 +-
2150  drivers/net/bnx2.h                                |    3 +-
2151  drivers/net/bnx2x/bnx2x.h                         |    1 -
2152  drivers/net/bnx2x/bnx2x_cmn.c                     |   49 +-
2153  drivers/net/bnx2x/bnx2x_cmn.h                     |   16 +-
2154  drivers/net/bnx2x/bnx2x_dcb.c                     |   22 +
2155  drivers/net/bnx2x/bnx2x_dcb.h                     |    8 +-
2156  drivers/net/bnx2x/bnx2x_ethtool.c                 |  162 +-
2157  drivers/net/bnx2x/bnx2x_hsi.h                     |    2 +-
2158  drivers/net/bnx2x/bnx2x_main.c                    |   41 +-
2159  drivers/net/bonding/Makefile                      |    3 -
2160  drivers/net/bonding/bond_3ad.c                    |    4 +-
2161  drivers/net/bonding/bond_main.c                   |  116 +-
2162  drivers/net/bonding/bond_procfs.c                 |    2 -
2163  drivers/net/bonding/bond_sysfs.c                  |   80 -
2164  drivers/net/bonding/bonding.h                     |   36 +-
2165  drivers/net/chelsio/common.h                      |    5 -
2166  drivers/net/chelsio/cxgb2.c                       |   48 +-
2167  drivers/net/chelsio/sge.c                         |   13 +-
2168  drivers/net/chelsio/tp.c                          |    5 -
2169  drivers/net/chelsio/tp.h                          |    1 -
2170  drivers/net/cnic.c                                |   62 +-
2171  drivers/net/cnic.h                                |    1 +
2172  drivers/net/cnic_if.h                             |    6 +-
2173  drivers/net/cris/eth_v10.c                        |    4 +-
2174  drivers/net/cxgb3/adapter.h                       |    7 -
2175  drivers/net/cxgb3/common.h                        |    1 -
2176  drivers/net/cxgb3/cxgb3_main.c                    |  103 +-
2177  drivers/net/cxgb3/sge.c                           |    7 +-
2178  drivers/net/cxgb4/cxgb4.h                         |    6 -
2179  drivers/net/cxgb4/cxgb4_main.c                    |   89 +-
2180  drivers/net/cxgb4/sge.c                           |    4 +-
2181  drivers/net/cxgb4vf/adapter.h                     |    6 -
2182  drivers/net/cxgb4vf/cxgb4vf_main.c                |   70 +-
2183  drivers/net/cxgb4vf/sge.c                         |    4 +-
2184  drivers/net/depca.c                               |   35 +-
2185  drivers/net/dm9000.c                              |   57 +-
2186  drivers/net/e1000e/82571.c                        |   20 +-
2187  drivers/net/e1000e/e1000.h                        |    6 +-
2188  drivers/net/e1000e/es2lan.c                       |    4 +-
2189  drivers/net/e1000e/ethtool.c                      |   46 +-
2190  drivers/net/e1000e/ich8lan.c                      |   12 +-
2191  drivers/net/e1000e/lib.c                          |   10 +-
2192  drivers/net/e1000e/netdev.c                       |  211 +-
2193  drivers/net/e1000e/phy.c                          |    4 +-
2194  drivers/net/ehea/ehea_ethtool.c                   |   23 -
2195  drivers/net/ehea/ehea_main.c                      |    4 +-
2196  drivers/net/enic/Makefile                         |    2 +-
2197  drivers/net/enic/enic.h                           |    5 +-
2198  drivers/net/enic/enic_dev.c                       |   62 +-
2199  drivers/net/enic/enic_dev.h                       |    7 +-
2200  drivers/net/enic/enic_main.c                      |  270 +-
2201  drivers/net/enic/enic_pp.c                        |  264 +
2202  drivers/net/enic/enic_pp.h                        |   27 +
2203  drivers/net/enic/enic_res.c                       |    4 +-
2204  drivers/net/enic/vnic_dev.c                       |   97 +-
2205  drivers/net/enic/vnic_dev.h                       |    6 +-
2206  drivers/net/enic/vnic_devcmd.h                    |   57 +-
2207  drivers/net/enic/vnic_vic.c                       |    5 +-
2208  drivers/net/enic/vnic_vic.h                       |   13 +-
2209  drivers/net/ewrk3.c                               |   56 +-
2210  drivers/net/forcedeth.c                           |   88 +-
2211  drivers/net/fs_enet/fs_enet-main.c                |    2 -
2212  drivers/net/gianfar.c                             |   16 +-
2213  drivers/net/gianfar.h                             |   20 +-
2214  drivers/net/gianfar_ethtool.c                     |  110 +-
2215  drivers/net/greth.c                               |   46 +-
2216  drivers/net/greth.h                               |    4 -
2217  drivers/net/hp100.c                               |   12 +-
2218  drivers/net/ibm_newemac/core.c                    |   17 +-
2219  drivers/net/ibmlana.c                             |    7 +-
2220  drivers/net/ibmveth.c                             |   96 +-
2221  drivers/net/igb/e1000_82575.c                     |    3 +-
2222  drivers/net/igb/igb_main.c                        |   67 +-
2223  drivers/net/ioc3-eth.c                            |   30 +-
2224  drivers/net/irda/smsc-ircc2.c                     |   44 +-
2225  drivers/net/ixgbe/ixgbe_82598.c                   |   60 +-
2226  drivers/net/ixgbe/ixgbe_82599.c                   |  104 +-
2227  drivers/net/ixgbe/ixgbe_common.c                  |  112 +-
2228  drivers/net/ixgbe/ixgbe_common.h                  |    4 +-
2229  drivers/net/ixgbe/ixgbe_dcb_82599.c               |   77 +-
2230  drivers/net/ixgbe/ixgbe_dcb_82599.h               |    2 +
2231  drivers/net/ixgbe/ixgbe_dcb_nl.c                  |  109 +-
2232  drivers/net/ixgbe/ixgbe_ethtool.c                 |   14 +-
2233  drivers/net/ixgbe/ixgbe_main.c                    |   22 +-
2234  drivers/net/ixgbe/ixgbe_phy.c                     |    7 +-
2235  drivers/net/ixgbe/ixgbe_type.h                    |   12 +
2236  drivers/net/ixgbe/ixgbe_x540.c                    |  192 +-
2237  drivers/net/jme.c                                 |   77 +-
2238  drivers/net/jme.h                                 |    2 -
2239  drivers/net/ksz884x.c                             |   73 +-
2240  drivers/net/macb.c                                |   11 +-
2241  drivers/net/macvlan.c                             |   16 +-
2242  drivers/net/mlx4/en_ethtool.c                     |   42 -
2243  drivers/net/mlx4/en_netdev.c                      |   26 +-
2244  drivers/net/mlx4/en_rx.c                          |    2 +-
2245  drivers/net/mlx4/mlx4_en.h                        |    1 -
2246  drivers/net/mv643xx_eth.c                         |   28 +-
2247  drivers/net/myri10ge/myri10ge.c                   |   66 +-
2248  drivers/net/ne3210.c                              |   15 +-
2249  drivers/net/netxen/netxen_nic.h                   |    2 +-
2250  drivers/net/netxen/netxen_nic_ethtool.c           |  102 -
2251  drivers/net/netxen/netxen_nic_init.c              |    3 +-
2252  drivers/net/netxen/netxen_nic_main.c              |   55 +-
2253  drivers/net/niu.c                                 |   59 +-
2254  drivers/net/niu.h                                 |    1 +
2255  drivers/net/pch_gbe/pch_gbe.h                     |    4 -
2256  drivers/net/pch_gbe/pch_gbe_ethtool.c             |   54 -
2257  drivers/net/pch_gbe/pch_gbe_main.c                |   42 +-
2258  drivers/net/pch_gbe/pch_gbe_param.c               |   16 +-
2259  drivers/net/pcnet32.c                             |   74 +-
2260  drivers/net/ps3_gelic_net.c                       |   26 +-
2261  drivers/net/ps3_gelic_net.h                       |    3 -
2262  drivers/net/ps3_gelic_wireless.c                  |    4 -
2263  drivers/net/qla3xxx.c                             |    2 +-
2264  drivers/net/qlcnic/qlcnic.h                       |  227 +-
2265  drivers/net/qlcnic/qlcnic_ctx.c                   |  135 +-
2266  drivers/net/qlcnic/qlcnic_ethtool.c               |  237 +-
2267  drivers/net/qlcnic/qlcnic_hw.c                    |  119 +-
2268  drivers/net/qlcnic/qlcnic_init.c                  |   62 +-
2269  drivers/net/qlcnic/qlcnic_main.c                  |  479 +-
2270  drivers/net/qlge/qlge.h                           |    2 +-
2271  drivers/net/qlge/qlge_ethtool.c                   |   72 +-
2272  drivers/net/qlge/qlge_main.c                      |   25 +-
2273  drivers/net/r8169.c                               |  597 +-
2274  drivers/net/s2io.c                                |  191 +-
2275  drivers/net/s2io.h                                |   13 +-
2276  drivers/net/sfc/efx.c                             |   26 +-
2277  drivers/net/sfc/ethtool.c                         |  106 +-
2278  drivers/net/sfc/falcon.c                          |    4 +-
2279  drivers/net/sfc/falcon_xmac.c                     |    2 +-
2280  drivers/net/sfc/mac.h                             |    4 +-
2281  drivers/net/sfc/mcdi_mac.c                        |    2 +-
2282  drivers/net/sfc/mcdi_phy.c                        |    2 +-
2283  drivers/net/sfc/net_driver.h                      |    8 +-
2284  drivers/net/sfc/nic.c                             |    6 +-
2285  drivers/net/sfc/nic.h                             |    6 +-
2286  drivers/net/sfc/phy.h                             |    8 +-
2287  drivers/net/sfc/qt202x_phy.c                      |    2 +-
2288  drivers/net/sfc/rx.c                              |    3 +
2289  drivers/net/sfc/siena.c                           |    2 +-
2290  drivers/net/sfc/tenxpress.c                       |    2 +-
2291  drivers/net/sfc/txc43128_phy.c                    |    2 +-
2292  drivers/net/skge.c                                |   86 +-
2293  drivers/net/skge.h                                |    1 -
2294  drivers/net/sky2.c                                |  186 +-
2295  drivers/net/sky2.h                                |    1 -
2296  drivers/net/smc-mca.c                             |    6 +-
2297  drivers/net/smsc911x.c                            |  448 +-
2298  drivers/net/smsc911x.h                            |   22 +-
2299  drivers/net/spider_net.c                          |   15 +-
2300  drivers/net/spider_net.h                          |    7 -
2301  drivers/net/spider_net_ethtool.c                  |   21 -
2302  drivers/net/stmmac/dwmac1000_core.c               |    5 +-
2303  drivers/net/stmmac/stmmac_ethtool.c               |   18 +-
2304  drivers/net/stmmac/stmmac_main.c                  |   83 +-
2305  drivers/net/sungem.c                              |    3 +-
2306  drivers/net/sunhme.c                              |    6 +-
2307  drivers/net/tehuti.c                              |   26 +-
2308  drivers/net/tg3.c                                 | 1351 ++-
2309  drivers/net/tg3.h                                 |  106 +-
2310  drivers/net/tokenring/madgemc.c                   |    2 +-
2311  drivers/net/tulip/de4x5.c                         |    4 +-
2312  drivers/net/tun.c                                 |   63 +-
2313  drivers/net/typhoon.c                             |   39 +-
2314  drivers/net/ucc_geth_ethtool.c                    |    1 -
2315  drivers/net/usb/Kconfig                           |    2 +-
2316  drivers/net/usb/plusb.c                           |   32 +-
2317  drivers/net/usb/rndis_host.c                      |   39 +-
2318  drivers/net/usb/smsc75xx.c                        |  124 +-
2319  drivers/net/usb/smsc95xx.c                        |   83 +-
2320  drivers/net/usb/usbnet.c                          |    6 +-
2321  drivers/net/veth.c                                |   45 +-
2322  drivers/net/via-rhine.c                           |  242 +-
2323  drivers/net/via-velocity.c                        |    7 +-
2324  drivers/net/virtio_net.c                          |   46 +-
2325  drivers/net/vmxnet3/vmxnet3_drv.c                 |   40 +-
2326  drivers/net/vmxnet3/vmxnet3_ethtool.c             |   67 +-
2327  drivers/net/vmxnet3/vmxnet3_int.h                 |    7 +-
2328  drivers/net/vxge/vxge-config.c                    |   48 +-
2329  drivers/net/vxge/vxge-config.h                    |   70 +-
2330  drivers/net/vxge/vxge-ethtool.c                   |   97 +-
2331  drivers/net/vxge/vxge-main.c                      |  143 +-
2332  drivers/net/vxge/vxge-main.h                      |   14 +-
2333  drivers/net/vxge/vxge-traffic.h                   |    2 +-
2334  drivers/net/vxge/vxge-version.h                   |    4 +-
2335  drivers/net/wireless/Kconfig                      |    1 +
2336  drivers/net/wireless/Makefile                     |    2 +
2337  drivers/net/wireless/ath/Kconfig                  |    1 -
2338  drivers/net/wireless/ath/Makefile                 |    1 -
2339  drivers/net/wireless/ath/ar9170/Kconfig           |   20 -
2340  drivers/net/wireless/ath/ar9170/Makefile          |    3 -
2341  drivers/net/wireless/ath/ar9170/ar9170.h          |  258 -
2342  drivers/net/wireless/ath/ar9170/cmd.c             |  127 -
2343  drivers/net/wireless/ath/ar9170/cmd.h             |   92 -
2344  drivers/net/wireless/ath/ar9170/eeprom.h          |  179 -
2345  drivers/net/wireless/ath/ar9170/hw.h              |  430 -
2346  drivers/net/wireless/ath/ar9170/led.c             |  181 -
2347  drivers/net/wireless/ath/ar9170/mac.c             |  519 -
2348  drivers/net/wireless/ath/ar9170/main.c            | 2190 ---
2349  drivers/net/wireless/ath/ar9170/phy.c             | 1719 ---
2350  drivers/net/wireless/ath/ar9170/usb.c             | 1008 --
2351  drivers/net/wireless/ath/ar9170/usb.h             |   82 -
2352  drivers/net/wireless/ath/ath.h                    |    1 +
2353  drivers/net/wireless/ath/ath9k/ar5008_phy.c       |   45 +-
2354  drivers/net/wireless/ath/ath9k/ar9002_calib.c     |   43 +-
2355  drivers/net/wireless/ath/ath9k/ar9002_mac.c       |   12 -
2356  drivers/net/wireless/ath/ath9k/ar9003_hw.c        |   98 +-
2357  drivers/net/wireless/ath/ath9k/ar9003_mac.c       |   12 -
2358  drivers/net/wireless/ath/ath9k/ar9485_initvals.h  |  925 --
2359  drivers/net/wireless/ath/ath9k/ath9k.h            |   14 +-
2360  drivers/net/wireless/ath/ath9k/beacon.c           |  207 +-
2361  drivers/net/wireless/ath/ath9k/common.c           |    2 +-
2362  drivers/net/wireless/ath/ath9k/debug.c            |   94 +-
2363  drivers/net/wireless/ath/ath9k/eeprom_9287.c      |    6 +
2364  drivers/net/wireless/ath/ath9k/eeprom_def.c       |    7 +
2365  drivers/net/wireless/ath/ath9k/gpio.c             |   14 +-
2366  drivers/net/wireless/ath/ath9k/htc.h              |    2 +-
2367  drivers/net/wireless/ath/ath9k/htc_drv_beacon.c   |    9 +-
2368  drivers/net/wireless/ath/ath9k/htc_drv_init.c     |   33 +-
2369  drivers/net/wireless/ath/ath9k/hw-ops.h           |    6 -
2370  drivers/net/wireless/ath/ath9k/hw.c               |  206 +-
2371  drivers/net/wireless/ath/ath9k/hw.h               |   66 +-
2372  drivers/net/wireless/ath/ath9k/init.c             |   53 +-
2373  drivers/net/wireless/ath/ath9k/mac.c              |  113 +-
2374  drivers/net/wireless/ath/ath9k/main.c             |  175 +-
2375  drivers/net/wireless/ath/ath9k/phy.h              |   14 -
2376  drivers/net/wireless/ath/ath9k/recv.c             |    2 +-
2377  drivers/net/wireless/ath/ath9k/reg.h              |    1 +
2378  drivers/net/wireless/ath/ath9k/xmit.c             |   29 +-
2379  drivers/net/wireless/ath/key.c                    |   32 +
2380  drivers/net/wireless/iwlwifi/Makefile             |    2 +-
2381  drivers/net/wireless/iwlwifi/iwl-1000.c           |   16 +-
2382  drivers/net/wireless/iwlwifi/iwl-2000.c           |   48 +-
2383  drivers/net/wireless/iwlwifi/iwl-5000-hw.h        |    4 +-
2384  drivers/net/wireless/iwlwifi/iwl-5000.c           |   29 +-
2385  drivers/net/wireless/iwlwifi/iwl-6000-hw.h        |    4 +-
2386  drivers/net/wireless/iwlwifi/iwl-6000.c           |   46 +-
2387  drivers/net/wireless/iwlwifi/iwl-agn-calib.c      |    4 +-
2388  drivers/net/wireless/iwlwifi/iwl-agn-calib.h      |    4 +-
2389  drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c    |   52 +-
2390  drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h    |    2 +-
2391  drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c     |    6 +-
2392  drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c       |    2 +-
2393  drivers/net/wireless/iwlwifi/iwl-agn-hw.h         |    4 +-
2394  drivers/net/wireless/iwlwifi/iwl-agn-ict.c        |    4 +-
2395  drivers/net/wireless/iwlwifi/iwl-agn-led.c        |    2 +-
2396  drivers/net/wireless/iwlwifi/iwl-agn-led.h        |    2 +-
2397  drivers/net/wireless/iwlwifi/iwl-agn-lib.c        |    6 +-
2398  drivers/net/wireless/iwlwifi/iwl-agn-rs.c         |   29 +-
2399  drivers/net/wireless/iwlwifi/iwl-agn-rs.h         |   30 +-
2400  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c       |    2 +-
2401  drivers/net/wireless/iwlwifi/iwl-agn-sta.c        |    4 +-
2402  drivers/net/wireless/iwlwifi/iwl-agn-tt.c         |    2 +-
2403  drivers/net/wireless/iwlwifi/iwl-agn-tt.h         |    2 +-
2404  drivers/net/wireless/iwlwifi/iwl-agn-tx.c         |  142 +-
2405  drivers/net/wireless/iwlwifi/iwl-agn-ucode.c      |  122 +-
2406  drivers/net/wireless/iwlwifi/iwl-agn.c            |  529 +-
2407  drivers/net/wireless/iwlwifi/iwl-agn.h            |   45 +-
2408  drivers/net/wireless/iwlwifi/iwl-commands.h       |  647 +-
2409  drivers/net/wireless/iwlwifi/iwl-core.c           |  114 +-
2410  drivers/net/wireless/iwlwifi/iwl-core.h           |   40 +-
2411  drivers/net/wireless/iwlwifi/iwl-csr.h            |   43 +-
2412  drivers/net/wireless/iwlwifi/iwl-debug.h          |    4 +-
2413  drivers/net/wireless/iwlwifi/iwl-debugfs.c        |    9 +-
2414  drivers/net/wireless/iwlwifi/iwl-dev.h            |  274 +-
2415  drivers/net/wireless/iwlwifi/iwl-devtrace.c       |    2 +-
2416  drivers/net/wireless/iwlwifi/iwl-devtrace.h       |    2 +-
2417  drivers/net/wireless/iwlwifi/iwl-eeprom.c         |   50 +-
2418  drivers/net/wireless/iwlwifi/iwl-eeprom.h         |  191 +-
2419  drivers/net/wireless/iwlwifi/iwl-fh.h             |    4 +-
2420  drivers/net/wireless/iwlwifi/iwl-hcmd.c           |   17 +-
2421  drivers/net/wireless/iwlwifi/iwl-helpers.h        |    2 +-
2422  drivers/net/wireless/iwlwifi/iwl-io.c             |  274 +
2423  drivers/net/wireless/iwlwifi/iwl-io.h             |  491 +-
2424  drivers/net/wireless/iwlwifi/iwl-led.c            |    2 +-
2425  drivers/net/wireless/iwlwifi/iwl-led.h            |    2 +-
2426  drivers/net/wireless/iwlwifi/iwl-power.c          |    2 +-
2427  drivers/net/wireless/iwlwifi/iwl-power.h          |    2 +-
2428  drivers/net/wireless/iwlwifi/iwl-prph.h           |  342 +-
2429  drivers/net/wireless/iwlwifi/iwl-rx.c             |   13 +-
2430  drivers/net/wireless/iwlwifi/iwl-scan.c           |    2 +-
2431  drivers/net/wireless/iwlwifi/iwl-spectrum.h       |    2 +-
2432  drivers/net/wireless/iwlwifi/iwl-sta.c            |    9 +-
2433  drivers/net/wireless/iwlwifi/iwl-sta.h            |    2 +-
2434  drivers/net/wireless/iwlwifi/iwl-tx.c             |   68 +-
2435  drivers/net/wireless/libertas/if_spi.c            |   65 +
2436  drivers/net/wireless/mwifiex/11n.c                |  809 ++
2437  drivers/net/wireless/mwifiex/11n.h                |  176 +
2438  drivers/net/wireless/mwifiex/11n_aggr.c           |  423 +
2439  drivers/net/wireless/mwifiex/11n_aggr.h           |   32 +
2440  drivers/net/wireless/mwifiex/11n_rxreorder.c      |  637 +
2441  drivers/net/wireless/mwifiex/11n_rxreorder.h      |   67 +
2442  drivers/net/wireless/mwifiex/Kconfig              |   21 +
2443  drivers/net/wireless/mwifiex/Makefile             |   41 +
2444  drivers/net/wireless/mwifiex/README               |  204 +
2445  drivers/net/wireless/mwifiex/cfg80211.c           | 1456 ++
2446  drivers/net/wireless/mwifiex/cfg80211.h           |   31 +
2447  drivers/net/wireless/mwifiex/cfp.c                |  367 +
2448  drivers/net/wireless/mwifiex/cmdevt.c             | 1459 ++
2449  drivers/net/wireless/mwifiex/debugfs.c            |  773 +
2450  drivers/net/wireless/mwifiex/decl.h               |  153 +
2451  drivers/net/wireless/mwifiex/fw.h                 | 1229 ++
2452  drivers/net/wireless/mwifiex/init.c               |  662 +
2453  drivers/net/wireless/mwifiex/ioctl.h              |  411 +
2454  drivers/net/wireless/mwifiex/join.c               | 1462 ++
2455  drivers/net/wireless/mwifiex/main.c               | 1102 ++
2456  drivers/net/wireless/mwifiex/main.h               | 1058 ++
2457  drivers/net/wireless/mwifiex/scan.c               | 3097 +++++
2458  drivers/net/wireless/mwifiex/sdio.c               | 1770 +++
2459  drivers/net/wireless/mwifiex/sdio.h               |  305 +
2460  drivers/net/wireless/mwifiex/sta_cmd.c            | 1226 ++
2461  drivers/net/wireless/mwifiex/sta_cmdresp.c        |  983 ++
2462  drivers/net/wireless/mwifiex/sta_event.c          |  405 +
2463  drivers/net/wireless/mwifiex/sta_ioctl.c          | 2360 ++++
2464  drivers/net/wireless/mwifiex/sta_rx.c             |  182 +
2465  drivers/net/wireless/mwifiex/sta_tx.c             |  202 +
2466  drivers/net/wireless/mwifiex/txrx.c               |  202 +
2467  drivers/net/wireless/mwifiex/util.c               |  252 +
2468  drivers/net/wireless/mwifiex/util.h               |   32 +
2469  drivers/net/wireless/mwifiex/wmm.c                | 1237 ++
2470  drivers/net/wireless/mwifiex/wmm.h                |  112 +
2471  drivers/net/wireless/mwl8k.c                      |  749 +-
2472  drivers/net/wireless/rt2x00/rt2400pci.c           |    6 +-
2473  drivers/net/wireless/rt2x00/rt2500pci.c           |    6 +-
2474  drivers/net/wireless/rt2x00/rt2500usb.c           |    5 -
2475  drivers/net/wireless/rt2x00/rt2800.h              |  106 +
2476  drivers/net/wireless/rt2x00/rt2800lib.c           |  198 +-
2477  drivers/net/wireless/rt2x00/rt2800lib.h           |    1 +
2478  drivers/net/wireless/rt2x00/rt2800pci.c           |   19 +-
2479  drivers/net/wireless/rt2x00/rt2800usb.c           |    3 +-
2480  drivers/net/wireless/rt2x00/rt2x00.h              |    7 +-
2481  drivers/net/wireless/rt2x00/rt2x00debug.c         |    1 -
2482  drivers/net/wireless/rt2x00/rt2x00dev.c           |   28 +-
2483  drivers/net/wireless/rt2x00/rt2x00ht.c            |    7 +-
2484  drivers/net/wireless/rt2x00/rt2x00lib.h           |   23 +-
2485  drivers/net/wireless/rt2x00/rt2x00link.c          |   49 +-
2486  drivers/net/wireless/rt2x00/rt2x00pci.c           |    7 +-
2487  drivers/net/wireless/rt2x00/rt2x00pci.h           |    5 +-
2488  drivers/net/wireless/rt2x00/rt2x00queue.c         |   18 +-
2489  drivers/net/wireless/rt2x00/rt2x00queue.h         |    1 +
2490  drivers/net/wireless/rt2x00/rt61pci.c             |    6 +-
2491  drivers/net/wireless/rt2x00/rt73usb.c             |    2 -
2492  drivers/net/wireless/rtlwifi/base.c               |    5 +-
2493  drivers/net/wireless/rtlwifi/core.c               |    8 +-
2494  drivers/net/wireless/rtlwifi/efuse.c              |  106 +-
2495  drivers/net/wireless/rtlwifi/pci.c                |   53 +-
2496  drivers/net/wireless/rtlwifi/pci.h                |    4 +-
2497  drivers/net/wireless/rtlwifi/ps.c                 |    3 +-
2498  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c |   38 +-
2499  drivers/net/wireless/rtlwifi/rtl8192ce/trx.h      |    4 +-
2500  drivers/net/wireless/rtlwifi/rtl8192cu/trx.c      |    2 +-
2501  drivers/net/wireless/rtlwifi/wifi.h               |   18 +-
2502  drivers/net/wireless/wl1251/cmd.h                 |    4 +-
2503  drivers/net/wireless/wl1251/event.c               |    6 +-
2504  drivers/net/wireless/wl1251/main.c                |   22 +-
2505  drivers/net/wireless/wl1251/ps.c                  |   23 +-
2506  drivers/net/wireless/wl1251/ps.h                  |    2 +-
2507  drivers/net/wireless/wl1251/wl1251.h              |    9 +-
2508  drivers/net/wireless/zd1211rw/zd_chip.c           |  262 +-
2509  drivers/net/wireless/zd1211rw/zd_chip.h           |  529 +-
2510  drivers/net/wireless/zd1211rw/zd_rf.h             |    2 +-
2511  drivers/net/wireless/zd1211rw/zd_rf_al2230.c      |  198 +-
2512  drivers/net/wireless/zd1211rw/zd_rf_al7230b.c     |  240 +-
2513  drivers/net/wireless/zd1211rw/zd_rf_rf2959.c      |   78 +-
2514  drivers/net/wireless/zd1211rw/zd_rf_uw2453.c      |   86 +-
2515  drivers/net/wireless/zd1211rw/zd_usb.c            |    4 +-
2516  drivers/net/wireless/zd1211rw/zd_usb.h            |    2 +-
2517  drivers/net/xen-netback/common.h                  |    3 -
2518  drivers/net/xen-netback/interface.c               |   84 +-
2519  drivers/net/xen-netback/xenbus.c                  |    2 +-
2520  drivers/net/xen-netfront.c                        |  106 +-
2521  drivers/s390/net/qeth_core.h                      |    7 -
2522  drivers/s390/net/qeth_l3_main.c                   |  117 +-
2523  drivers/s390/net/qeth_l3_sys.c                    |   35 +-
2524  drivers/ssb/driver_pcicore.c                      |  104 +-
2525  drivers/ssb/scan.c                                |    2 +-
2526  drivers/staging/hv/netvsc_drv.c                   |    3 +-
2527  firmware/Makefile                                 |    6 +-
2528  firmware/WHENCE                                   |    9 +-
2529  firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex           | 9483 -------------
2530  firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex           | 9484 +++++++++++++
2531  firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex          |13181 ------------------
2532  firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex          |13192 ++++++++++++++++++
2533  firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex           |15456 --------------------
2534  firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex           |15473 +++++++++++++++++++++
2535  include/linux/ath9k_platform.h                    |    5 +
2536  include/linux/ethtool.h                           |  271 +-
2537  include/linux/ieee80211.h                         |    9 +
2538  include/linux/if_vlan.h                           |   10 +-
2539  include/linux/netdevice.h                         |    6 +-
2540  include/linux/netfilter/ipset/ip_set_getport.h    |    2 +
2541  include/linux/netfilter/x_tables.h                |   96 +-
2542  include/linux/nl80211.h                           |   35 +-
2543  include/linux/pkt_sched.h                         |   15 +
2544  include/linux/smsc911x.h                          |    1 +
2545  include/linux/ssb/ssb.h                           |    2 +-
2546  include/linux/usb/rndis_host.h                    |    2 +
2547  include/net/addrconf.h                            |   22 +-
2548  include/net/bluetooth/hci.h                       |   40 +-
2549  include/net/bluetooth/hci_core.h                  |   25 +-
2550  include/net/bluetooth/l2cap.h                     |    2 -
2551  include/net/bluetooth/mgmt.h                      |   47 +
2552  include/net/caif/caif_dev.h                       |   27 +-
2553  include/net/caif/cfctrl.h                         |   12 +-
2554  include/net/caif/cfmuxl.h                         |    2 -
2555  include/net/caif/cfpkt.h                          |   75 -
2556  include/net/caif/cfsrvl.h                         |    3 +-
2557  include/net/cfg80211.h                            |   43 +
2558  include/net/flow.h                                |   25 +-
2559  include/net/if_inet6.h                            |    4 +-
2560  include/net/inetpeer.h                            |    2 +-
2561  include/net/ip6_fib.h                             |   10 +-
2562  include/net/ip6_route.h                           |   23 +-
2563  include/net/ip_fib.h                              |    9 +-
2564  include/net/ipv6.h                                |    4 +-
2565  include/net/ndisc.h                               |    3 +-
2566  include/net/route.h                               |   63 +-
2567  include/net/sctp/command.h                        |    1 -
2568  include/net/sctp/constants.h                      |   18 +-
2569  include/net/sctp/sctp.h                           |    2 -
2570  include/net/sctp/sm.h                             |    5 +-
2571  include/net/sctp/structs.h                        |    2 +-
2572  include/net/sctp/ulpevent.h                       |    3 +
2573  include/net/sctp/user.h                           |   33 +-
2574  include/net/sock.h                                |   54 +
2575  include/net/xfrm.h                                |   15 +-
2576  net/8021q/vlan.c                                  |   28 +-
2577  net/8021q/vlan.h                                  |    2 -
2578  net/8021q/vlan_core.c                             |   85 +-
2579  net/8021q/vlan_dev.c                              |  223 +-
2580  net/9p/client.c                                   |    9 +-
2581  net/atm/lec.c                                     |    4 -
2582  net/ax25/af_ax25.c                                |   16 +-
2583  net/ax25/ax25_iface.c                             |    3 +-
2584  net/batman-adv/gateway_client.c                   |  259 +-
2585  net/batman-adv/gateway_client.h                   |    2 +-
2586  net/batman-adv/icmp_socket.c                      |   18 +-
2587  net/batman-adv/originator.c                       |   38 +-
2588  net/batman-adv/originator.h                       |    1 +
2589  net/batman-adv/routing.c                          |  378 +-
2590  net/batman-adv/send.c                             |   19 +-
2591  net/batman-adv/soft-interface.c                   |  128 +-
2592  net/batman-adv/types.h                            |    7 +-
2593  net/batman-adv/unicast.c                          |    2 +-
2594  net/batman-adv/vis.c                              |   91 +-
2595  net/bluetooth/bnep/bnep.h                         |  148 +-
2596  net/bluetooth/bnep/core.c                         |   71 +-
2597  net/bluetooth/bnep/sock.c                         |    2 +-
2598  net/bluetooth/cmtp/capi.c                         |    6 +-
2599  net/bluetooth/cmtp/cmtp.h                         |   11 +-
2600  net/bluetooth/cmtp/core.c                         |   25 +-
2601  net/bluetooth/cmtp/sock.c                         |    2 +-
2602  net/bluetooth/hci_core.c                          |   79 +-
2603  net/bluetooth/hci_event.c                         |   95 +-
2604  net/bluetooth/hci_sysfs.c                         |   40 +-
2605  net/bluetooth/hidp/core.c                         |   90 +-
2606  net/bluetooth/hidp/hidp.h                         |    6 +-
2607  net/bluetooth/hidp/sock.c                         |    7 +-
2608  net/bluetooth/l2cap_core.c                        |   27 +-
2609  net/bluetooth/mgmt.c                              |  518 +-
2610  net/bridge/br.c                                   |    1 +
2611  net/bridge/br_device.c                            |   41 +
2612  net/bridge/br_fdb.c                               |  311 +-
2613  net/bridge/br_if.c                                |   83 +-
2614  net/bridge/br_input.c                             |    5 +-
2615  net/bridge/br_ioctl.c                             |   40 +-
2616  net/bridge/br_multicast.c                         |   12 +-
2617  net/bridge/br_netfilter.c                         |    4 +-
2618  net/bridge/br_netlink.c                           |   53 +-
2619  net/bridge/br_notify.c                            |    6 +
2620  net/bridge/br_private.h                           |   19 +-
2621  net/bridge/br_private_stp.h                       |   13 +
2622  net/bridge/br_stp.c                               |   48 +
2623  net/bridge/br_stp_if.c                            |   21 +-
2624  net/bridge/br_sysfs_br.c                          |   39 +-
2625  net/bridge/br_sysfs_if.c                          |   26 +-
2626  net/caif/caif_config_util.c                       |    6 +-
2627  net/caif/caif_dev.c                               |   56 +-
2628  net/caif/caif_socket.c                            |   35 +-
2629  net/caif/cfcnfg.c                                 |    2 +-
2630  net/caif/cfctrl.c                                 |   75 +-
2631  net/caif/cfdgml.c                                 |    7 +-
2632  net/caif/cffrml.c                                 |    8 +-
2633  net/caif/cfmuxl.c                                 |   45 +-
2634  net/caif/cfpkt_skbuff.c                           |  178 +-
2635  net/caif/cfserl.c                                 |    7 +-
2636  net/caif/cfsrvl.c                                 |    7 +-
2637  net/caif/cfutill.c                                |    7 +-
2638  net/caif/cfveil.c                                 |    5 +-
2639  net/caif/cfvidl.c                                 |    5 +-
2640  net/can/af_can.c                                  |   52 +-
2641  net/core/dev.c                                    |   53 +-
2642  net/core/ethtool.c                                |  106 +-
2643  net/core/net_namespace.c                          |   12 +-
2644  net/core/netpoll.c                                |    2 +-
2645  net/core/pktgen.c                                 |    2 -
2646  net/dccp/ipv6.c                                   |    8 +-
2647  net/decnet/dn_table.c                             |    4 +-
2648  net/dsa/slave.c                                   |    1 -
2649  net/econet/af_econet.c                            |    8 -
2650  net/ipv4/af_inet.c                                |    4 +-
2651  net/ipv4/ah4.c                                    |    7 +-
2652  net/ipv4/devinet.c                                |    1 +
2653  net/ipv4/esp4.c                                   |    7 +-
2654  net/ipv4/fib_frontend.c                           |   16 +-
2655  net/ipv4/fib_trie.c                               |  110 +-
2656  net/ipv4/icmp.c                                   |   12 +-
2657  net/ipv4/inet_connection_sock.c                   |   18 +-
2658  net/ipv4/inet_diag.c                              |    2 +-
2659  net/ipv4/inet_lro.c                               |    4 +-
2660  net/ipv4/ip_gre.c                                 |   28 +-
2661  net/ipv4/ip_input.c                               |    4 +-
2662  net/ipv4/ip_output.c                              |   18 +-
2663  net/ipv4/ip_sockglue.c                            |    2 +-
2664  net/ipv4/ipcomp.c                                 |    4 +-
2665  net/ipv4/ipip.c                                   |    8 +-
2666  net/ipv4/ipmr.c                                   |    2 +-
2667  net/ipv4/netfilter/arp_tables.c                   |   18 +-
2668  net/ipv4/netfilter/ip_tables.c                    |   28 +-
2669  net/ipv4/netfilter/nf_nat_helper.c                |    2 +-
2670  net/ipv4/raw.c                                    |   28 +-
2671  net/ipv4/route.c                                  |   22 +-
2672  net/ipv4/syncookies.c                             |   18 +-
2673  net/ipv4/tcp.c                                    |    7 +-
2674  net/ipv4/tcp_ipv4.c                               |    8 +-
2675  net/ipv4/udp.c                                    |   20 +-
2676  net/ipv4/xfrm4_policy.c                           |    2 +-
2677  net/ipv4/xfrm4_state.c                            |    2 +-
2678  net/ipv6/addrconf.c                               |   18 +-
2679  net/ipv6/af_inet6.c                               |    2 +-
2680  net/ipv6/anycast.c                                |   16 +-
2681  net/ipv6/esp6.c                                   |    5 +-
2682  net/ipv6/icmp.c                                   |    8 +-
2683  net/ipv6/ip6_fib.c                                |   16 +-
2684  net/ipv6/ip6_input.c                              |    6 +-
2685  net/ipv6/ip6_output.c                             |   16 +-
2686  net/ipv6/ip6_tunnel.c                             |   36 +-
2687  net/ipv6/ip6mr.c                                  |    4 +-
2688  net/ipv6/ipcomp6.c                                |    5 +-
2689  net/ipv6/mcast.c                                  |   36 +-
2690  net/ipv6/mip6.c                                   |    8 +-
2691  net/ipv6/ndisc.c                                  |   52 +-
2692  net/ipv6/netfilter.c                              |   10 +-
2693  net/ipv6/netfilter/ip6_tables.c                   |   21 +-
2694  net/ipv6/netfilter/ip6table_mangle.c              |    3 +-
2695  net/ipv6/raw.c                                    |   14 +-
2696  net/ipv6/reassembly.c                             |    4 +-
2697  net/ipv6/route.c                                  |  122 +-
2698  net/ipv6/sit.c                                    |   25 +-
2699  net/ipv6/syncookies.c                             |   13 +-
2700  net/ipv6/tcp_ipv6.c                               |   48 +-
2701  net/ipv6/udp.c                                    |   20 +-
2702  net/ipv6/xfrm6_mode_beet.c                        |    2 -
2703  net/ipv6/xfrm6_mode_tunnel.c                      |    6 +-
2704  net/ipv6/xfrm6_policy.c                           |    2 +-
2705  net/ipv6/xfrm6_tunnel.c                           |   10 +-
2706  net/irda/irlap_event.c                            |    3 -
2707  net/irda/irproc.c                                 |    5 +-
2708  net/key/af_key.c                                  |    2 +-
2709  net/l2tp/l2tp_netlink.c                           |    3 +-
2710  net/mac80211/Kconfig                              |    1 -
2711  net/mac80211/cfg.c                                |   13 +-
2712  net/mac80211/debugfs.c                            |   89 +-
2713  net/mac80211/ibss.c                               |    3 +-
2714  net/mac80211/ieee80211_i.h                        |    4 +-
2715  net/mac80211/main.c                               |    5 -
2716  net/mac80211/mlme.c                               |    9 -
2717  net/mac80211/rx.c                                 |    2 +
2718  net/mac80211/sta_info.c                           |   15 +-
2719  net/mac80211/sta_info.h                           |    1 -
2720  net/mac80211/status.c                             |   11 +-
2721  net/mac80211/tkip.c                               |    4 +-
2722  net/mac80211/tkip.h                               |    4 +-
2723  net/mac80211/util.c                               |    2 +-
2724  net/mac80211/wep.c                                |   34 +-
2725  net/mac80211/wep.h                                |    4 +-
2726  net/netfilter/ipset/ip_set_getport.c              |   16 +-
2727  net/netfilter/ipset/ip_set_hash_ipport.c          |    2 +-
2728  net/netfilter/ipset/ip_set_hash_ipportip.c        |    2 +-
2729  net/netfilter/ipset/ip_set_hash_ipportnet.c       |    2 +-
2730  net/netfilter/ipset/ip_set_hash_netport.c         |    2 +-
2731  net/netfilter/ipvs/ip_vs_ctl.c                    |    3 -
2732  net/netfilter/nf_conntrack_standalone.c           |    2 +-
2733  net/netfilter/nfnetlink_log.c                     |    2 -
2734  net/netfilter/x_tables.c                          |    9 +-
2735  net/netlabel/netlabel_cipso_v4.c                  |    4 -
2736  net/netrom/af_netrom.c                            |   12 +-
2737  net/phonet/socket.c                               |   45 +-
2738  net/rose/af_rose.c                                |   16 +-
2739  net/sched/Kconfig                                 |   11 +
2740  net/sched/Makefile                                |    1 +
2741  net/sched/sch_qfq.c                               | 1137 ++
2742  net/sched/sch_sfq.c                               |    2 +-
2743  net/sctp/debug.c                                  |    1 -
2744  net/sctp/endpointola.c                            |   20 +-
2745  net/sctp/input.c                                  |   19 +-
2746  net/sctp/ipv6.c                                   |    2 +-
2747  net/sctp/outqueue.c                               |   19 +-
2748  net/sctp/sm_make_chunk.c                          |   62 +-
2749  net/sctp/sm_sideeffect.c                          |    9 +-
2750  net/sctp/sm_statefuns.c                           |   89 +-
2751  net/sctp/sm_statetable.c                          |   78 +-
2752  net/sctp/socket.c                                 |   80 +-
2753  net/sctp/ulpevent.c                               |   30 +-
2754  net/socket.c                                      |   14 +-
2755  net/wireless/mlme.c                               |    9 +
2756  net/wireless/nl80211.c                            |   55 +-
2757  net/wireless/nl80211.h                            |    3 +
2758  net/wireless/reg.c                                |   71 +-
2759  net/xfrm/xfrm_state.c                             |   12 +-
2760  675 files changed, 77552 insertions(+), 59781 deletions(-)
2761  delete mode 100644 drivers/isdn/capi/capifs.c
2762  delete mode 100644 drivers/isdn/capi/capifs.h
2763  create mode 100644 drivers/net/enic/enic_pp.c
2764  create mode 100644 drivers/net/enic/enic_pp.h
2765  delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig
2766  delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile
2767  delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h
2768  delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c
2769  delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h
2770  delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h
2771  delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h
2772  delete mode 100644 drivers/net/wireless/ath/ar9170/led.c
2773  delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c
2774  delete mode 100644 drivers/net/wireless/ath/ar9170/main.c
2775  delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c
2776  delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c
2777  delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h
2778  create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c
2779  create mode 100644 drivers/net/wireless/mwifiex/11n.c
2780  create mode 100644 drivers/net/wireless/mwifiex/11n.h
2781  create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c
2782  create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h
2783  create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c
2784  create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h
2785  create mode 100644 drivers/net/wireless/mwifiex/Kconfig
2786  create mode 100644 drivers/net/wireless/mwifiex/Makefile
2787  create mode 100644 drivers/net/wireless/mwifiex/README
2788  create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c
2789  create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h
2790  create mode 100644 drivers/net/wireless/mwifiex/cfp.c
2791  create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c
2792  create mode 100644 drivers/net/wireless/mwifiex/debugfs.c
2793  create mode 100644 drivers/net/wireless/mwifiex/decl.h
2794  create mode 100644 drivers/net/wireless/mwifiex/fw.h
2795  create mode 100644 drivers/net/wireless/mwifiex/init.c
2796  create mode 100644 drivers/net/wireless/mwifiex/ioctl.h
2797  create mode 100644 drivers/net/wireless/mwifiex/join.c
2798  create mode 100644 drivers/net/wireless/mwifiex/main.c
2799  create mode 100644 drivers/net/wireless/mwifiex/main.h
2800  create mode 100644 drivers/net/wireless/mwifiex/scan.c
2801  create mode 100644 drivers/net/wireless/mwifiex/sdio.c
2802  create mode 100644 drivers/net/wireless/mwifiex/sdio.h
2803  create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c
2804  create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c
2805  create mode 100644 drivers/net/wireless/mwifiex/sta_event.c
2806  create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c
2807  create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c
2808  create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c
2809  create mode 100644 drivers/net/wireless/mwifiex/txrx.c
2810  create mode 100644 drivers/net/wireless/mwifiex/util.c
2811  create mode 100644 drivers/net/wireless/mwifiex/util.h
2812  create mode 100644 drivers/net/wireless/mwifiex/wmm.c
2813  create mode 100644 drivers/net/wireless/mwifiex/wmm.h
2814  delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex
2815  create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex
2816  delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex
2817  create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex
2818  delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex
2819  create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex
2820  create mode 100644 net/sched/sch_qfq.c
2821 $ git am -3 ../patches/0001-r8169-fix-for-rtl_apply_firmware-API-change.patch
2822 Applying: r8169: fix for rtl_apply_firmware API change
2823 Merging wireless/master
2824 $ git merge wireless/master
2825 Resolved 'drivers/net/wireless/iwlwifi/iwl-core.c' using previous resolution.
2826 Resolved 'drivers/net/wireless/rt2x00/rt2x00queue.c' using previous resolution.
2827 Resolved 'drivers/net/wireless/rt2x00/rt2x00queue.h' using previous resolution.
2828 Auto-merging drivers/net/wireless/ath/ath5k/base.c
2829 Auto-merging drivers/net/wireless/ath/ath5k/desc.c
2830 Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c
2831 Auto-merging drivers/net/wireless/ath/ath5k/pci.c
2832 Auto-merging drivers/net/wireless/ath/ath5k/pcu.c
2833 Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
2834 Auto-merging drivers/net/wireless/ath/ath9k/hif_usb.c
2835 Auto-merging drivers/net/wireless/ath/ath9k/htc_hst.c
2836 Auto-merging drivers/net/wireless/ath/ath9k/hw.c
2837 Auto-merging drivers/net/wireless/ath/ath9k/mac.c
2838 Auto-merging drivers/net/wireless/ath/ath9k/mac.h
2839 Auto-merging drivers/net/wireless/ath/ath9k/main.c
2840 Auto-merging drivers/net/wireless/ath/ath9k/rc.c
2841 Auto-merging drivers/net/wireless/ath/ath9k/recv.c
2842 Auto-merging drivers/net/wireless/ath/ath9k/xmit.c
2843 Auto-merging drivers/net/wireless/ath/regd.c
2844 Auto-merging drivers/net/wireless/iwlegacy/iwl4965-base.c
2845 Removing drivers/net/wireless/iwlwifi/iwl-agn-led.c
2846 Removing drivers/net/wireless/iwlwifi/iwl-agn-led.h
2847 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
2848 Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c
2849 CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.c
2850 Auto-merging drivers/net/wireless/iwlwifi/iwl-fh.h
2851 Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c
2852 Auto-merging drivers/net/wireless/rt2x00/rt2x00.h
2853 Auto-merging drivers/net/wireless/rt2x00/rt2x00config.c
2854 Auto-merging drivers/net/wireless/rt2x00/rt2x00crypto.c
2855 Removing drivers/net/wireless/rt2x00/rt2x00ht.c
2856 Auto-merging drivers/net/wireless/rt2x00/rt2x00link.c
2857 Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c
2858 CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00queue.c
2859 Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.h
2860 CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2x00queue.h
2861 Auto-merging drivers/net/wireless/rt2x00/rt2x00usb.c
2862 Auto-merging drivers/net/wireless/rt2x00/rt2x00usb.h
2863 Auto-merging drivers/net/wireless/rtlwifi/base.c
2864 Auto-merging drivers/net/wireless/rtlwifi/pci.c
2865 Auto-merging drivers/net/wireless/wl12xx/cmd.c
2866 Auto-merging drivers/net/wireless/wl12xx/conf.h
2867 Auto-merging drivers/net/wireless/wl12xx/io.h
2868 Auto-merging include/linux/nl80211.h
2869 Auto-merging include/net/mac80211.h
2870 Auto-merging net/bluetooth/hci_event.c
2871 Auto-merging net/bluetooth/l2cap_core.c
2872 Auto-merging net/bluetooth/l2cap_sock.c
2873 Auto-merging net/mac80211/cfg.c
2874 Auto-merging net/mac80211/ieee80211_i.h
2875 Auto-merging net/mac80211/mesh_pathtbl.c
2876 Auto-merging net/mac80211/rx.c
2877 Auto-merging net/mac80211/sta_info.c
2878 Auto-merging net/mac80211/sta_info.h
2879 Automatic merge failed; fix conflicts and then commit the result.
2880 $ git commit -v -a
2881 [master 0c64d55] Merge remote-tracking branch 'wireless/master'
2882 $ git diff -M --stat --summary HEAD^..
2883  drivers/bluetooth/Kconfig                          |    4 +-
2884  drivers/bluetooth/ath3k.c                          |    3 -
2885  drivers/bluetooth/btmrvl_sdio.c                    |  124 ++-
2886  drivers/bluetooth/btmrvl_sdio.h                    |   68 +-
2887  drivers/bluetooth/hci_ath.c                        |    7 +-
2888  drivers/bluetooth/hci_h4.c                         |    7 +-
2889  drivers/bluetooth/hci_ldisc.c                      |    6 +-
2890  drivers/net/wireless/ath/ath.h                     |    9 +-
2891  drivers/net/wireless/ath/ath5k/ahb.c               |   28 +
2892  drivers/net/wireless/ath/ath5k/ath5k.h             |   31 +-
2893  drivers/net/wireless/ath/ath5k/attach.c            |    7 +-
2894  drivers/net/wireless/ath/ath5k/base.c              |   71 +-
2895  drivers/net/wireless/ath/ath5k/base.h              |    7 +-
2896  drivers/net/wireless/ath/ath5k/caps.c              |    3 +
2897  drivers/net/wireless/ath/ath5k/debug.c             |   65 +-
2898  drivers/net/wireless/ath/ath5k/debug.h             |   17 -
2899  drivers/net/wireless/ath/ath5k/desc.c              |  158 +--
2900  drivers/net/wireless/ath/ath5k/eeprom.c            |  158 +--
2901  drivers/net/wireless/ath/ath5k/mac80211-ops.c      |    9 +
2902  drivers/net/wireless/ath/ath5k/pci.c               |   32 +
2903  drivers/net/wireless/ath/ath5k/pcu.c               |   35 +-
2904  drivers/net/wireless/ath/ath5k/qcu.c               |    4 +-
2905  drivers/net/wireless/ath/ath9k/Kconfig             |   21 +-
2906  drivers/net/wireless/ath/ath9k/Makefile            |    6 +-
2907  drivers/net/wireless/ath/ath9k/ahb.c               |   18 +-
2908  drivers/net/wireless/ath/ath9k/ani.c               |    6 -
2909  drivers/net/wireless/ath/ath9k/ar9002_mac.c        |   12 +-
2910  drivers/net/wireless/ath/ath9k/ar9002_phy.h        |    6 +
2911  .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h   |  178 ++--
2912  drivers/net/wireless/ath/ath9k/ar9003_calib.c      |   37 +-
2913  drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   61 +-
2914  drivers/net/wireless/ath/ath9k/ar9003_hw.c         |  101 ++-
2915  drivers/net/wireless/ath/ath9k/ar9003_mac.c        |   12 +-
2916  drivers/net/wireless/ath/ath9k/ar9003_phy.c        |   53 +-
2917  drivers/net/wireless/ath/ath9k/ar9003_phy.h        |    2 +-
2918  drivers/net/wireless/ath/ath9k/ar9340_initvals.h   | 1525 ++++++++++++++++++++
2919  drivers/net/wireless/ath/ath9k/ar9485_initvals.h   |   10 +-
2920  drivers/net/wireless/ath/ath9k/ath9k.h             |   14 +-
2921  drivers/net/wireless/ath/ath9k/beacon.c            |   44 +-
2922  drivers/net/wireless/ath/ath9k/debug.c             |   45 +-
2923  drivers/net/wireless/ath/ath9k/debug.h             |   11 +
2924  drivers/net/wireless/ath/ath9k/eeprom.h            |    6 +-
2925  drivers/net/wireless/ath/ath9k/eeprom_4k.c         |   26 +
2926  drivers/net/wireless/ath/ath9k/eeprom_9287.c       |   28 +-
2927  drivers/net/wireless/ath/ath9k/gpio.c              |    8 +-
2928  drivers/net/wireless/ath/ath9k/hif_usb.c           |  334 +++--
2929  drivers/net/wireless/ath/ath9k/hif_usb.h           |   10 +-
2930  drivers/net/wireless/ath/ath9k/htc.h               |  224 ++-
2931  drivers/net/wireless/ath/ath9k/htc_drv_beacon.c    |  324 ++++-
2932  drivers/net/wireless/ath/ath9k/htc_drv_debug.c     |  523 +++++++
2933  drivers/net/wireless/ath/ath9k/htc_drv_gpio.c      |   22 +-
2934  drivers/net/wireless/ath/ath9k/htc_drv_init.c      |  108 +-
2935  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |  359 ++----
2936  drivers/net/wireless/ath/ath9k/htc_drv_txrx.c      |  788 ++++++++---
2937  drivers/net/wireless/ath/ath9k/htc_hst.c           |   50 +-
2938  drivers/net/wireless/ath/ath9k/htc_hst.h           |   25 +-
2939  drivers/net/wireless/ath/ath9k/hw-ops.h            |    5 +
2940  drivers/net/wireless/ath/ath9k/hw.c                |  138 ++-
2941  drivers/net/wireless/ath/ath9k/hw.h                |   17 +-
2942  drivers/net/wireless/ath/ath9k/init.c              |    2 +
2943  drivers/net/wireless/ath/ath9k/mac.c               |   10 +-
2944  drivers/net/wireless/ath/ath9k/mac.h               |    1 -
2945  drivers/net/wireless/ath/ath9k/main.c              |  106 ++-
2946  drivers/net/wireless/ath/ath9k/phy.h               |    4 +-
2947  drivers/net/wireless/ath/ath9k/rc.c                |   15 +-
2948  drivers/net/wireless/ath/ath9k/recv.c              |   11 +-
2949  drivers/net/wireless/ath/ath9k/reg.h               |  116 +-
2950  drivers/net/wireless/ath/ath9k/wmi.c               |  122 +-
2951  drivers/net/wireless/ath/ath9k/wmi.h               |   80 +-
2952  drivers/net/wireless/ath/ath9k/xmit.c              |  134 ++-
2953  drivers/net/wireless/ath/key.c                     |    6 +-
2954  drivers/net/wireless/ath/regd.c                    |    8 +-
2955  drivers/net/wireless/ath/regd_common.h             |    2 +
2956  drivers/net/wireless/iwlegacy/iwl-4965-rs.c        |    1 -
2957  drivers/net/wireless/iwlegacy/iwl4965-base.c       |    2 +-
2958  drivers/net/wireless/iwlwifi/Makefile              |    2 +-
2959  drivers/net/wireless/iwlwifi/iwl-1000.c            |   24 +-
2960  drivers/net/wireless/iwlwifi/iwl-2000.c            |   43 +-
2961  drivers/net/wireless/iwlwifi/iwl-5000.c            |   34 +-
2962  drivers/net/wireless/iwlwifi/iwl-6000.c            |   52 +-
2963  drivers/net/wireless/iwlwifi/iwl-agn-calib.c       |   43 +-
2964  drivers/net/wireless/iwlwifi/iwl-agn-calib.h       |    4 +-
2965  drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c     |  134 +--
2966  drivers/net/wireless/iwlwifi/iwl-agn-led.c         |   73 -
2967  drivers/net/wireless/iwlwifi/iwl-agn-led.h         |   33 -
2968  drivers/net/wireless/iwlwifi/iwl-agn-lib.c         |  140 ++-
2969  drivers/net/wireless/iwlwifi/iwl-agn-rs.h          |    1 -
2970  drivers/net/wireless/iwlwifi/iwl-agn-rxon.c        |   26 +-
2971  drivers/net/wireless/iwlwifi/iwl-agn-ucode.c       |  248 +++-
2972  drivers/net/wireless/iwlwifi/iwl-agn.c             |  498 +++-----
2973  drivers/net/wireless/iwlwifi/iwl-agn.h             |   36 +-
2974  drivers/net/wireless/iwlwifi/iwl-commands.h        |  167 +--
2975  drivers/net/wireless/iwlwifi/iwl-core.c            |   86 +-
2976  drivers/net/wireless/iwlwifi/iwl-core.h            |   56 +-
2977  drivers/net/wireless/iwlwifi/iwl-debugfs.c         |   59 +-
2978  drivers/net/wireless/iwlwifi/iwl-dev.h             |   72 +-
2979  drivers/net/wireless/iwlwifi/iwl-eeprom.c          |    6 -
2980  drivers/net/wireless/iwlwifi/iwl-eeprom.h          |    1 -
2981  drivers/net/wireless/iwlwifi/iwl-fh.h              |   38 +-
2982  drivers/net/wireless/iwlwifi/iwl-hcmd.c            |   12 +-
2983  drivers/net/wireless/iwlwifi/iwl-helpers.h         |   37 +-
2984  drivers/net/wireless/iwlwifi/iwl-io.c              |   18 +-
2985  drivers/net/wireless/iwlwifi/iwl-io.h              |   10 +
2986  drivers/net/wireless/iwlwifi/iwl-led.c             |   30 +-
2987  drivers/net/wireless/iwlwifi/iwl-led.h             |    1 +
2988  drivers/net/wireless/iwlwifi/iwl-power.c           |   17 +-
2989  drivers/net/wireless/iwlwifi/iwl-prph.h            |   16 +-
2990  drivers/net/wireless/iwlwifi/iwl-rx.c              |  369 +++---
2991  drivers/net/wireless/iwlwifi/iwl-sta.c             |    9 +-
2992  drivers/net/wireless/iwlwifi/iwl-tx.c              |   54 +-
2993  drivers/net/wireless/mwifiex/11n.c                 |   34 +-
2994  drivers/net/wireless/mwifiex/11n.h                 |   53 +-
2995  drivers/net/wireless/mwifiex/11n_aggr.c            |    5 +-
2996  drivers/net/wireless/mwifiex/11n_rxreorder.c       |   36 +-
2997  drivers/net/wireless/mwifiex/11n_rxreorder.h       |    6 +-
2998  drivers/net/wireless/mwifiex/README                |    2 +-
2999  drivers/net/wireless/mwifiex/cfg80211.c            |  224 +--
3000  drivers/net/wireless/mwifiex/cfp.c                 |   17 +-
3001  drivers/net/wireless/mwifiex/cmdevt.c              |  194 +--
3002  drivers/net/wireless/mwifiex/debugfs.c             |    7 +-
3003  drivers/net/wireless/mwifiex/decl.h                |   38 +-
3004  drivers/net/wireless/mwifiex/fw.h                  |   29 +-
3005  drivers/net/wireless/mwifiex/init.c                |   14 +-
3006  drivers/net/wireless/mwifiex/ioctl.h               |    3 +-
3007  drivers/net/wireless/mwifiex/join.c                |  128 +--
3008  drivers/net/wireless/mwifiex/main.c                |  174 +--
3009  drivers/net/wireless/mwifiex/main.h                |  142 +--
3010  drivers/net/wireless/mwifiex/scan.c                |  154 +--
3011  drivers/net/wireless/mwifiex/sdio.c                |   49 +-
3012  drivers/net/wireless/mwifiex/sta_cmd.c             |  127 +-
3013  drivers/net/wireless/mwifiex/sta_cmdresp.c         |   47 +-
3014  drivers/net/wireless/mwifiex/sta_event.c           |   25 +-
3015  drivers/net/wireless/mwifiex/sta_ioctl.c           | 1081 +++------------
3016  drivers/net/wireless/mwifiex/sta_tx.c              |    8 +-
3017  drivers/net/wireless/mwifiex/txrx.c                |    4 +-
3018  drivers/net/wireless/mwifiex/util.c                |   55 +-
3019  drivers/net/wireless/mwifiex/wmm.c                 |   24 +-
3020  drivers/net/wireless/mwifiex/wmm.h                 |    8 +-
3021  drivers/net/wireless/mwl8k.c                       |  132 ++-
3022  drivers/net/wireless/rt2x00/Kconfig                |   26 +-
3023  drivers/net/wireless/rt2x00/Makefile               |    1 -
3024  drivers/net/wireless/rt2x00/rt2400pci.c            |   29 +-
3025  drivers/net/wireless/rt2x00/rt2500pci.c            |   28 +-
3026  drivers/net/wireless/rt2x00/rt2500usb.c            |   85 +-
3027  drivers/net/wireless/rt2x00/rt2800lib.c            |  135 ++-
3028  drivers/net/wireless/rt2x00/rt2800pci.c            |  244 ++--
3029  drivers/net/wireless/rt2x00/rt2800usb.c            |  621 +++++----
3030  drivers/net/wireless/rt2x00/rt2x00.h               |   97 +-
3031  drivers/net/wireless/rt2x00/rt2x00config.c         |   77 +-
3032  drivers/net/wireless/rt2x00/rt2x00crypto.c         |    4 +-
3033  drivers/net/wireless/rt2x00/rt2x00debug.c          |   42 +-
3034  drivers/net/wireless/rt2x00/rt2x00dev.c            |   23 +-
3035  drivers/net/wireless/rt2x00/rt2x00firmware.c       |    2 +-
3036  drivers/net/wireless/rt2x00/rt2x00ht.c             |  136 --
3037  drivers/net/wireless/rt2x00/rt2x00lib.h            |   34 +-
3038  drivers/net/wireless/rt2x00/rt2x00link.c           |   12 +-
3039  drivers/net/wireless/rt2x00/rt2x00mac.c            |   95 ++-
3040  drivers/net/wireless/rt2x00/rt2x00pci.c            |   12 +-
3041  drivers/net/wireless/rt2x00/rt2x00pci.h            |   12 +-
3042  drivers/net/wireless/rt2x00/rt2x00queue.c          |  159 ++-
3043  drivers/net/wireless/rt2x00/rt2x00queue.h          |   33 +-
3044  drivers/net/wireless/rt2x00/rt2x00usb.c            |  126 ++-
3045  drivers/net/wireless/rt2x00/rt2x00usb.h            |   31 +-
3046  drivers/net/wireless/rt2x00/rt61pci.c              |   64 +-
3047  drivers/net/wireless/rt2x00/rt73usb.c              |  189 ++--
3048  drivers/net/wireless/rtlwifi/base.c                |   12 +-
3049  drivers/net/wireless/rtlwifi/pci.c                 |    3 +-
3050  drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c  |    2 +-
3051  drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c  |    2 +-
3052  drivers/net/wireless/rtlwifi/rtl8192ce/led.c       |   14 +-
3053  drivers/net/wireless/rtlwifi/rtl8192ce/led.h       |    1 -
3054  drivers/net/wireless/rtlwifi/rtl8192ce/rf.c        |    4 +-
3055  drivers/net/wireless/rtlwifi/rtl8192ce/sw.c        |    1 -
3056  drivers/net/wireless/rtlwifi/rtl8192cu/hw.c        |    2 +-
3057  drivers/net/wireless/wl12xx/Kconfig                |    2 +-
3058  drivers/net/wireless/wl12xx/acx.c                  |   59 +-
3059  drivers/net/wireless/wl12xx/acx.h                  |   11 +
3060  drivers/net/wireless/wl12xx/boot.c                 |  279 +++-
3061  drivers/net/wireless/wl12xx/boot.h                 |   52 +
3062  drivers/net/wireless/wl12xx/cmd.c                  |   97 ++-
3063  drivers/net/wireless/wl12xx/cmd.h                  |   34 +
3064  drivers/net/wireless/wl12xx/conf.h                 |   17 +-
3065  drivers/net/wireless/wl12xx/debugfs.c              |    2 +-
3066  drivers/net/wireless/wl12xx/event.c                |   17 +-
3067  drivers/net/wireless/wl12xx/event.h                |    5 +-
3068  drivers/net/wireless/wl12xx/ini.h                  |   98 ++-
3069  drivers/net/wireless/wl12xx/init.c                 |   45 +-
3070  drivers/net/wireless/wl12xx/init.h                 |    1 +
3071  drivers/net/wireless/wl12xx/io.c                   |   11 +
3072  drivers/net/wireless/wl12xx/io.h                   |    3 +
3073  drivers/net/wireless/wl12xx/main.c                 |  343 ++++-
3074  drivers/net/wireless/wl12xx/ps.c                   |    3 -
3075  drivers/net/wireless/wl12xx/reg.h                  |   15 +-
3076  drivers/net/wireless/wl12xx/rx.c                   |   44 +-
3077  drivers/net/wireless/wl12xx/scan.c                 |   17 +-
3078  drivers/net/wireless/wl12xx/sdio.c                 |   27 +-
3079  drivers/net/wireless/wl12xx/sdio_test.c            |   20 +-
3080  drivers/net/wireless/wl12xx/spi.c                  |   17 +-
3081  drivers/net/wireless/wl12xx/testmode.c             |    6 +-
3082  drivers/net/wireless/wl12xx/tx.c                   |  234 +++-
3083  drivers/net/wireless/wl12xx/tx.h                   |   60 +-
3084  drivers/net/wireless/wl12xx/wl12xx.h               |   65 +-
3085  drivers/ssb/driver_chipcommon.c                    |    6 +
3086  drivers/ssb/driver_chipcommon_pmu.c                |    2 +
3087  drivers/ssb/driver_pcicore.c                       |    2 +-
3088  include/linux/ath9k_platform.h                     |    2 +
3089  include/linux/nl80211.h                            |   34 +-
3090  include/linux/rfkill-regulator.h                   |   48 +
3091  include/linux/ssb/ssb_driver_chipcommon.h          |   11 +-
3092  include/linux/wl12xx.h                             |   29 +-
3093  include/net/bluetooth/l2cap.h                      |  130 +-
3094  include/net/cfg80211.h                             |   33 +-
3095  include/net/mac80211.h                             |   16 +
3096  net/bluetooth/hci_event.c                          |    4 +
3097  net/bluetooth/l2cap_core.c                         | 1344 ++++++++++--------
3098  net/bluetooth/l2cap_sock.c                         |   72 +-
3099  net/mac80211/cfg.c                                 |   29 +-
3100  net/mac80211/debugfs_sta.c                         |   26 +
3101  net/mac80211/driver-ops.h                          |   13 +
3102  net/mac80211/driver-trace.h                        |   20 +
3103  net/mac80211/ieee80211_i.h                         |    5 +-
3104  net/mac80211/main.c                                |   27 +-
3105  net/mac80211/mesh.c                                |   14 +-
3106  net/mac80211/mesh.h                                |    3 +-
3107  net/mac80211/mesh_pathtbl.c                        |   49 +-
3108  net/mac80211/mesh_plink.c                          |   35 +-
3109  net/mac80211/mlme.c                                |   17 +-
3110  net/mac80211/pm.c                                  |   16 +-
3111  net/mac80211/rx.c                                  |   26 +-
3112  net/mac80211/sta_info.c                            |   16 +-
3113  net/mac80211/sta_info.h                            |    5 +
3114  net/mac80211/tx.c                                  |    2 +-
3115  net/rfkill/Kconfig                                 |   11 +
3116  net/rfkill/Makefile                                |    1 +
3117  net/rfkill/rfkill-regulator.c                      |  164 +++
3118  net/wireless/core.c                                |   17 +
3119  net/wireless/mesh.c                                |   23 +-
3120  net/wireless/nl80211.c                             |   67 +-
3121  net/wireless/nl80211.h                             |    4 +
3122  239 files changed, 11139 insertions(+), 7025 deletions(-)
3123  create mode 100644 drivers/net/wireless/ath/ath9k/ar9340_initvals.h
3124  create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_debug.c
3125  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c
3126  delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.h
3127  delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c
3128  create mode 100644 include/linux/rfkill-regulator.h
3129  create mode 100644 net/rfkill/rfkill-regulator.c
3130 Merging bluetooth/master
3131 $ git merge bluetooth/master
3132 Merge made by recursive.
3133 Merging mtd/master
3134 $ git merge mtd/master
3135 Already up-to-date.
3136 Merging crypto/master
3137 $ git merge crypto/master
3138 Auto-merging drivers/crypto/Kconfig
3139 Merge made by recursive.
3140  .../devicetree/bindings/crypto/fsl-sec4.txt        |  397 +++++
3141  arch/powerpc/boot/dts/p4080ds.dts                  |   86 +-
3142  drivers/crypto/Kconfig                             |   13 +
3143  drivers/crypto/Makefile                            |    2 +
3144  drivers/crypto/caam/Kconfig                        |   72 +
3145  drivers/crypto/caam/Makefile                       |    8 +
3146  drivers/crypto/caam/caamalg.c                      | 1164 ++++++++++++++
3147  drivers/crypto/caam/compat.h                       |   35 +
3148  drivers/crypto/caam/ctrl.c                         |  270 ++++
3149  drivers/crypto/caam/desc.h                         | 1605 ++++++++++++++++++++
3150  drivers/crypto/caam/desc_constr.h                  |  204 +++
3151  drivers/crypto/caam/error.c                        |  248 +++
3152  drivers/crypto/caam/error.h                        |   10 +
3153  drivers/crypto/caam/intern.h                       |  113 ++
3154  drivers/crypto/caam/jr.c                           |  523 +++++++
3155  drivers/crypto/caam/jr.h                           |   21 +
3156  drivers/crypto/caam/regs.h                         |  663 ++++++++
3157  drivers/crypto/padlock-sha.c                       |  269 ++++-
3158  drivers/crypto/picoxcell_crypto.c                  |   64 +-
3159  drivers/crypto/s5p-sss.c                           |  701 +++++++++
3160  20 files changed, 6433 insertions(+), 35 deletions(-)
3161  create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt
3162  create mode 100644 drivers/crypto/caam/Kconfig
3163  create mode 100644 drivers/crypto/caam/Makefile
3164  create mode 100644 drivers/crypto/caam/caamalg.c
3165  create mode 100644 drivers/crypto/caam/compat.h
3166  create mode 100644 drivers/crypto/caam/ctrl.c
3167  create mode 100644 drivers/crypto/caam/desc.h
3168  create mode 100644 drivers/crypto/caam/desc_constr.h
3169  create mode 100644 drivers/crypto/caam/error.c
3170  create mode 100644 drivers/crypto/caam/error.h
3171  create mode 100644 drivers/crypto/caam/intern.h
3172  create mode 100644 drivers/crypto/caam/jr.c
3173  create mode 100644 drivers/crypto/caam/jr.h
3174  create mode 100644 drivers/crypto/caam/regs.h
3175  create mode 100644 drivers/crypto/s5p-sss.c
3176 Merging sound/for-next
3177 $ git merge sound/for-next
3178 Auto-merging arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h
3179 Removing drivers/media/radio/radio-maestro.c
3180 Removing sound/soc/tegra/harmony.c
3181 Merge made by recursive.
3182  Documentation/sound/alsa/HD-Audio-Models.txt       |    2 +-
3183  arch/arm/mach-tegra/board-harmony.c                |    7 +-
3184  .../mach/{harmony_audio.h => tegra_wm8903_pdata.h} |    5 +-
3185  drivers/media/radio/Kconfig                        |   15 -
3186  drivers/media/radio/Makefile                       |    1 -
3187  drivers/media/radio/radio-maestro.c                |  452 ---
3188  .../staging/intel_sst/intel_sst_drv_interface.c    |    1 -
3189  drivers/staging/intel_sst/intelmid.c               |    4 +
3190  include/linux/mfd/wm8994/pdata.h                   |   49 +
3191  include/sound/control.h                            |    1 +
3192  include/sound/max98095.h                           |   26 +
3193  include/sound/soc.h                                |   25 +-
3194  include/sound/tea575x-tuner.h                      |    7 +-
3195  include/sound/wm8915.h                             |   55 +
3196  sound/core/control.c                               |   64 +
3197  sound/core/init.c                                  |    2 +-
3198  sound/i2c/other/Makefile                           |    2 +-
3199  sound/i2c/other/tea575x-tuner.c                    |   52 +-
3200  sound/pci/Kconfig                                  |   14 +-
3201  sound/pci/asihpi/asihpi.c                          |  328 +-
3202  sound/pci/asihpi/hpi6000.c                         |   39 +-
3203  sound/pci/asihpi/hpi6205.c                         |   95 +-
3204  sound/pci/asihpi/hpi_internal.h                    |   19 +-
3205  sound/pci/asihpi/hpicmn.c                          |   10 +-
3206  sound/pci/asihpi/hpicmn.h                          |    2 +
3207  sound/pci/asihpi/hpifunc.c                         |   27 -
3208  sound/pci/asihpi/hpimsgx.c                         |   31 +-
3209  sound/pci/asihpi/hpioctl.c                         |   63 +-
3210  sound/pci/emu10k1/emumixer.c                       |   10 +-
3211  sound/pci/es1968.c                                 |  125 +
3212  sound/pci/fm801.c                                  |    1 -
3213  sound/pci/hda/hda_codec.c                          |   69 +-
3214  sound/pci/hda/hda_codec.h                          |    2 +
3215  sound/pci/hda/hda_intel.c                          |    3 +
3216  sound/pci/hda/patch_realtek.c                      |  250 +-
3217  sound/pci/hda/patch_sigmatel.c                     |    7 +
3218  sound/pci/hda/patch_via.c                          | 1240 ++++---
3219  sound/ppc/tumbler.c                                |    2 +-
3220  sound/soc/atmel/sam9g20_wm8731.c                   |    2 +-
3221  sound/soc/au1x/db1200.c                            |    2 +-
3222  sound/soc/blackfin/bf5xx-ac97-pcm.c                |   13 +-
3223  sound/soc/blackfin/bf5xx-ac97.c                    |  166 +-
3224  sound/soc/blackfin/bf5xx-ad1836.c                  |   42 +-
3225  sound/soc/blackfin/bf5xx-ad193x.c                  |   56 +-
3226  sound/soc/blackfin/bf5xx-ad1980.c                  |   45 +-
3227  sound/soc/blackfin/bf5xx-ad73311.c                 |   42 +-
3228  sound/soc/blackfin/bf5xx-i2s-pcm.c                 |   23 +-
3229  sound/soc/blackfin/bf5xx-i2s.c                     |  172 +-
3230  sound/soc/blackfin/bf5xx-sport.c                   |  159 +-
3231  sound/soc/blackfin/bf5xx-sport.h                   |   16 +-
3232  sound/soc/blackfin/bf5xx-ssm2602.c                 |   42 +-
3233  sound/soc/blackfin/bf5xx-tdm-pcm.c                 |   23 +-
3234  sound/soc/blackfin/bf5xx-tdm.c                     |  110 +-
3235  sound/soc/codecs/Kconfig                           |   16 +-
3236  sound/soc/codecs/Makefile                          |    8 +-
3237  sound/soc/codecs/ad193x.c                          |   23 +-
3238  sound/soc/codecs/ad1980.c                          |    2 +-
3239  sound/soc/codecs/ad73311.c                         |    2 +-
3240  sound/soc/codecs/ak4535.c                          |   19 +-
3241  sound/soc/codecs/ak4671.c                          |   18 +-
3242  sound/soc/codecs/cx20442.c                         |   18 +-
3243  sound/soc/codecs/jz4740.c                          |   18 +-
3244  sound/soc/codecs/max98088.c                        |   25 +-
3245  sound/soc/codecs/max98095.c                        | 2009 +++++++++++
3246  sound/soc/codecs/max98095.h                        |  284 ++
3247  sound/soc/codecs/sn95031.c                         |   17 +-
3248  sound/soc/codecs/ssm2602.c                         |  196 +-
3249  sound/soc/codecs/tlv320aic23.c                     |   19 +-
3250  sound/soc/codecs/wm1250-ev1.c                      |  108 +
3251  sound/soc/codecs/wm8711.c                          |   18 +-
3252  sound/soc/codecs/wm8728.c                          |   18 +-
3253  sound/soc/codecs/wm8731.c                          |   22 +-
3254  sound/soc/codecs/wm8903.c                          |   18 +-
3255  sound/soc/codecs/wm8915.c                          | 2924 +++++++++++++++
3256  sound/soc/codecs/wm8915.h                          | 3717 ++++++++++++++++++++
3257  sound/soc/codecs/wm8958-dsp2.c                     | 1028 ++++++
3258  sound/soc/codecs/wm8994.c                          |  364 +--
3259  sound/soc/codecs/wm8994.h                          |   97 +
3260  sound/soc/codecs/wm9705.c                          |   18 +-
3261  sound/soc/codecs/wm9712.c                          |   18 +-
3262  sound/soc/codecs/wm9713.c                          |   19 +-
3263  sound/soc/imx/imx-ssi.c                            |    6 -
3264  sound/soc/jz4740/qi_lb60.c                         |   46 +-
3265  sound/soc/mid-x86/sst_platform.c                   |    4 +
3266  sound/soc/pxa/corgi.c                              |    2 +-
3267  sound/soc/pxa/poodle.c                             |    2 +-
3268  sound/soc/pxa/spitz.c                              |   41 +-
3269  sound/soc/samsung/Kconfig                          |   15 +
3270  sound/soc/samsung/Makefile                         |    4 +
3271  sound/soc/samsung/smdk_wm8580pcm.c                 |  206 ++
3272  sound/soc/samsung/speyside.c                       |  333 ++
3273  sound/soc/soc-cache.c                              |  572 +--
3274  sound/soc/soc-core.c                               |   80 +-
3275  sound/soc/soc-dapm.c                               |  181 +-
3276  sound/soc/soc-jack.c                               |    2 +-
3277  sound/soc/tegra/Kconfig                            |   20 +-
3278  sound/soc/tegra/Makefile                           |   12 +-
3279  sound/soc/tegra/harmony.c                          |  394 ---
3280  sound/soc/tegra/tegra_wm8903.c                     |  495 +++
3281  sound/usb/6fire/control.c                          |  105 +
3282  sound/usb/6fire/control.h                          |   17 +
3283  sound/usb/6fire/firmware.c                         |   44 +-
3284  sound/usb/6fire/pcm.c                              |   97 +-
3285  sound/usb/Kconfig                                  |    9 +-
3286  sound/usb/mixer_quirks.c                           |   17 +
3287  sound/usb/quirks-table.h                           |    6 +
3288  sound/usb/quirks.c                                 |    1 +
3289  107 files changed, 14159 insertions(+), 3615 deletions(-)
3290  rename arch/arm/mach-tegra/include/mach/{harmony_audio.h => tegra_wm8903_pdata.h} (83%)
3291  delete mode 100644 drivers/media/radio/radio-maestro.c
3292  create mode 100644 include/sound/max98095.h
3293  create mode 100644 include/sound/wm8915.h
3294  create mode 100644 sound/soc/codecs/max98095.c
3295  create mode 100644 sound/soc/codecs/max98095.h
3296  create mode 100644 sound/soc/codecs/wm1250-ev1.c
3297  create mode 100644 sound/soc/codecs/wm8915.c
3298  create mode 100644 sound/soc/codecs/wm8915.h
3299  create mode 100644 sound/soc/codecs/wm8958-dsp2.c
3300  create mode 100644 sound/soc/samsung/smdk_wm8580pcm.c
3301  create mode 100644 sound/soc/samsung/speyside.c
3302  delete mode 100644 sound/soc/tegra/harmony.c
3303  create mode 100644 sound/soc/tegra/tegra_wm8903.c
3304 Merging sound-asoc/for-next
3305 $ git merge sound-asoc/for-next
3306 Merge made by recursive.
3307  arch/arm/mach-tegra/Kconfig        |    3 +
3308  include/sound/max98095.h           |   28 +++
3309  include/sound/soc-dapm.h           |    2 +-
3310  sound/soc/codecs/max98095.c        |  391 ++++++++++++++++++++++++++++++++++++
3311  sound/soc/codecs/max98095.h        |   15 ++
3312  sound/soc/codecs/wm8903.c          |   23 ++-
3313  sound/soc/soc-cache.c              |    1 -
3314  sound/soc/soc-core.c               |    4 +-
3315  sound/soc/soc-dapm.c               |    8 +-
3316  sound/soc/tegra/Kconfig            |    9 +-
3317  sound/soc/tegra/tegra_asoc_utils.c |    9 +-
3318  sound/soc/tegra/tegra_asoc_utils.h |    2 +-
3319  sound/soc/tegra/tegra_wm8903.c     |   84 +++-----
3320  13 files changed, 514 insertions(+), 65 deletions(-)
3321 Merging cpufreq/next
3322 $ git merge cpufreq/next
3323 Merge made by recursive.
3324  drivers/cpufreq/cpufreq_stats.c |    3 +--
3325  1 files changed, 1 insertions(+), 2 deletions(-)
3326 Merging quilt/rr
3327 $ git merge quilt/rr
3328 Auto-merging arch/s390/mm/pageattr.c
3329 Auto-merging drivers/char/virtio_console.c
3330 Merge made by recursive.
3331  arch/s390/include/asm/cacheflush.h |    1 +
3332  arch/s390/mm/pageattr.c            |    5 ++
3333  drivers/block/virtio_blk.c         |   88 +++++++++++++++++++++++++++++++----
3334  drivers/char/virtio_console.c      |    5 --
3335  drivers/virtio/virtio_balloon.c    |   21 +++-----
3336  fs/debugfs/file.c                  |   17 ++-----
3337  include/linux/module.h             |   28 ++++++-----
3338  include/linux/moduleparam.h        |    7 ++-
3339  include/linux/string.h             |    1 +
3340  kernel/module.c                    |   29 ++++++------
3341  kernel/params.c                    |   23 ++++-----
3342  lib/string.c                       |   29 ++++++++++++
3343  12 files changed, 170 insertions(+), 84 deletions(-)
3344 Merging input/next
3345 $ git merge input/next
3346 Auto-merging drivers/input/touchscreen/Kconfig
3347 Merge made by recursive.
3348  drivers/input/keyboard/gpio_keys.c       |   11 +-
3349  drivers/input/touchscreen/Kconfig        |   12 ++
3350  drivers/input/touchscreen/Makefile       |    1 +
3351  drivers/input/touchscreen/atmel_mxt_ts.c |   92 +++++++----
3352  drivers/input/touchscreen/max11801_ts.c  |  272 ++++++++++++++++++++++++++++++
3353  include/linux/gpio_keys.h                |    8 +-
3354  6 files changed, 360 insertions(+), 36 deletions(-)
3355  create mode 100644 drivers/input/touchscreen/max11801_ts.c
3356 Merging input-mt/next
3357 $ git merge input-mt/next
3358 Already up-to-date.
3359 Merging lsm/for-next
3360 $ git merge lsm/for-next
3361 Already up-to-date.
3362 Merging block/for-next
3363 $ git merge block/for-next
3364 Already up-to-date.
3365 Merging quilt/device-mapper
3366 $ git merge quilt/device-mapper
3367 Already up-to-date.
3368 Merging embedded/master
3369 $ git merge embedded/master
3370 Already up-to-date.
3371 Merging firmware/master
3372 $ git merge firmware/master
3373 Already up-to-date.
3374 Merging pcmcia/master
3375 $ git merge pcmcia/master
3376 Already up-to-date.
3377 Merging battery/master
3378 $ git merge battery/master
3379 Merge made by recursive.
3380  arch/arm/mach-omap2/board-rx51-peripherals.c |   27 ++-
3381  drivers/power/Kconfig                        |    9 +
3382  drivers/power/Makefile                       |    1 +
3383  drivers/power/gpio-charger.c                 |   15 +
3384  drivers/power/isp1704_charger.c              |   22 ++
3385  drivers/power/max8903_charger.c              |  391 ++++++++++++++++++++++++++
3386  include/linux/power/isp1704_charger.h        |   29 ++
3387  include/linux/power/max8903_charger.h        |   57 ++++
3388  8 files changed, 549 insertions(+), 2 deletions(-)
3389  create mode 100644 drivers/power/max8903_charger.c
3390  create mode 100644 include/linux/power/isp1704_charger.h
3391  create mode 100644 include/linux/power/max8903_charger.h
3392 Merging leds/for-mm
3393 $ git merge leds/for-mm
3394 Resolved 'drivers/leds/Kconfig' using previous resolution.
3395 Auto-merging drivers/leds/Kconfig
3396 CONFLICT (content): Merge conflict in drivers/leds/Kconfig
3397 Automatic merge failed; fix conflicts and then commit the result.
3398 $ git commit -v -a
3399 [master d384b64] Merge remote-tracking branch 'leds/for-mm'
3400 $ git diff -M --stat --summary HEAD^..
3401 Merging backlight/for-mm
3402 $ git merge backlight/for-mm
3403 Already up-to-date.
3404 Merging mmc/mmc-next
3405 $ git merge mmc/mmc-next
3406 Auto-merging drivers/mmc/card/mmc_test.c
3407 Auto-merging drivers/mmc/core/mmc.c
3408 Auto-merging drivers/mmc/core/mmc_ops.c
3409 Auto-merging drivers/mmc/host/tmio_mmc_pio.c
3410 Merge made by recursive.
3411  Documentation/mmc/00-INDEX               |    2 +
3412  Documentation/mmc/mmc-dev-attrs.txt      |   10 +
3413  Documentation/mmc/mmc-dev-parts.txt      |   27 ++
3414  arch/arm/mach-tegra/include/mach/sdhci.h |    1 +
3415  drivers/mmc/card/block.c                 |  457 +++++++++++++++++++++++++-----
3416  drivers/mmc/card/mmc_test.c              |   41 +--
3417  drivers/mmc/card/queue.c                 |    8 -
3418  drivers/mmc/core/bus.c                   |    1 +
3419  drivers/mmc/core/core.c                  |   53 ++--
3420  drivers/mmc/core/core.h                  |    2 -
3421  drivers/mmc/core/host.c                  |   13 +-
3422  drivers/mmc/core/mmc.c                   |   39 +++-
3423  drivers/mmc/core/mmc_ops.c               |   80 ++---
3424  drivers/mmc/core/mmc_ops.h               |    1 -
3425  drivers/mmc/core/quirks.c                |   89 +++---
3426  drivers/mmc/core/sd_ops.c                |   48 +---
3427  drivers/mmc/core/sdio.c                  |   20 +-
3428  drivers/mmc/core/sdio_ops.c              |   18 +-
3429  drivers/mmc/host/Kconfig                 |    2 +-
3430  drivers/mmc/host/omap.c                  |    2 +-
3431  drivers/mmc/host/sdhci-pci.c             |   50 ++--
3432  drivers/mmc/host/sdhci-tegra.c           |    2 +
3433  drivers/mmc/host/sdhci.c                 |  101 +++++--
3434  drivers/mmc/host/sdhci.h                 |    8 +
3435  drivers/mmc/host/tmio_mmc_pio.c          |   10 +-
3436  include/linux/mmc/card.h                 |  109 +++++++-
3437  include/linux/mmc/core.h                 |    3 +-
3438  include/linux/mmc/host.h                 |    7 +-
3439  include/linux/mmc/mmc.h                  |   11 +
3440  include/linux/mmc/sdhci.h                |    2 +
3441  30 files changed, 869 insertions(+), 348 deletions(-)
3442  create mode 100644 Documentation/mmc/mmc-dev-parts.txt
3443 Merging kgdb/kgdb-next
3444 $ git merge kgdb/kgdb-next
3445 Already up-to-date.
3446 Merging slab/for-next
3447 $ git merge slab/for-next
3448 Auto-merging mm/slub.c
3449 Merge made by recursive.
3450  mm/slub.c |   93 ++++++++++++++++++++++++++++++++----------------------------
3451  1 files changed, 50 insertions(+), 43 deletions(-)
3452 Merging uclinux/for-next
3453 $ git merge uclinux/for-next
3454 Already up-to-date.
3455 Merging md/for-next
3456 $ git merge md/for-next
3457 Already up-to-date.
3458 Merging mfd/for-next
3459 $ git merge mfd/for-next
3460 Resolved 'drivers/mfd/mfd-core.c' using previous resolution.
3461 Resolved 'include/linux/mfd/core.h' using previous resolution.
3462 Auto-merging drivers/mfd/mfd-core.c
3463 CONFLICT (content): Merge conflict in drivers/mfd/mfd-core.c
3464 Auto-merging include/linux/mfd/core.h
3465 CONFLICT (content): Merge conflict in include/linux/mfd/core.h
3466 Automatic merge failed; fix conflicts and then commit the result.
3467 $ git commit -v -a
3468 [master 1ca352c] Merge remote-tracking branch 'mfd/for-next'
3469 $ git diff -M --stat --summary HEAD^..
3470  drivers/dma/timb_dma.c                 |    3 +-
3471  drivers/gpio/janz-ttl.c                |    3 +-
3472  drivers/gpio/rdc321x-gpio.c            |    3 +-
3473  drivers/gpio/timbgpio.c                |    6 +-
3474  drivers/i2c/busses/i2c-ocores.c        |    3 +-
3475  drivers/i2c/busses/i2c-xiic.c          |    3 +-
3476  drivers/input/misc/twl4030-vibra.c     |    3 +-
3477  drivers/leds/leds-88pm860x.c           |    7 +--
3478  drivers/leds/leds-mc13783.c            |    7 +--
3479  drivers/media/radio/radio-timb.c       |    3 +-
3480  drivers/media/radio/radio-wl1273.c     |    2 +-
3481  drivers/media/video/timblogiw.c        |    3 +-
3482  drivers/mfd/88pm860x-core.c            |   18 +++++--
3483  drivers/mfd/ab3100-core.c              |    6 ++-
3484  drivers/mfd/ab3550-core.c              |    6 ++-
3485  drivers/mfd/asic3.c                    |    8 ++-
3486  drivers/mfd/davinci_voicecodec.c       |    6 ++-
3487  drivers/mfd/htc-pasic3.c               |    5 ++-
3488  drivers/mfd/janz-cmodio.c              |    3 +-
3489  drivers/mfd/mc13xxx-core.c             |   12 +++--
3490  drivers/mfd/mfd-core.c                 |    7 +++
3491  drivers/mfd/omap-usb-host.c            |   16 +++----
3492  drivers/mfd/rdc321x-southbridge.c      |    6 ++-
3493  drivers/mfd/t7l66xb.c                  |    6 ++-
3494  drivers/mfd/tc6387xb.c                 |    3 +-
3495  drivers/mfd/tc6393xb.c                 |   10 +++-
3496  drivers/mfd/timberdale.c               |   81 +++++++++++++++++++++-----------
3497  drivers/mfd/tps6105x.c                 |    3 +-
3498  drivers/mfd/twl4030-codec.c            |    6 ++-
3499  drivers/mfd/wl1273-core.c              |    7 ++-
3500  drivers/mfd/wm831x-core.c              |   13 +++++-
3501  drivers/mfd/wm831x-irq.c               |   27 ++++++-----
3502  drivers/mfd/wm8400-core.c              |    3 +-
3503  drivers/mmc/host/tmio_mmc.c            |    2 +-
3504  drivers/mtd/nand/tmio_nand.c           |    2 +-
3505  drivers/net/can/janz-ican3.c           |    3 +-
3506  drivers/net/ks8842.c                   |    3 +-
3507  drivers/regulator/88pm8607.c           |    7 +--
3508  drivers/regulator/ab3100.c             |    3 +-
3509  drivers/regulator/mc13783-regulator.c  |    7 ++-
3510  drivers/regulator/mc13892-regulator.c  |    7 ++-
3511  drivers/regulator/tps6105x-regulator.c |    4 +-
3512  drivers/spi/xilinx_spi.c               |    3 +-
3513  drivers/video/backlight/88pm860x_bl.c  |    7 +--
3514  drivers/video/tmiofb.c                 |   12 ++---
3515  drivers/w1/masters/ds1wm.c             |   12 ++++-
3516  drivers/watchdog/rdc321x_wdt.c         |    3 +-
3517  include/linux/mfd/abx500.h             |    1 +
3518  include/linux/mfd/core.h               |   23 +--------
3519  include/linux/mfd/wm831x/core.h        |   26 ----------
3520  include/linux/mfd/wm831x/pdata.h       |    4 ++
3521  sound/soc/codecs/cq93vc.c              |    3 +-
3522  sound/soc/codecs/twl4030.c             |    6 +--
3523  sound/soc/codecs/wl1273.c              |    3 +-
3524  sound/soc/codecs/wm8400.c              |    2 +-
3525  sound/soc/davinci/davinci-vcif.c       |    2 +-
3526  56 files changed, 229 insertions(+), 214 deletions(-)
3527 Merging hdlc/hdlc-next
3528 $ git merge hdlc/hdlc-next
3529 Already up-to-date.
3530 Merging drm/drm-next
3531 $ git merge drm/drm-next
3532 Already up-to-date.
3533 Merging fbdev/master
3534 $ git merge fbdev/master
3535 Auto-merging drivers/video/Kconfig
3536 Merge made by recursive.
3537  drivers/video/Kconfig |    8 ++
3538  drivers/video/s3fb.c  |  209 +++++++++++++++++++++++++++++++++++++++++++++++--
3539  2 files changed, 210 insertions(+), 7 deletions(-)
3540 Merging viafb/viafb-next
3541 $ git merge viafb/viafb-next
3542 Auto-merging drivers/video/Kconfig
3543 Auto-merging drivers/video/via/viafbdev.c
3544 Auto-merging drivers/video/via/viafbdev.h
3545 Merge made by recursive.
3546  drivers/video/Kconfig         |   11 +
3547  drivers/video/via/Makefile    |    2 +-
3548  drivers/video/via/chip.h      |    6 -
3549  drivers/video/via/dvi.c       |  160 +----------
3550  drivers/video/via/dvi.h       |    2 +-
3551  drivers/video/via/global.c    |    4 -
3552  drivers/video/via/global.h    |    2 -
3553  drivers/video/via/hw.c        |  624 ++++++++++++++---------------------------
3554  drivers/video/via/hw.h        |   15 +-
3555  drivers/video/via/lcd.c       |   23 +-
3556  drivers/video/via/lcd.h       |    2 +-
3557  drivers/video/via/share.h     |    9 +-
3558  drivers/video/via/via_clock.c |  349 +++++++++++++++++++++++
3559  drivers/video/via/via_clock.h |   76 +++++
3560  drivers/video/via/viafbdev.c  |   23 +-
3561  drivers/video/via/viafbdev.h  |    4 -
3562  drivers/video/via/viamode.c   |   29 +--
3563  17 files changed, 680 insertions(+), 661 deletions(-)
3564  create mode 100644 drivers/video/via/via_clock.c
3565  create mode 100644 drivers/video/via/via_clock.h
3566 Merging omap_dss2/for-next
3567 $ git merge omap_dss2/for-next
3568 Merge made by recursive.
3569  arch/arm/mach-omap2/board-4430sdp.c                |  153 +++++++++-
3570  arch/arm/mach-omap2/display.c                      |   75 ++++--
3571  arch/arm/plat-omap/include/plat/display.h          |   53 +++-
3572  drivers/video/omap2/displays/panel-generic-dpi.c   |    4 +-
3573  .../video/omap2/displays/panel-sharp-ls037v7dw01.c |    4 +-
3574  drivers/video/omap2/displays/panel-taal.c          |    4 +-
3575  .../video/omap2/displays/panel-tpo-td043mtea1.c    |    8 +-
3576  drivers/video/omap2/dss/Kconfig                    |   31 ++-
3577  drivers/video/omap2/dss/core.c                     |   20 +-
3578  drivers/video/omap2/dss/dispc.c                    |   19 +-
3579  drivers/video/omap2/dss/display.c                  |   44 ++-
3580  drivers/video/omap2/dss/dpi.c                      |   85 +++---
3581  drivers/video/omap2/dss/dsi.c                      |  304 ++++++++++++--------
3582  drivers/video/omap2/dss/dss.c                      |   77 +++--
3583  drivers/video/omap2/dss/dss.h                      |   23 +-
3584  drivers/video/omap2/dss/dss_features.c             |   31 ++-
3585  drivers/video/omap2/dss/dss_features.h             |   34 ++-
3586  drivers/video/omap2/dss/hdmi.c                     |   35 ++--
3587  drivers/video/omap2/dss/manager.c                  |    2 +-
3588  drivers/video/omap2/dss/overlay.c                  |   43 ++-
3589  drivers/video/omap2/dss/rfbi.c                     |    7 +-
3590  drivers/video/omap2/dss/sdi.c                      |    2 +-
3591  drivers/video/omap2/dss/venc.c                     |   28 ++-
3592  drivers/video/omap2/omapfb/omapfb-ioctl.c          |   12 +-
3593  drivers/video/omap2/omapfb/omapfb-main.c           |  105 +++++---
3594  drivers/video/omap2/omapfb/omapfb-sysfs.c          |   21 +-
3595  26 files changed, 792 insertions(+), 432 deletions(-)
3596 Merging voltage/for-next
3597 $ git merge voltage/for-next
3598 Auto-merging drivers/regulator/core.c
3599 Auto-merging drivers/regulator/tps6105x-regulator.c
3600 Merge made by recursive.
3601  drivers/regulator/core.c               |   24 +++--
3602  drivers/regulator/tps6105x-regulator.c |    1 +
3603  drivers/regulator/twl-regulator.c      |  209 ++++++++++++++++++++++++--------
3604  3 files changed, 175 insertions(+), 59 deletions(-)
3605 Merging security-testing/next
3606 $ git merge security-testing/next
3607 Merge made by recursive.
3608  include/linux/capability.h       |    7 +--
3609  include/linux/init_task.h        |    7 ---
3610  include/linux/key.h              |   13 +++++
3611  include/linux/kmod.h             |    3 +
3612  kernel/capability.c              |    4 --
3613  kernel/cred.c                    |    6 +-
3614  kernel/kmod.c                    |  100 ++++++++++++++++++++++++++++++++++++++
3615  kernel/sysctl.c                  |    6 ++
3616  net/dns_resolver/dns_key.c       |   10 ++--
3617  security/Kconfig                 |    1 +
3618  security/commoncap.c             |   13 ++---
3619  security/keys/internal.h         |    4 +-
3620  security/keys/keyctl.c           |    6 ++
3621  security/keys/keyring.c          |   37 +++++++++-----
3622  security/keys/proc.c             |    2 +-
3623  security/keys/process_keys.c     |   12 +++--
3624  security/keys/request_key.c      |    3 +-
3625  security/keys/request_key_auth.c |    3 +-
3626  security/keys/user_defined.c     |    4 +-
3627  security/tomoyo/common.c         |   17 +++++--
3628  security/tomoyo/file.c           |    1 -
3629  security/tomoyo/memory.c         |    1 +
3630  security/tomoyo/mount.c          |    1 +
3631  23 files changed, 198 insertions(+), 63 deletions(-)
3632 Merging selinux/master
3633 $ git merge selinux/master
3634 Recorded preimage for 'security/selinux/hooks.c'
3635 Recorded preimage for 'security/smack/smack_lsm.c'
3636 Auto-merging MAINTAINERS
3637 Auto-merging security/selinux/hooks.c
3638 CONFLICT (content): Merge conflict in security/selinux/hooks.c
3639 Auto-merging security/selinux/ss/services.c
3640 Auto-merging security/smack/smack_lsm.c
3641 CONFLICT (content): Merge conflict in security/smack/smack_lsm.c
3642 Automatic merge failed; fix conflicts and then commit the result.
3643 $ git commit -v -a
3644 Recorded resolution for 'security/selinux/hooks.c'.
3645 Recorded resolution for 'security/smack/smack_lsm.c'.
3646 [master dc37ee8] Merge remote-tracking branch 'selinux/master'
3647 $ git diff -M --stat --summary HEAD^..
3648  MAINTAINERS                         |    3 +-
3649  include/linux/lsm_audit.h           |   11 +++--
3650  security/lsm_audit.c                |   59 ++++++++++++++++----------
3651  security/selinux/avc.c              |   36 +++++++++++++---
3652  security/selinux/hooks.c            |   78 ++++++++++++++++++-----------------
3653  security/selinux/include/avc.h      |   18 ++++++--
3654  security/selinux/include/security.h |    9 ++--
3655  security/selinux/netnode.c          |    1 +
3656  security/selinux/selinuxfs.c        |   16 ++++++-
3657  security/selinux/ss/policydb.c      |   39 ++++++++++++-----
3658  security/selinux/ss/policydb.h      |    3 +-
3659  security/selinux/ss/services.c      |   39 ++++++++---------
3660  security/smack/smack.h              |   11 +----
3661  security/smack/smack_lsm.c          |   48 ++++++++++++---------
3662  14 files changed, 225 insertions(+), 146 deletions(-)
3663 Merging lblnet/master
3664 $ git merge lblnet/master
3665 Already up-to-date.
3666 Merging agp/agp-next
3667 $ git merge agp/agp-next
3668 Merge made by recursive.
3669 Merging watchdog/master
3670 $ git merge watchdog/master
3671 Merge made by recursive.
3672  drivers/watchdog/iTCO_wdt.c |   97 +++++++++++++++++++++++++++++++++++++++++++
3673  1 files changed, 97 insertions(+), 0 deletions(-)
3674 Merging bdev/master
3675 $ git merge bdev/master
3676 Already up-to-date.
3677 Merging dwmw2-iommu/master
3678 $ git merge dwmw2-iommu/master
3679 Already up-to-date.
3680 Merging cputime/cputime
3681 $ git merge cputime/cputime
3682 Already up-to-date.
3683 Merging osd/linux-next
3684 $ git merge osd/linux-next
3685 Already up-to-date.
3686 Merging jc_docs/docs-next
3687 $ git merge jc_docs/docs-next
3688 Already up-to-date.
3689 Merging nommu/master
3690 $ git merge nommu/master
3691 Already up-to-date.
3692 Merging trivial/for-next
3693 $ git merge trivial/for-next
3694 Auto-merging CREDITS
3695 Auto-merging MAINTAINERS
3696 Auto-merging arch/arm/mach-at91/at91cap9_devices.c
3697 Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
3698 Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
3699 Auto-merging arch/arm/mach-tegra/tegra2_clocks.c
3700 Auto-merging arch/mips/sgi-ip22/ip22-int.c
3701 Auto-merging drivers/gpu/drm/radeon/radeon_fence.c
3702 Auto-merging drivers/gpu/drm/radeon/radeon_ring.c
3703 Auto-merging drivers/net/can/softing/softing_main.c
3704 Auto-merging drivers/net/sgiseeq.c
3705 Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
3706 Auto-merging drivers/net/wireless/rtlwifi/core.c
3707 Auto-merging drivers/net/wireless/rtlwifi/pci.c
3708 Auto-merging drivers/scsi/be2iscsi/be_main.c
3709 Auto-merging drivers/scsi/lpfc/lpfc_bsg.c
3710 Auto-merging drivers/scsi/qla2xxx/qla_isr.c
3711 Auto-merging drivers/target/target_core_alua.c
3712 Auto-merging drivers/target/target_core_transport.c
3713 Auto-merging drivers/tty/serial/mrst_max3110.c
3714 Auto-merging drivers/tty/tty_ioctl.c
3715 Auto-merging fs/logfs/readwrite.c
3716 Auto-merging fs/ocfs2/refcounttree.c
3717 Auto-merging fs/partitions/ldm.c
3718 Auto-merging fs/ufs/inode.c
3719 Auto-merging include/video/newport.h
3720 Auto-merging lib/Kconfig.debug
3721 Auto-merging lib/vsprintf.c
3722 Auto-merging mm/hugetlb.c
3723 Auto-merging mm/page_alloc.c
3724 Auto-merging net/netfilter/ipset/ip_set_bitmap_ip.c
3725 Auto-merging security/selinux/selinuxfs.c
3726 Merge made by recursive.
3727  CREDITS                                     |    2 +-
3728  Documentation/stable_api_nonsense.txt       |    2 +-
3729  Documentation/sysctl/vm.txt                 |    4 ++--
3730  MAINTAINERS                                 |    3 ++-
3731  arch/Kconfig                                |    3 ---
3732  arch/arm/mach-at91/at91cap9_devices.c       |    2 +-
3733  arch/arm/mach-at91/at91sam9g45_devices.c    |    2 +-
3734  arch/arm/mach-at91/at91sam9rl_devices.c     |    2 +-
3735  arch/arm/mach-tegra/tegra2_clocks.c         |    2 +-
3736  arch/arm/mach-u300/gpio.c                   |    7 +++----
3737  arch/arm/mach-ux500/mbox-db5500.c           |    6 ++----
3738  arch/arm/plat-iop/time.c                    |    1 -
3739  arch/m68k/include/asm/MC68EZ328.h           |    2 +-
3740  arch/m68k/include/asm/MC68VZ328.h           |    2 +-
3741  arch/mips/fw/arc/cmdline.c                  |    2 +-
3742  arch/mips/fw/arc/env.c                      |    2 +-
3743  arch/mips/fw/arc/identify.c                 |    2 +-
3744  arch/mips/fw/arc/init.c                     |    2 +-
3745  arch/mips/fw/arc/misc.c                     |    2 +-
3746  arch/mips/fw/arc/salone.c                   |    2 +-
3747  arch/mips/fw/arc/time.c                     |    2 +-
3748  arch/mips/fw/arc/tree.c                     |    2 +-
3749  arch/mips/include/asm/asmmacro-32.h         |    2 +-
3750  arch/mips/include/asm/asmmacro-64.h         |    2 +-
3751  arch/mips/include/asm/cpu.h                 |    2 +-
3752  arch/mips/include/asm/r4kcache.h            |    2 +-
3753  arch/mips/include/asm/sgialib.h             |    2 +-
3754  arch/mips/include/asm/sgiarcs.h             |    2 +-
3755  arch/mips/kernel/octeon_switch.S            |    2 +-
3756  arch/mips/kernel/r2300_fpu.S                |    2 +-
3757  arch/mips/kernel/r2300_switch.S             |    2 +-
3758  arch/mips/kernel/r4k_fpu.S                  |    2 +-
3759  arch/mips/kernel/r4k_switch.S               |    2 +-
3760  arch/mips/kernel/r6000_fpu.S                |    2 +-
3761  arch/mips/mm/c-r3k.c                        |    2 +-
3762  arch/mips/mm/c-r4k.c                        |    2 +-
3763  arch/mips/mm/c-tx39.c                       |    2 +-
3764  arch/mips/mm/sc-ip22.c                      |    2 +-
3765  arch/mips/mm/sc-r5k.c                       |    2 +-
3766  arch/mips/mm/tlb-r3k.c                      |    2 +-
3767  arch/mips/mm/tlb-r4k.c                      |    2 +-
3768  arch/mips/mm/tlb-r8k.c                      |    2 +-
3769  arch/mips/rb532/gpio.c                      |    2 +-
3770  arch/mips/sgi-ip22/ip22-hpc.c               |    2 +-
3771  arch/mips/sgi-ip22/ip22-int.c               |    2 +-
3772  arch/mips/sgi-ip22/ip22-mc.c                |    2 +-
3773  arch/mips/sgi-ip22/ip22-setup.c             |    2 +-
3774  arch/s390/hypfs/hypfs.h                     |    2 +-
3775  arch/um/drivers/mmapper_kern.c              |    2 +-
3776  arch/xtensa/configs/s6105_defconfig         |    1 -
3777  drivers/base/memory.c                       |    9 ++++-----
3778  drivers/gpio/langwell_gpio.c                |    2 +-
3779  drivers/gpu/drm/radeon/radeon_fence.c       |    2 +-
3780  drivers/gpu/drm/radeon/radeon_ring.c        |    2 +-
3781  drivers/gpu/drm/ttm/ttm_object.c            |    2 +-
3782  drivers/leds/leds-mc13783.c                 |    2 +-
3783  drivers/misc/cs5535-mfgpt.c                 |    4 ++--
3784  drivers/misc/ibmasm/ibmasmfs.c              |    2 +-
3785  drivers/net/can/softing/softing_main.c      |    2 +-
3786  drivers/net/sgiseeq.c                       |    2 +-
3787  drivers/net/sgiseeq.h                       |    2 +-
3788  drivers/net/wireless/iwlwifi/iwl-agn.c      |    2 +-
3789  drivers/net/wireless/rtlwifi/core.c         |    2 +-
3790  drivers/net/wireless/rtlwifi/pci.c          |    2 +-
3791  drivers/net/wireless/rtlwifi/rtl8192ce/hw.c |    4 ++--
3792  drivers/power/intel_mid_battery.c           |    2 +-
3793  drivers/scsi/be2iscsi/be_main.c             |    4 ++--
3794  drivers/scsi/lpfc/lpfc_bsg.c                |    2 +-
3795  drivers/scsi/pm8001/pm8001_init.c           |    2 +-
3796  drivers/scsi/qla2xxx/qla_isr.c              |    4 ++--
3797  drivers/scsi/sgiwd93.c                      |    2 +-
3798  drivers/target/target_core_alua.c           |    4 ++--
3799  drivers/target/target_core_transport.c      |    2 +-
3800  drivers/tty/serial/mrst_max3110.c           |    2 +-
3801  drivers/tty/tty_ioctl.c                     |    2 +-
3802  drivers/video/console/newport_con.c         |    2 +-
3803  drivers/video/msm/mddi.c                    |    2 +-
3804  drivers/video/mxsfb.c                       |    2 +-
3805  drivers/watchdog/bcm63xx_wdt.c              |    2 +-
3806  drivers/xen/evtchn.c                        |    2 +-
3807  drivers/xen/swiotlb-xen.c                   |    2 +-
3808  fs/logfs/readwrite.c                        |    2 +-
3809  fs/ocfs2/refcounttree.c                     |    2 +-
3810  fs/partitions/ldm.c                         |    2 +-
3811  fs/ufs/inode.c                              |    2 +-
3812  include/linux/leds-regulator.h              |    2 +-
3813  include/video/newport.h                     |    2 +-
3814  kernel/Kconfig.locks                        |    2 +-
3815  kernel/pm_qos_params.c                      |    2 +-
3816  lib/Kconfig.debug                           |    3 ++-
3817  lib/vsprintf.c                              |    9 +++------
3818  mm/hugetlb.c                                |    2 +-
3819  mm/page_alloc.c                             |    2 +-
3820  net/netfilter/ipset/ip_set_bitmap_ip.c      |    2 +-
3821  net/sunrpc/addr.c                           |    2 +-
3822  security/selinux/selinuxfs.c                |    8 ++++----
3823  tools/power/x86/turbostat/turbostat.c       |    2 +-
3824  97 files changed, 113 insertions(+), 123 deletions(-)
3825 Merging audit/for-next
3826 $ git merge audit/for-next
3827 Already up-to-date.
3828 Merging suspend/linux-next
3829 $ git merge suspend/linux-next
3830 Merge made by recursive.
3831  arch/arm/common/vic.c                     |   69 ++++------
3832  arch/arm/include/asm/mach/time.h          |    1 -
3833  arch/arm/kernel/leds.c                    |   28 +++--
3834  arch/arm/kernel/time.c                    |   35 ++----
3835  arch/arm/mach-exynos4/pm.c                |   45 ++++---
3836  arch/arm/mach-integrator/integrator_ap.c  |   26 ++---
3837  arch/arm/mach-pxa/balloon3.c              |    1 -
3838  arch/arm/mach-pxa/clock-pxa2xx.c          |   18 +--
3839  arch/arm/mach-pxa/clock-pxa3xx.c          |   17 +--
3840  arch/arm/mach-pxa/clock.h                 |    7 +-
3841  arch/arm/mach-pxa/cm-x270.c               |    1 -
3842  arch/arm/mach-pxa/cm-x2xx.c               |   23 +---
3843  arch/arm/mach-pxa/colibri-evalboard.c     |    1 -
3844  arch/arm/mach-pxa/colibri-pxa270-income.c |    1 -
3845  arch/arm/mach-pxa/colibri-pxa270.c        |    1 -
3846  arch/arm/mach-pxa/generic.h               |    8 +-
3847  arch/arm/mach-pxa/irq.c                   |   17 +--
3848  arch/arm/mach-pxa/lpd270.c                |   20 +--
3849  arch/arm/mach-pxa/lubbock.c               |   21 +--
3850  arch/arm/mach-pxa/mainstone.c             |   22 +---
3851  arch/arm/mach-pxa/mfp-pxa2xx.c            |   12 +-
3852  arch/arm/mach-pxa/mfp-pxa3xx.c            |   21 +---
3853  arch/arm/mach-pxa/mioa701.c               |   43 +-----
3854  arch/arm/mach-pxa/palmld.c                |    1 -
3855  arch/arm/mach-pxa/palmtreo.c              |    1 -
3856  arch/arm/mach-pxa/palmz72.c               |   24 +---
3857  arch/arm/mach-pxa/pxa25x.c                |   25 +---
3858  arch/arm/mach-pxa/pxa27x.c                |   25 +---
3859  arch/arm/mach-pxa/pxa3xx.c                |   25 +---
3860  arch/arm/mach-pxa/pxa95x.c                |   20 +---
3861  arch/arm/mach-pxa/raumfeld.c              |    1 -
3862  arch/arm/mach-pxa/smemc.c                 |   29 +---
3863  arch/arm/mach-pxa/trizeps4.c              |    1 -
3864  arch/arm/mach-pxa/viper.c                 |   12 +-
3865  arch/arm/mach-pxa/vpac270.c               |    1 -
3866  arch/arm/mach-s3c2410/irq.c               |   30 +----
3867  arch/arm/mach-s3c2410/mach-bast.c         |   17 +--
3868  arch/arm/mach-s3c2410/pm.c                |   13 +-
3869  arch/arm/mach-s3c2410/s3c2410.c           |    5 +
3870  arch/arm/mach-s3c2412/irq.c               |    2 -
3871  arch/arm/mach-s3c2412/mach-jive.c         |   19 +--
3872  arch/arm/mach-s3c2412/pm.c                |   27 ++--
3873  arch/arm/mach-s3c2412/s3c2412.c           |    4 +
3874  arch/arm/mach-s3c2416/irq.c               |    2 -
3875  arch/arm/mach-s3c2416/pm.c                |   27 ++--
3876  arch/arm/mach-s3c2416/s3c2416.c           |    5 +
3877  arch/arm/mach-s3c2440/mach-osiris.c       |   18 +--
3878  arch/arm/mach-s3c2440/s3c2440.c           |    8 +
3879  arch/arm/mach-s3c2440/s3c2442.c           |    6 +
3880  arch/arm/mach-s3c2440/s3c244x-irq.c       |    4 -
3881  arch/arm/mach-s3c2440/s3c244x.c           |   62 +++++-----
3882  arch/arm/mach-s3c64xx/irq-pm.c            |   18 ++--
3883  arch/arm/mach-s5pv210/pm.c                |   25 +++-
3884  arch/arm/mach-sa1100/irq.c                |   19 +--
3885  arch/arm/plat-omap/gpio.c                 |   35 ++----
3886  arch/arm/plat-pxa/gpio.c                  |   17 +--
3887  arch/arm/plat-pxa/mfp.c                   |    1 -
3888  arch/arm/plat-s3c24xx/dma.c               |   68 ++++------
3889  arch/arm/plat-s3c24xx/irq-pm.c            |    7 +-
3890  arch/arm/plat-s5p/irq-pm.c                |    7 +-
3891  arch/arm/plat-samsung/include/plat/cpu.h  |    6 +
3892  arch/arm/plat-samsung/include/plat/pm.h   |    6 +-
3893  arch/arm/vfp/vfpmodule.c                  |   19 +--
3894  arch/avr32/mach-at32ap/intc.c             |   38 ++----
3895  arch/blackfin/kernel/nmi.c                |   30 ++---
3896  arch/mips/alchemy/common/dbdma.c          |   92 ++++---------
3897  arch/mips/alchemy/common/irq.c            |   62 ++++------
3898  arch/mips/jz4740/gpio.c                   |   52 +++-----
3899  arch/mips/kernel/i8259.c                  |   26 +---
3900  arch/powerpc/include/asm/mpic.h           |    3 -
3901  arch/powerpc/platforms/cell/spu_base.c    |   28 +++--
3902  arch/powerpc/platforms/powermac/pic.c     |   42 ++-----
3903  arch/powerpc/sysdev/ipic.c                |   36 ++----
3904  arch/powerpc/sysdev/mpic.c                |   48 ++++---
3905  arch/sh/Kconfig                           |    1 -
3906  arch/unicore32/kernel/irq.c               |   23 +--
3907  arch/x86/Kconfig                          |    1 -
3908  arch/x86/kernel/apm_32.c                  |    4 -
3909  drivers/acpi/scan.c                       |    4 +
3910  drivers/base/Kconfig                      |    7 -
3911  drivers/base/base.h                       |    2 -
3912  drivers/base/power/main.c                 |    1 +
3913  drivers/base/power/wakeup.c               |    2 +-
3914  drivers/base/sys.c                        |  202 +----------------------------
3915  drivers/xen/manage.c                      |    8 +-
3916  include/linux/device.h                    |    7 -
3917  include/linux/pm.h                        |    8 -
3918  include/linux/sysdev.h                    |   11 --
3919  kernel/freezer.c                          |    4 +-
3920  kernel/kexec.c                            |    9 +-
3921  kernel/power/hibernate.c                  |   18 +---
3922  kernel/power/suspend.c                    |   14 +--
3923  kernel/sys.c                              |    3 -
3924  93 files changed, 586 insertions(+), 1280 deletions(-)
3925 Merging fsnotify/for-next
3926 $ git merge fsnotify/for-next
3927 Auto-merging fs/cachefiles/namei.c
3928 Auto-merging fs/nfsd/vfs.c
3929 Auto-merging fs/notify/fanotify/fanotify_user.c
3930 Auto-merging fs/notify/mark.c
3931 Auto-merging include/linux/fsnotify_backend.h
3932 Merge made by recursive.
3933  fs/cachefiles/namei.c              |    1 -
3934  fs/cachefiles/xattr.c              |    1 -
3935  fs/nfsd/vfs.c                      |    3 -
3936  fs/notify/dnotify/dnotify.c        |   15 +++---
3937  fs/notify/fanotify/fanotify.c      |   24 +++++----
3938  fs/notify/fanotify/fanotify_user.c |  101 +++++++++++++++++++++++++-----------
3939  fs/notify/group.c                  |    1 +
3940  fs/notify/mark.c                   |   36 +++++--------
3941  include/linux/fanotify.h           |    5 ++-
3942  include/linux/fsnotify_backend.h   |   14 ++++-
3943  10 files changed, 121 insertions(+), 80 deletions(-)
3944 Merging irda/for-next
3945 $ git merge irda/for-next
3946 Already up-to-date.
3947 Merging i7core_edac/linux_next
3948 $ git merge i7core_edac/linux_next
3949 Auto-merging drivers/edac/i7core_edac.c
3950 Merge made by recursive.
3951  drivers/edac/i7core_edac.c |   23 ++++++++++++++++++++---
3952  1 files changed, 20 insertions(+), 3 deletions(-)
3953 Merging i7300_edac/linux_next
3954 $ git merge i7300_edac/linux_next
3955 Already up-to-date!
3956 Merge made by recursive.
3957 Merging devicetree/devicetree/next
3958 $ git merge devicetree/devicetree/next
3959 Already up-to-date.
3960 Merging spi/spi/next
3961 $ git merge spi/spi/next
3962 Auto-merging drivers/spi/dw_spi.c
3963 Auto-merging drivers/spi/dw_spi.h
3964 Merge made by recursive.
3965  drivers/spi/dw_spi.c |  202 ++++++++++++++++---------------------------------
3966  drivers/spi/dw_spi.h |    2 -
3967  2 files changed, 66 insertions(+), 138 deletions(-)
3968 Merging tip/auto-latest
3969 $ git merge tip/auto-latest
3970 Auto-merging arch/arm/kernel/smp.c
3971 Auto-merging arch/blackfin/mach-common/smp.c
3972 Auto-merging arch/mips/sgi-ip27/ip27-timer.c
3973 Auto-merging arch/s390/kernel/smp.c
3974 Auto-merging arch/x86/Kconfig
3975 Auto-merging arch/x86/kernel/probe_roms.c
3976 Auto-merging arch/x86/kernel/setup.c
3977 Auto-merging init/Kconfig
3978 Auto-merging tools/perf/config/feature-tests.mak
3979 Merge made by recursive.
3980  arch/alpha/kernel/smp.c                           |    3 +-
3981  arch/alpha/kernel/time.c                          |    3 +-
3982  arch/arm/kernel/smp.c                             |    5 +-
3983  arch/blackfin/kernel/time-ts.c                    |   35 +-
3984  arch/blackfin/mach-common/smp.c                   |    3 +
3985  arch/cris/arch-v32/kernel/smp.c                   |   13 +-
3986  arch/ia64/kernel/cyclone.c                        |    6 +-
3987  arch/ia64/kernel/irq_ia64.c                       |    2 +
3988  arch/ia64/kernel/time.c                           |    9 +-
3989  arch/ia64/sn/kernel/sn2/timer.c                   |    6 +-
3990  arch/ia64/xen/irq_xen.c                           |   10 +-
3991  arch/m32r/kernel/smp.c                            |    4 +-
3992  arch/microblaze/kernel/timer.c                    |    6 +-
3993  arch/mips/alchemy/common/time.c                   |    3 +-
3994  arch/mips/cavium-octeon/csrc-octeon.c             |    3 +-
3995  arch/mips/cavium-octeon/smp.c                     |    2 +
3996  arch/mips/include/asm/time.h                      |    6 -
3997  arch/mips/jz4740/time.c                           |    3 +-
3998  arch/mips/kernel/cevt-txx9.c                      |    3 +-
3999  arch/mips/kernel/csrc-bcm1480.c                   |    3 +-
4000  arch/mips/kernel/csrc-ioasic.c                    |    4 +-
4001  arch/mips/kernel/csrc-powertv.c                   |   35 +-
4002  arch/mips/kernel/csrc-r4k.c                       |    4 +-
4003  arch/mips/kernel/csrc-sb1250.c                    |    3 +-
4004  arch/mips/kernel/i8253.c                          |    5 +-
4005  arch/mips/kernel/smtc.c                           |    2 +-
4006  arch/mips/loongson/common/cs5536/cs5536_mfgpt.c   |    5 +-
4007  arch/mips/mti-malta/malta-int.c                   |    2 +
4008  arch/mips/pmc-sierra/yosemite/smp.c               |    4 +
4009  arch/mips/sgi-ip27/ip27-irq.c                     |    2 +
4010  arch/mips/sgi-ip27/ip27-timer.c                   |    3 +-
4011  arch/mips/sibyte/bcm1480/smp.c                    |    7 +-
4012  arch/mips/sibyte/sb1250/smp.c                     |    7 +-
4013  arch/mn10300/kernel/smp.c                         |    5 +-
4014  arch/parisc/kernel/smp.c                          |    5 +-
4015  arch/powerpc/kernel/smp.c                         |    4 +-
4016  arch/s390/kernel/smp.c                            |    6 +-
4017  arch/sh/kernel/smp.c                              |    2 +
4018  arch/sparc/include/asm/topology_64.h              |    6 +-
4019  arch/sparc/kernel/smp_32.c                        |    4 +-
4020  arch/sparc/kernel/smp_64.c                        |    1 +
4021  arch/tile/kernel/smp.c                            |    6 +-
4022  arch/um/kernel/smp.c                              |    2 +-
4023  arch/x86/Kconfig                                  |   43 +-
4024  arch/x86/Kconfig.cpu                              |   16 +-
4025  arch/x86/Makefile_32.cpu                          |    2 +-
4026  arch/x86/include/asm/alternative.h                |    8 -
4027  arch/x86/include/asm/cpufeature.h                 |   13 +-
4028  arch/x86/include/asm/mach_traps.h                 |   18 +-
4029  arch/x86/include/asm/mce.h                        |    2 -
4030  arch/x86/include/asm/mmzone_64.h                  |   23 -
4031  arch/x86/include/asm/module.h                     |    2 +-
4032  arch/x86/include/asm/nops.h                       |  146 ++-
4033  arch/x86/include/asm/olpc_ofw.h                   |    9 +-
4034  arch/x86/include/asm/percpu.h                     |   29 +-
4035  arch/x86/include/asm/probe_roms.h                 |    8 +
4036  arch/x86/include/asm/setup.h                      |    2 +-
4037  arch/x86/include/asm/topology.h                   |    1 -
4038  arch/x86/kernel/Makefile                          |    2 +-
4039  arch/x86/kernel/alternative.c                     |  194 ++--
4040  arch/x86/kernel/apb_timer.c                       |   10 +-
4041  arch/x86/kernel/aperture_64.c                     |   34 +-
4042  arch/x86/kernel/apic/apic.c                       |   43 +-
4043  arch/x86/kernel/apic/numaq_32.c                   |    4 -
4044  arch/x86/kernel/cpu/cpufreq/Kconfig               |    4 +-
4045  arch/x86/kernel/cpu/mcheck/mce.c                  |   25 +-
4046  arch/x86/kernel/cpu/mcheck/therm_throt.c          |   10 +-
4047  arch/x86/kernel/cpu/perf_event.c                  |   15 +-
4048  arch/x86/kernel/cpu/perf_event_p4.c               |    5 +-
4049  arch/x86/kernel/ftrace.c                          |    4 +-
4050  arch/x86/kernel/head32.c                          |    1 -
4051  arch/x86/kernel/i8253.c                           |    6 +-
4052  arch/x86/kernel/jump_label.c                      |    5 +-
4053  arch/x86/kernel/kvmclock.c                        |    6 +-
4054  arch/x86/kernel/mpparse.c                         |    6 +-
4055  arch/x86/kernel/{probe_roms_32.c => probe_roms.c} |  101 ++
4056  arch/x86/kernel/process.c                         |    4 +-
4057  arch/x86/kernel/reboot.c                          |   24 +-
4058  arch/x86/kernel/setup.c                           |    6 +-
4059  arch/x86/kernel/smp.c                             |    5 +-
4060  arch/x86/kernel/smpboot.c                         |    4 +-
4061  arch/x86/kernel/x86_init.c                        |    2 +-
4062  arch/x86/lguest/boot.c                            |    4 +-
4063  arch/x86/mm/numa_32.c                             |  268 ++--
4064  arch/x86/mm/numa_64.c                             |  131 +--
4065  arch/x86/mm/srat_32.c                             |    1 -
4066  arch/x86/platform/olpc/Makefile                   |    4 +-
4067  arch/x86/platform/olpc/olpc.c                     |   51 +-
4068  arch/x86/platform/olpc/olpc_dt.c                  |   19 +
4069  arch/x86/platform/uv/uv_time.c                    |    6 +-
4070  arch/x86/xen/smp.c                                |    5 +-
4071  arch/x86/xen/time.c                               |    6 +-
4072  drivers/acpi/processor_throttling.c               |   32 +-
4073  drivers/char/hpet.c                               |    6 +-
4074  drivers/clocksource/cyclone.c                     |   10 +-
4075  include/linux/clocksource.h                       |    2 +-
4076  include/linux/mutex.h                             |    2 +-
4077  include/linux/sched.h                             |   50 +-
4078  init/Kconfig                                      |    5 +
4079  kernel/cpuset.c                                   |    2 +-
4080  kernel/mutex-debug.c                              |    2 +-
4081  kernel/mutex-debug.h                              |    2 +-
4082  kernel/mutex.c                                    |    2 +-
4083  kernel/mutex.h                                    |    2 +-
4084  kernel/sched.c                                    | 1614 +++++++++------------
4085  kernel/sched_debug.c                              |    2 +-
4086  kernel/sched_fair.c                               |  110 +-
4087  kernel/sched_features.h                           |    6 +
4088  kernel/sched_idletask.c                           |    2 +-
4089  kernel/sched_rt.c                                 |   54 +-
4090  kernel/sched_stoptask.c                           |    5 +-
4091  tools/perf/Documentation/perf-script.txt          |   52 +-
4092  tools/perf/Makefile                               |  107 +-
4093  tools/perf/builtin-script.c                       |  296 +++-
4094  tools/perf/{ => config}/feature-tests.mak         |   16 +-
4095  tools/perf/config/utilities.mak                   |  188 +++
4096  tools/perf/util/probe-finder.c                    |   72 +
4097  tools/perf/util/probe-finder.h                    |    2 +
4098  tools/perf/util/session.c                         |   12 +
4099  tools/perf/util/session.h                         |    3 +
4100  tools/perf/util/symbol.c                          |  629 ++++----
4101  tools/perf/util/symbol.h                          |   78 +-
4102  122 files changed, 2574 insertions(+), 2380 deletions(-)
4103  create mode 100644 arch/x86/include/asm/probe_roms.h
4104  rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%)
4105  rename tools/perf/{ => config}/feature-tests.mak (86%)
4106  create mode 100644 tools/perf/config/utilities.mak
4107 Merging rcu/rcu/next
4108 $ git merge rcu/rcu/next
4109 Auto-merging lib/Kconfig.debug
4110 Merge made by recursive.
4111  Documentation/RCU/00-INDEX      |    2 +-
4112  Documentation/RCU/stallwarn.txt |   23 +++--
4113  Documentation/RCU/trace.txt     |   77 ++++++++--------
4114  kernel/rcutree.c                |  161 ++++++++++++----------------------
4115  kernel/rcutree.h                |   42 ++++-----
4116  kernel/rcutree_plugin.h         |  182 +++++++++++++++++++++------------------
4117  kernel/rcutree_trace.c          |   23 ++---
4118  lib/Kconfig.debug               |   30 +------
4119  8 files changed, 240 insertions(+), 300 deletions(-)
4120 Merging oprofile/for-next
4121 $ git merge oprofile/for-next
4122 Auto-merging arch/s390/oprofile/init.c
4123 Merge made by recursive.
4124  arch/alpha/oprofile/common.c                   |    5 +----
4125  arch/avr32/oprofile/op_model_avr32.c           |    5 +----
4126  arch/blackfin/oprofile/bfin_oprofile.c         |    4 +---
4127  arch/ia64/oprofile/init.c                      |    2 +-
4128  arch/m32r/oprofile/init.c                      |    4 +---
4129  arch/microblaze/oprofile/microblaze_oprofile.c |    4 +---
4130  arch/mips/oprofile/common.c                    |    2 +-
4131  arch/mn10300/oprofile/op_model_null.c          |    5 +----
4132  arch/parisc/oprofile/init.c                    |    4 +---
4133  arch/powerpc/oprofile/common.c                 |    4 +---
4134  arch/s390/oprofile/init.c                      |    2 +-
4135  arch/sparc/oprofile/init.c                     |    4 +---
4136  arch/x86/oprofile/init.c                       |    2 +-
4137  13 files changed, 13 insertions(+), 34 deletions(-)
4138 Merging ptrace/ptrace
4139 $ git merge ptrace/ptrace
4140 Auto-merging include/linux/sched.h
4141 Auto-merging include/linux/tracehook.h
4142 Auto-merging kernel/exit.c
4143 Auto-merging kernel/ptrace.c
4144 Auto-merging kernel/signal.c
4145 Merge made by recursive.
4146  fs/exec.c                 |    1 +
4147  include/linux/sched.h     |   17 ++-
4148  include/linux/tracehook.h |   27 ----
4149  kernel/exit.c             |   84 ++++++++--
4150  kernel/ptrace.c           |  118 ++++++++++-----
4151  kernel/signal.c           |  375 +++++++++++++++++++++++++++++++++------------
4152  6 files changed, 442 insertions(+), 180 deletions(-)
4153 Merging xen-two/linux-next
4154 $ git merge xen-two/linux-next
4155 Auto-merging arch/x86/xen/mmu.c
4156 Merge made by recursive.
4157  arch/x86/xen/mmu.c |    2 +-
4158  1 files changed, 1 insertions(+), 1 deletions(-)
4159 Merging xen-pvhvm/linux-next
4160 $ git merge xen-pvhvm/linux-next
4161 Already up-to-date.
4162 Merging edac-amd/for-next
4163 $ git merge edac-amd/for-next
4164 Already up-to-date.
4165 Merging percpu/for-next
4166 $ git merge percpu/for-next
4167 Resolved 'arch/x86/include/asm/percpu.h' using previous resolution.
4168 Auto-merging arch/mips/kernel/vmlinux.lds.S
4169 Auto-merging arch/parisc/kernel/vmlinux.lds.S
4170 Auto-merging arch/x86/include/asm/percpu.h
4171 CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h
4172 Auto-merging include/asm-generic/vmlinux.lds.h
4173 Auto-merging kernel/workqueue.c
4174 Auto-merging mm/percpu.c
4175 Automatic merge failed; fix conflicts and then commit the result.
4176 $ git commit -v -a
4177 [master f3e2f20] Merge remote-tracking branch 'percpu/for-next'
4178 $ git diff -M --stat --summary HEAD^..
4179  arch/alpha/kernel/vmlinux.lds.S    |    2 +-
4180  arch/arm/kernel/vmlinux.lds.S      |    2 +-
4181  arch/blackfin/kernel/vmlinux.lds.S |    2 +-
4182  arch/cris/kernel/vmlinux.lds.S     |    2 +-
4183  arch/frv/kernel/vmlinux.lds.S      |    2 +-
4184  arch/m32r/kernel/vmlinux.lds.S     |    2 +-
4185  arch/mips/kernel/vmlinux.lds.S     |    2 +-
4186  arch/mn10300/kernel/vmlinux.lds.S  |    2 +-
4187  arch/parisc/kernel/vmlinux.lds.S   |    2 +-
4188  arch/powerpc/kernel/vmlinux.lds.S  |    2 +-
4189  arch/s390/kernel/vmlinux.lds.S     |    2 +-
4190  arch/sh/kernel/vmlinux.lds.S       |    2 +-
4191  arch/sparc/kernel/vmlinux.lds.S    |    2 +-
4192  arch/tile/kernel/vmlinux.lds.S     |    2 +-
4193  arch/um/include/asm/common.lds.S   |    2 +-
4194  arch/x86/include/asm/percpu.h      |    7 ++++++-
4195  arch/x86/kernel/vmlinux.lds.S      |    2 +-
4196  arch/xtensa/kernel/vmlinux.lds.S   |    2 +-
4197  include/asm-generic/vmlinux.lds.h  |   17 ++++++++---------
4198  kernel/workqueue.c                 |    4 +---
4199  mm/percpu.c                        |    6 ++++--
4200  21 files changed, 36 insertions(+), 32 deletions(-)
4201 Merging workqueues/for-next
4202 $ git merge workqueues/for-next
4203 Merge made by recursive.
4204  Documentation/workqueue.txt |   40 ++++++++++++++++++++++++++++++++++++++++
4205  1 files changed, 40 insertions(+), 0 deletions(-)
4206 Merging sfi/sfi-test
4207 $ git merge sfi/sfi-test
4208 Already up-to-date.
4209 Merging asm-generic/next
4210 $ git merge asm-generic/next
4211 Already up-to-date.
4212 Merging drivers-x86/linux-next
4213 $ git merge drivers-x86/linux-next
4214 Resolved 'drivers/platform/x86/intel_pmic_gpio.c' using previous resolution.
4215 Auto-merging drivers/platform/x86/Kconfig
4216 Auto-merging drivers/platform/x86/acer-wmi.c
4217 Auto-merging drivers/platform/x86/asus-wmi.c
4218 Auto-merging drivers/platform/x86/eeepc-wmi.c
4219 Auto-merging drivers/platform/x86/intel_pmic_gpio.c
4220 CONFLICT (content): Merge conflict in drivers/platform/x86/intel_pmic_gpio.c
4221 Auto-merging drivers/platform/x86/sony-laptop.c
4222 Auto-merging drivers/platform/x86/thinkpad_acpi.c
4223 Automatic merge failed; fix conflicts and then commit the result.
4224 $ git commit -v -a
4225 [master 590083b] Merge remote-tracking branch 'drivers-x86/linux-next'
4226 $ git diff -M --stat --summary HEAD^..
4227  drivers/platform/x86/Kconfig             |    9 +
4228  drivers/platform/x86/Makefile            |    1 +
4229  drivers/platform/x86/acer-wmi.c          |   32 +-
4230  drivers/platform/x86/asus-laptop.c       |   34 +-
4231  drivers/platform/x86/asus-wmi.c          |   22 +-
4232  drivers/platform/x86/asus_acpi.c         |   77 ++---
4233  drivers/platform/x86/compal-laptop.c     |   22 +-
4234  drivers/platform/x86/dell-laptop.c       |   12 +-
4235  drivers/platform/x86/dell-wmi-aio.c      |    3 +-
4236  drivers/platform/x86/dell-wmi.c          |   17 +-
4237  drivers/platform/x86/eeepc-laptop.c      |   20 +-
4238  drivers/platform/x86/eeepc-wmi.c         |   14 +-
4239  drivers/platform/x86/fujitsu-laptop.c    |   39 +-
4240  drivers/platform/x86/hdaps.c             |   19 +-
4241  drivers/platform/x86/hp-wmi.c            |   43 +--
4242  drivers/platform/x86/ibm_rtl.c           |   23 +-
4243  drivers/platform/x86/ideapad-laptop.c    |    2 +
4244  drivers/platform/x86/intel_menlow.c      |    5 +-
4245  drivers/platform/x86/intel_mid_thermal.c |  606 +++++++++++++++---------------
4246  drivers/platform/x86/intel_oaktrail.c    |  396 +++++++++++++++++++
4247  drivers/platform/x86/intel_pmic_gpio.c   |   14 +-
4248  drivers/platform/x86/msi-laptop.c        |    9 +-
4249  drivers/platform/x86/msi-wmi.c           |   45 +--
4250  drivers/platform/x86/sony-laptop.c       |  109 +++---
4251  drivers/platform/x86/tc1100-wmi.c        |    7 +-
4252  drivers/platform/x86/thinkpad_acpi.c     |  490 ++++++++++--------------
4253  drivers/platform/x86/topstar-laptop.c    |    2 +-
4254  drivers/platform/x86/toshiba_acpi.c      |   59 ++--
4255  drivers/platform/x86/toshiba_bluetooth.c |   11 +-
4256  drivers/platform/x86/wmi.c               |   10 +-
4257  drivers/platform/x86/xo15-ebook.c        |    5 +-
4258  31 files changed, 1214 insertions(+), 943 deletions(-)
4259  create mode 100644 drivers/platform/x86/intel_oaktrail.c
4260 Merging hwpoison/hwpoison
4261 $ git merge hwpoison/hwpoison
4262 Already up-to-date.
4263 Merging sysctl/master
4264 $ git merge sysctl/master
4265 Already up-to-date.
4266 Merging driver-core/driver-core-next
4267 $ git merge driver-core/driver-core-next
4268 Auto-merging drivers/base/memory.c
4269 Auto-merging include/linux/device.h
4270 Merge made by recursive.
4271  Documentation/ABI/testing/sysfs-firmware-dmi  |   18 ++--
4272  Documentation/ABI/testing/sysfs-kernel-fscaps |    8 ++
4273  Documentation/ja_JP/HOWTO                     |  129 ++++++++----------------
4274  drivers/base/core.c                           |    7 +-
4275  drivers/base/dd.c                             |   12 ++-
4276  drivers/base/memory.c                         |    3 +-
4277  drivers/base/platform.c                       |   38 ++++----
4278  drivers/char/mem.c                            |   42 +++++---
4279  drivers/firmware/efivars.c                    |   15 ++-
4280  drivers/misc/ti-st/Kconfig                    |    1 -
4281  drivers/misc/ti-st/st_core.c                  |   23 +++--
4282  drivers/uio/uio.c                             |   16 ++-
4283  drivers/uio/uio_netx.c                        |   19 ++++
4284  drivers/uio/uio_pdrv_genirq.c                 |    4 +
4285  include/linux/device.h                        |   10 ++-
4286  include/linux/ti_wilink_st.h                  |    3 +-
4287  kernel/ksysfs.c                               |   10 ++
4288  17 files changed, 195 insertions(+), 163 deletions(-)
4289  create mode 100644 Documentation/ABI/testing/sysfs-kernel-fscaps
4290 Merging tty/tty-next
4291 $ git merge tty/tty-next
4292 Recorded preimage for 'drivers/bluetooth/hci_ldisc.c'
4293 Auto-merging drivers/bluetooth/hci_ldisc.c
4294 CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c
4295 Auto-merging drivers/misc/ti-st/st_core.c
4296 Auto-merging drivers/tty/cyclades.c
4297 Auto-merging drivers/tty/n_gsm.c
4298 Auto-merging drivers/tty/nozomi.c
4299 Auto-merging drivers/tty/serial/atmel_serial.c
4300 Auto-merging drivers/tty/serial/imx.c
4301 Auto-merging drivers/tty/tty_ioctl.c
4302 Automatic merge failed; fix conflicts and then commit the result.
4303 $ git commit -v -a
4304 Recorded resolution for 'drivers/bluetooth/hci_ldisc.c'.
4305 [master c574317] Merge remote-tracking branch 'tty/tty-next'
4306 $ git diff -M --stat --summary HEAD^..
4307  drivers/bluetooth/hci_ldisc.c               |   15 +++--
4308  drivers/input/serio/serport.c               |   10 +++-
4309  drivers/isdn/gigaset/ser-gigaset.c          |    8 ++-
4310  drivers/misc/ti-st/st_core.c                |    6 +-
4311  drivers/net/caif/caif_serial.c              |    6 +-
4312  drivers/net/can/slcan.c                     |    9 ++-
4313  drivers/net/hamradio/6pack.c                |    8 ++-
4314  drivers/net/hamradio/mkiss.c                |   11 ++-
4315  drivers/net/irda/irtty-sir.c                |   16 +++--
4316  drivers/net/ppp_async.c                     |    6 +-
4317  drivers/net/ppp_synctty.c                   |    6 +-
4318  drivers/net/slip.c                          |   11 ++-
4319  drivers/net/wan/x25_asy.c                   |    7 ++-
4320  drivers/tty/amiserial.c                     |    2 -
4321  drivers/tty/cyclades.c                      |    5 +-
4322  drivers/tty/ipwireless/Makefile             |    2 -
4323  drivers/tty/moxa.c                          |   16 +----
4324  drivers/tty/n_gsm.c                         |    6 +-
4325  drivers/tty/n_hdlc.c                        |   18 +++---
4326  drivers/tty/n_r3964.c                       |   10 ++-
4327  drivers/tty/n_tty.c                         |   61 ++++--------------
4328  drivers/tty/nozomi.c                        |   29 ++-------
4329  drivers/tty/pty.c                           |   35 +++++-----
4330  drivers/tty/rocket.c                        |   47 --------------
4331  drivers/tty/serial/21285.c                  |    2 -
4332  drivers/tty/serial/8250.c                   |    2 -
4333  drivers/tty/serial/8250.h                   |    2 -
4334  drivers/tty/serial/8250_accent.c            |    2 -
4335  drivers/tty/serial/8250_boca.c              |    2 -
4336  drivers/tty/serial/8250_exar_st16c554.c     |    2 -
4337  drivers/tty/serial/8250_fourport.c          |    2 -
4338  drivers/tty/serial/8250_hub6.c              |    2 -
4339  drivers/tty/serial/8250_mca.c               |    2 -
4340  drivers/tty/serial/8250_pci.c               |    2 -
4341  drivers/tty/serial/8250_pnp.c               |    2 -
4342  drivers/tty/serial/altera_uart.c            |   26 +++++---
4343  drivers/tty/serial/amba-pl010.c             |    2 -
4344  drivers/tty/serial/amba-pl011.c             |    2 -
4345  drivers/tty/serial/atmel_serial.c           |    2 -
4346  drivers/tty/serial/clps711x.c               |    2 -
4347  drivers/tty/serial/cpm_uart/cpm_uart.h      |    2 -
4348  drivers/tty/serial/cpm_uart/cpm_uart_core.c |    2 -
4349  drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c |    2 -
4350  drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h |    2 -
4351  drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c |    2 -
4352  drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h |    2 -
4353  drivers/tty/serial/ifx6x60.c                |    2 -
4354  drivers/tty/serial/imx.c                    |    2 -
4355  drivers/tty/serial/msm_serial.c             |    2 +-
4356  drivers/tty/serial/msm_serial.h             |    2 -
4357  drivers/tty/serial/msm_smd_tty.c            |    3 +-
4358  drivers/tty/serial/netx-serial.c            |    2 -
4359  drivers/tty/serial/pmac_zilog.c             |    2 -
4360  drivers/tty/serial/pxa.c                    |    2 -
4361  drivers/tty/serial/s3c2400.c                |    3 +-
4362  drivers/tty/serial/s3c2410.c                |    3 +-
4363  drivers/tty/serial/s3c2412.c                |    3 +-
4364  drivers/tty/serial/s3c2440.c                |    3 +-
4365  drivers/tty/serial/s3c24a0.c                |    3 +-
4366  drivers/tty/serial/s3c6400.c                |    3 +-
4367  drivers/tty/serial/s5pv210.c                |    3 +-
4368  drivers/tty/serial/sa1100.c                 |    2 -
4369  drivers/tty/serial/samsung.c                |    3 +-
4370  drivers/tty/serial/samsung.h                |    3 +-
4371  drivers/tty/serial/sb1250-duart.c           |    2 -
4372  drivers/tty/serial/serial_core.c            |   90 +++------------------------
4373  drivers/tty/serial/serial_ks8695.c          |    2 -
4374  drivers/tty/serial/serial_txx9.c            |    2 -
4375  drivers/tty/serial/sh-sci.c                 |    2 -
4376  drivers/tty/serial/vt8500_serial.c          |    2 -
4377  drivers/tty/synclink.c                      |    2 -
4378  drivers/tty/tty_buffer.c                    |   15 +++--
4379  drivers/tty/tty_io.c                        |   53 ++++++++++------
4380  drivers/tty/tty_ioctl.c                     |    2 -
4381  drivers/tty/tty_ldisc.c                     |   13 ++++
4382  drivers/tty/tty_mutex.c                     |    3 -
4383  drivers/tty/vt/keyboard.c                   |    2 -
4384  drivers/tty/vt/selection.c                  |    5 +-
4385  drivers/tty/vt/vc_screen.c                  |    2 -
4386  drivers/tty/vt/vt.c                         |   13 +++--
4387  drivers/tty/vt/vt_ioctl.c                   |   25 +++++---
4388  include/linux/tty.h                         |    2 +
4389  include/linux/tty_ldisc.h                   |    9 ++-
4390  83 files changed, 264 insertions(+), 446 deletions(-)
4391 Merging usb/usb-next
4392 $ git merge usb/usb-next
4393 Resolved 'arch/arm/mach-exynos4/mach-nuri.c' using previous resolution.
4394 Auto-merging arch/arm/mach-exynos4/Kconfig
4395 Auto-merging arch/arm/mach-exynos4/Makefile
4396 Auto-merging arch/arm/mach-exynos4/mach-nuri.c
4397 CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c
4398 Removing drivers/usb/serial/sam-ba.c
4399 Automatic merge failed; fix conflicts and then commit the result.
4400 $ git commit -v -a
4401 [master 43045f1] Merge remote-tracking branch 'usb/usb-next'
4402 $ git diff -M --stat --summary HEAD^..
4403  arch/arm/mach-exynos4/Kconfig                     |    1 +
4404  arch/arm/mach-exynos4/Makefile                    |    2 +
4405  arch/arm/mach-exynos4/cpu.c                       |    7 +-
4406  arch/arm/mach-exynos4/include/mach/map.h          |    4 +
4407  arch/arm/mach-exynos4/include/mach/regs-pmu.h     |    3 +
4408  arch/arm/mach-exynos4/include/mach/regs-usb-phy.h |   64 +
4409  arch/arm/mach-exynos4/mach-nuri.c                 |   16 +
4410  arch/arm/mach-exynos4/usb-phy.c                   |  136 +++
4411  arch/arm/plat-s5p/Kconfig                         |    5 +
4412  arch/arm/plat-s5p/Makefile                        |    1 +
4413  arch/arm/plat-s5p/dev-ehci.c                      |   57 +
4414  arch/arm/plat-s5p/include/plat/ehci.h             |   21 +
4415  arch/arm/plat-s5p/include/plat/map-s5p.h          |    2 +-
4416  arch/arm/plat-s5p/include/plat/usb-phy.h          |   22 +
4417  arch/arm/plat-samsung/include/plat/devs.h         |    2 +
4418  arch/mips/ath79/Kconfig                           |    5 +
4419  drivers/Makefile                                  |    5 +-
4420  drivers/usb/Kconfig                               |    3 +
4421  drivers/usb/Makefile                              |    5 +
4422  drivers/usb/class/cdc-acm.c                       |  466 +++-----
4423  drivers/usb/class/cdc-acm.h                       |   23 +-
4424  drivers/usb/core/devices.c                        |   22 +-
4425  drivers/usb/core/file.c                           |    8 -
4426  drivers/usb/gadget/Kconfig                        |   18 +
4427  drivers/usb/gadget/f_mass_storage.c               |   60 +-
4428  drivers/usb/gadget/file_storage.c                 |   53 +-
4429  drivers/usb/gadget/fsl_qe_udc.h                   |    2 +-
4430  drivers/usb/gadget/gadget_chips.h                 |    9 +
4431  drivers/usb/gadget/storage_common.c               |   15 +-
4432  drivers/usb/host/Kconfig                          |   33 +
4433  drivers/usb/host/ehci-ath79.c                     |  202 ++++
4434  drivers/usb/host/ehci-hcd.c                       |   10 +
4435  drivers/usb/host/ehci-hub.c                       |    2 +-
4436  drivers/usb/host/ehci-q.c                         |    4 +
4437  drivers/usb/host/ehci-s5p.c                       |  201 +++
4438  drivers/usb/host/ehci.h                           |    1 +
4439  drivers/usb/host/ohci-ath79.c                     |  151 +++
4440  drivers/usb/host/ohci-hcd.c                       |    5 +
4441  drivers/usb/host/sl811-hcd.c                      |    8 +-
4442  drivers/usb/host/u132-hcd.c                       |    3 +-
4443  drivers/usb/host/uhci-hcd.c                       |   26 +-
4444  drivers/usb/misc/ftdi-elan.c                      |    3 +-
4445  drivers/usb/otg/twl4030-usb.c                     |    9 +-
4446  drivers/usb/otg/twl6030-usb.c                     |    2 +-
4447  drivers/usb/renesas_usbhs/Kconfig                 |   15 +
4448  drivers/usb/renesas_usbhs/Makefile                |    9 +
4449  drivers/usb/renesas_usbhs/common.c                |  394 ++++++
4450  drivers/usb/renesas_usbhs/common.h                |  225 ++++
4451  drivers/usb/renesas_usbhs/mod.c                   |  276 +++++
4452  drivers/usb/renesas_usbhs/mod.h                   |  122 ++
4453  drivers/usb/renesas_usbhs/mod_gadget.c            | 1341 +++++++++++++++++++++
4454  drivers/usb/renesas_usbhs/pipe.c                  |  880 ++++++++++++++
4455  drivers/usb/renesas_usbhs/pipe.h                  |  105 ++
4456  drivers/usb/serial/Kconfig                        |    9 -
4457  drivers/usb/serial/Makefile                       |    1 -
4458  drivers/usb/serial/sam-ba.c                       |  206 ----
4459  include/linux/usb/gadget.h                        |    4 +-
4460  include/linux/usb/renesas_usbhs.h                 |  149 +++
4461  58 files changed, 4776 insertions(+), 657 deletions(-)
4462  create mode 100644 arch/arm/mach-exynos4/include/mach/regs-usb-phy.h
4463  create mode 100644 arch/arm/mach-exynos4/usb-phy.c
4464  create mode 100644 arch/arm/plat-s5p/dev-ehci.c
4465  create mode 100644 arch/arm/plat-s5p/include/plat/ehci.h
4466  create mode 100644 arch/arm/plat-s5p/include/plat/usb-phy.h
4467  create mode 100644 drivers/usb/host/ehci-ath79.c
4468  create mode 100644 drivers/usb/host/ehci-s5p.c
4469  create mode 100644 drivers/usb/host/ohci-ath79.c
4470  create mode 100644 drivers/usb/renesas_usbhs/Kconfig
4471  create mode 100644 drivers/usb/renesas_usbhs/Makefile
4472  create mode 100644 drivers/usb/renesas_usbhs/common.c
4473  create mode 100644 drivers/usb/renesas_usbhs/common.h
4474  create mode 100644 drivers/usb/renesas_usbhs/mod.c
4475  create mode 100644 drivers/usb/renesas_usbhs/mod.h
4476  create mode 100644 drivers/usb/renesas_usbhs/mod_gadget.c
4477  create mode 100644 drivers/usb/renesas_usbhs/pipe.c
4478  create mode 100644 drivers/usb/renesas_usbhs/pipe.h
4479  delete mode 100644 drivers/usb/serial/sam-ba.c
4480  create mode 100644 include/linux/usb/renesas_usbhs.h
4481 Merging staging/staging-next
4482 $ git merge staging/staging-next
4483 Removing drivers/staging/ath6kl/include/athendpack.h
4484 Removing drivers/staging/ath6kl/include/athstartpack.h
4485 Removing drivers/staging/ath6kl/os/linux/ar6000_android.c
4486 Removing drivers/staging/ath6kl/os/linux/ar6k_pal.c
4487 Removing drivers/staging/ath6kl/os/linux/ioctl.c
4488 Removing drivers/staging/ath6kl/os/linux/wireless_ext.c
4489 Removing drivers/staging/gma500/psb_buffer.c
4490 Removing drivers/staging/gma500/psb_fence.c
4491 Removing drivers/staging/gma500/psb_pvr_glue.c
4492 Removing drivers/staging/gma500/psb_pvr_glue.h
4493 Removing drivers/staging/gma500/psb_sgx.c
4494 Removing drivers/staging/gma500/psb_sgx.h
4495 Removing drivers/staging/gma500/psb_ttm_fence.c
4496 Removing drivers/staging/gma500/psb_ttm_fence_api.h
4497 Removing drivers/staging/gma500/psb_ttm_fence_driver.h
4498 Removing drivers/staging/gma500/psb_ttm_fence_user.c
4499 Removing drivers/staging/gma500/psb_ttm_fence_user.h
4500 Removing drivers/staging/gma500/psb_ttm_glue.c
4501 Removing drivers/staging/gma500/psb_ttm_placement_user.c
4502 Removing drivers/staging/gma500/psb_ttm_placement_user.h
4503 Removing drivers/staging/gma500/psb_ttm_userobj_api.h
4504 Removing drivers/staging/hv/blkvsc.c
4505 Auto-merging drivers/staging/hv/netvsc_drv.c
4506 Auto-merging drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
4507 Removing drivers/staging/rt2860/Kconfig
4508 Removing drivers/staging/rt2860/Makefile
4509 Removing drivers/staging/rt2860/TODO
4510 Removing drivers/staging/rt2860/ap.h
4511 Removing drivers/staging/rt2860/chip/mac_pci.h
4512 Removing drivers/staging/rt2860/chip/mac_usb.h
4513 Removing drivers/staging/rt2860/chip/rt2860.h
4514 Removing drivers/staging/rt2860/chip/rt2870.h
4515 Removing drivers/staging/rt2860/chip/rt3070.h
4516 Removing drivers/staging/rt2860/chip/rt3090.h
4517 Removing drivers/staging/rt2860/chip/rt30xx.h
4518 Removing drivers/staging/rt2860/chip/rtmp_mac.h
4519 Removing drivers/staging/rt2860/chip/rtmp_phy.h
4520 Removing drivers/staging/rt2860/chips/rt3070.c
4521 Removing drivers/staging/rt2860/chips/rt3090.c
4522 Removing drivers/staging/rt2860/chips/rt30xx.c
4523 Removing drivers/staging/rt2860/chlist.h
4524 Removing drivers/staging/rt2860/common/action.c
4525 Removing drivers/staging/rt2860/common/action.h
4526 Removing drivers/staging/rt2860/common/ba_action.c
4527 Removing drivers/staging/rt2860/common/cmm_aes.c
4528 Removing drivers/staging/rt2860/common/cmm_asic.c
4529 Removing drivers/staging/rt2860/common/cmm_cfg.c
4530 Removing drivers/staging/rt2860/common/cmm_data.c
4531 Removing drivers/staging/rt2860/common/cmm_data_pci.c
4532 Removing drivers/staging/rt2860/common/cmm_data_usb.c
4533 Removing drivers/staging/rt2860/common/cmm_info.c
4534 Removing drivers/staging/rt2860/common/cmm_mac_pci.c
4535 Removing drivers/staging/rt2860/common/cmm_mac_usb.c
4536 Removing drivers/staging/rt2860/common/cmm_sanity.c
4537 Removing drivers/staging/rt2860/common/cmm_sync.c
4538 Removing drivers/staging/rt2860/common/cmm_tkip.c
4539 Removing drivers/staging/rt2860/common/cmm_wep.c
4540 Removing drivers/staging/rt2860/common/cmm_wpa.c
4541 Removing drivers/staging/rt2860/common/crypt_hmac.c
4542 Removing drivers/staging/rt2860/common/crypt_md5.c
4543 Removing drivers/staging/rt2860/common/crypt_sha2.c
4544 Removing drivers/staging/rt2860/common/dfs.c
4545 Removing drivers/staging/rt2860/common/ee_efuse.c
4546 Removing drivers/staging/rt2860/common/ee_prom.c
4547 Removing drivers/staging/rt2860/common/eeprom.c
4548 Removing drivers/staging/rt2860/common/mlme.c
4549 Removing drivers/staging/rt2860/common/rt_channel.c
4550 Removing drivers/staging/rt2860/common/rt_rf.c
4551 Removing drivers/staging/rt2860/common/rtmp_init.c
4552 Removing drivers/staging/rt2860/common/rtmp_mcu.c
4553 Removing drivers/staging/rt2860/common/rtmp_timer.c
4554 Removing drivers/staging/rt2860/common/spectrum.c
4555 Removing drivers/staging/rt2860/crypt_hmac.h
4556 Removing drivers/staging/rt2860/crypt_md5.h
4557 Removing drivers/staging/rt2860/crypt_sha2.h
4558 Removing drivers/staging/rt2860/dfs.h
4559 Removing drivers/staging/rt2860/eeprom.h
4560 Removing drivers/staging/rt2860/iface/rtmp_pci.h
4561 Removing drivers/staging/rt2860/iface/rtmp_usb.h
4562 Removing drivers/staging/rt2860/mlme.h
4563 Removing drivers/staging/rt2860/oid.h
4564 Removing drivers/staging/rt2860/pci_main_dev.c
4565 Removing drivers/staging/rt2860/rt_config.h
4566 Removing drivers/staging/rt2860/rt_linux.c
4567 Removing drivers/staging/rt2860/rt_linux.h
4568 Removing drivers/staging/rt2860/rt_main_dev.c
4569 Removing drivers/staging/rt2860/rt_pci_rbus.c
4570 Removing drivers/staging/rt2860/rt_usb.c
4571 Removing drivers/staging/rt2860/rtmp.h
4572 Removing drivers/staging/rt2860/rtmp_chip.h
4573 Removing drivers/staging/rt2860/rtmp_ckipmic.h
4574 Removing drivers/staging/rt2860/rtmp_def.h
4575 Removing drivers/staging/rt2860/rtmp_dot11.h
4576 Removing drivers/staging/rt2860/rtmp_iface.h
4577 Removing drivers/staging/rt2860/rtmp_mcu.h
4578 Removing drivers/staging/rt2860/rtmp_os.h
4579 Removing drivers/staging/rt2860/rtmp_timer.h
4580 Removing drivers/staging/rt2860/rtmp_type.h
4581 Removing drivers/staging/rt2860/rtusb_io.h
4582 Removing drivers/staging/rt2860/spectrum.h
4583 Removing drivers/staging/rt2860/spectrum_def.h
4584 Removing drivers/staging/rt2860/sta/assoc.c
4585 Removing drivers/staging/rt2860/sta/auth.c
4586 Removing drivers/staging/rt2860/sta/auth_rsp.c
4587 Removing drivers/staging/rt2860/sta/connect.c
4588 Removing drivers/staging/rt2860/sta/rtmp_data.c
4589 Removing drivers/staging/rt2860/sta/sanity.c
4590 Removing drivers/staging/rt2860/sta/sync.c
4591 Removing drivers/staging/rt2860/sta/wpa.c
4592 Removing drivers/staging/rt2860/sta_ioctl.c
4593 Removing drivers/staging/rt2860/usb_main_dev.c
4594 Removing drivers/staging/rt2860/wpa.h
4595 Removing drivers/staging/rt2870/Kconfig
4596 Removing drivers/staging/rt2870/Makefile
4597 Removing drivers/staging/rt2870/TODO
4598 Removing drivers/staging/rt2870/aironet.h
4599 Removing drivers/staging/rt2870/ap.h
4600 Removing drivers/staging/rt2870/chips/rt3070.c
4601 Removing drivers/staging/rt2870/chips/rt30xx.c
4602 Removing drivers/staging/rt2870/chlist.h
4603 Removing drivers/staging/rt2870/common/acction.c
4604 Removing drivers/staging/rt2870/common/action.c
4605 Removing drivers/staging/rt2870/common/action.h
4606 Removing drivers/staging/rt2870/common/ba_action.c
4607 Removing drivers/staging/rt2870/common/cmm_aes.c
4608 Removing drivers/staging/rt2870/common/cmm_asic.c
4609 Removing drivers/staging/rt2870/common/cmm_cfg.c
4610 Removing drivers/staging/rt2870/common/cmm_data.c
4611 Removing drivers/staging/rt2870/common/cmm_data_usb.c
4612 Removing drivers/staging/rt2870/common/cmm_info.c
4613 Removing drivers/staging/rt2870/common/cmm_mac_usb.c
4614 Removing drivers/staging/rt2870/common/cmm_profile.c
4615 Removing drivers/staging/rt2870/common/cmm_sanity.c
4616 Removing drivers/staging/rt2870/common/cmm_sync.c
4617 Removing drivers/staging/rt2870/common/cmm_tkip.c
4618 Removing drivers/staging/rt2870/common/cmm_wep.c
4619 Removing drivers/staging/rt2870/common/cmm_wpa.c
4620 Removing drivers/staging/rt2870/common/crypt_hmac.c
4621 Removing drivers/staging/rt2870/common/crypt_md5.c
4622 Removing drivers/staging/rt2870/common/crypt_sha2.c
4623 Removing drivers/staging/rt2870/common/dfs.c
4624 Removing drivers/staging/rt2870/common/ee_efuse.c
4625 Removing drivers/staging/rt2870/common/eeprom.c
4626 Removing drivers/staging/rt2870/common/md5.c
4627 Removing drivers/staging/rt2870/common/mlme.c
4628 Removing drivers/staging/rt2870/common/rt_channel.c
4629 Removing drivers/staging/rt2870/common/rt_rf.c
4630 Removing drivers/staging/rt2870/common/rtmp_init.c
4631 Removing drivers/staging/rt2870/common/rtmp_mcu.c
4632 Removing drivers/staging/rt2870/common/rtmp_timer.c
4633 Removing drivers/staging/rt2870/common/rtmp_tkip.c
4634 Removing drivers/staging/rt2870/common/rtmp_wep.c
4635 Removing drivers/staging/rt2870/common/rtusb_bulk.c
4636 Removing drivers/staging/rt2870/common/rtusb_data.c
4637 Removing drivers/staging/rt2870/common/rtusb_io.c
4638 Removing drivers/staging/rt2870/common/spectrum.c
4639 Removing drivers/staging/rt2870/dfs.h
4640 Removing drivers/staging/rt2870/md5.h
4641 Removing drivers/staging/rt2870/mlme.h
4642 Removing drivers/staging/rt2870/oid.h
4643 Removing drivers/staging/rt2870/rt28xx.h
4644 Removing drivers/staging/rt2870/rt_config.h
4645 Removing drivers/staging/rt2870/rt_linux.c
4646 Removing drivers/staging/rt2870/rt_linux.h
4647 Removing drivers/staging/rt2870/rt_main_dev.c
4648 Removing drivers/staging/rt2870/rt_profile.c
4649 Removing drivers/staging/rt2870/rt_usb.c
4650 Removing drivers/staging/rt2870/rtmp.h
4651 Removing drivers/staging/rt2870/rtmp_ckipmic.h
4652 Removing drivers/staging/rt2870/rtmp_def.h
4653 Removing drivers/staging/rt2870/rtmp_type.h
4654 Removing drivers/staging/rt2870/spectrum.h
4655 Removing drivers/staging/rt2870/spectrum_def.h
4656 Removing drivers/staging/rt2870/sta/aironet.c
4657 Removing drivers/staging/rt2870/sta/assoc.c
4658 Removing drivers/staging/rt2870/sta/auth.c
4659 Removing drivers/staging/rt2870/sta/auth_rsp.c
4660 Removing drivers/staging/rt2870/sta/connect.c
4661 Removing drivers/staging/rt2870/sta/rtmp_data.c
4662 Removing drivers/staging/rt2870/sta/sanity.c
4663 Removing drivers/staging/rt2870/sta/sync.c
4664 Removing drivers/staging/rt2870/sta/wpa.c
4665 Removing drivers/staging/rt2870/sta_ioctl.c
4666 Removing drivers/staging/rt2870/usb_main_dev.c
4667 Removing drivers/staging/rt2870/wpa.h
4668 Auto-merging drivers/staging/rts_pstor/ms.c
4669 Auto-merging drivers/staging/rts_pstor/sd.c
4670 Auto-merging drivers/staging/rts_pstor/xd.c
4671 Auto-merging kernel/module.c
4672 Merge made by recursive.
4673  drivers/staging/Kconfig                            |    4 -
4674  drivers/staging/Makefile                           |    5 +-
4675  drivers/staging/ath6kl/Kconfig                     |    6 -
4676  drivers/staging/ath6kl/Makefile                    |   39 +-
4677  drivers/staging/ath6kl/bmi/src/bmi.c               |    8 +-
4678  .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c   |  380 +-
4679  .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c   |   10 +-
4680  drivers/staging/ath6kl/htc2/AR6000/ar6k.c          |    2 +-
4681  drivers/staging/ath6kl/htc2/AR6000/ar6k.h          |    3 -
4682  .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c        |    2 +-
4683  drivers/staging/ath6kl/htc2/htc.c                  |   10 +-
4684  drivers/staging/ath6kl/htc2/htc_internal.h         |    8 -
4685  drivers/staging/ath6kl/htc2/htc_recv.c             |    6 -
4686  drivers/staging/ath6kl/htc2/htc_send.c             |    5 -
4687  drivers/staging/ath6kl/include/a_config.h          |   22 -
4688  drivers/staging/ath6kl/include/a_debug.h           |   28 -
4689  drivers/staging/ath6kl/include/a_drv.h             |   22 -
4690  drivers/staging/ath6kl/include/a_drv_api.h         |   28 -
4691  drivers/staging/ath6kl/include/a_osapi.h           |   29 -
4692  drivers/staging/ath6kl/include/a_types.h           |   26 -
4693  drivers/staging/ath6kl/include/ar6000_api.h        |   22 -
4694  drivers/staging/ath6kl/include/athendpack.h        |   52 -
4695  drivers/staging/ath6kl/include/athstartpack.h      |   55 -
4696  .../common/AR6002/hw4.0/hw/analog_intf_reg.h       |   13 -
4697  .../include/common/AR6002/hw4.0/hw/apb_map.h       |    8 -
4698  .../include/common/AR6002/hw4.0/hw/gpio_reg.h      |    8 -
4699  .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h |   13 -
4700  .../include/common/AR6002/hw4.0/hw/mbox_reg.h      |    8 -
4701  .../include/common/AR6002/hw4.0/hw/rtc_reg.h       |    8 -
4702  .../include/common/AR6002/hw4.0/hw/umbox_reg.h     |   14 -
4703  .../include/common/AR6002/hw4.0/hw/vmc_reg.h       |    8 -
4704  drivers/staging/ath6kl/include/common/bmi_msg.h    |    8 -
4705  drivers/staging/ath6kl/include/common/dbglog.h     |    8 -
4706  .../staging/ath6kl/include/common/dset_internal.h  |    8 -
4707  drivers/staging/ath6kl/include/common/dsetid.h     |    8 -
4708  .../staging/ath6kl/include/common/epping_test.h    |    9 -
4709  drivers/staging/ath6kl/include/common/gmboxif.h    |    8 -
4710  drivers/staging/ath6kl/include/common/htc.h        |    9 -
4711  drivers/staging/ath6kl/include/common/regdump.h    |    8 -
4712  drivers/staging/ath6kl/include/common/targaddrs.h  |  234 +-
4713  drivers/staging/ath6kl/include/common/wmi.h        |  128 +-
4714  drivers/staging/ath6kl/include/common/wmix.h       |    7 -
4715  drivers/staging/ath6kl/include/common_drv.h        |    4 -
4716  drivers/staging/ath6kl/miscdrv/ar3kconfig.c        |   22 +-
4717  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c   |   22 +-
4718  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c   |   28 +-
4719  .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h   |    5 -
4720  drivers/staging/ath6kl/miscdrv/common_drv.c        |   34 -
4721  drivers/staging/ath6kl/os/linux/ar6000_android.c   |  388 -
4722  drivers/staging/ath6kl/os/linux/ar6000_drv.c       |  791 +--
4723  drivers/staging/ath6kl/os/linux/ar6000_pm.c        |   77 -
4724  drivers/staging/ath6kl/os/linux/ar6k_pal.c         |  479 --
4725  drivers/staging/ath6kl/os/linux/cfg80211.c         |   12 +-
4726  drivers/staging/ath6kl/os/linux/eeprom.c           |  213 -
4727  drivers/staging/ath6kl/os/linux/hci_bridge.c       |    4 +-
4728  .../staging/ath6kl/os/linux/include/ar6000_drv.h   |  146 +-
4729  .../ath6kl/os/linux/include/ar6xapi_linux.h        |    8 -
4730  .../staging/ath6kl/os/linux/include/athdrv_linux.h |    4 +-
4731  .../staging/ath6kl/os/linux/include/config_linux.h |    7 -
4732  .../staging/ath6kl/os/linux/include/osapi_linux.h  |   49 +-
4733  .../staging/ath6kl/os/linux/include/wlan_config.h  |   10 -
4734  .../ath6kl/os/linux/include/wmi_filter_linux.h     |    2 +-
4735  drivers/staging/ath6kl/os/linux/ioctl.c            | 4767 ------------
4736  drivers/staging/ath6kl/os/linux/wireless_ext.c     | 2723 -------
4737  drivers/staging/ath6kl/reorder/rcv_aggr.c          |   10 +-
4738  drivers/staging/ath6kl/wlan/include/ieee80211.h    |    4 -
4739  drivers/staging/ath6kl/wlan/src/wlan_node.c        |    6 +-
4740  drivers/staging/ath6kl/wmi/wmi.c                   |  246 +-
4741  drivers/staging/brcm80211/Kconfig                  |   16 +-
4742  drivers/staging/brcm80211/README                   |  102 +-
4743  drivers/staging/brcm80211/TODO                     |   56 +-
4744  drivers/staging/brcm80211/brcmfmac/README          |   35 -
4745  drivers/staging/brcm80211/brcmfmac/bcmchip.h       |   34 +
4746  drivers/staging/brcm80211/brcmfmac/bcmsdh.c        |    3 +-
4747  drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c  |    6 +-
4748  drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c  |    7 +
4749  .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c        |    2 +-
4750  drivers/staging/brcm80211/brcmfmac/dhd_common.c    |    2 +-
4751  drivers/staging/brcm80211/brcmfmac/dhd_linux.c     |    2 +-
4752  drivers/staging/brcm80211/brcmfmac/dhd_sdio.c      |  294 +-
4753  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c   |    4 +
4754  drivers/staging/brcm80211/brcmfmac/wl_iw.c         |    4 +-
4755  drivers/staging/brcm80211/brcmsmac/Makefile        |    2 +-
4756  .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c   |   72 +-
4757  .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c   |   32 +-
4758  drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c |  106 +-
4759  drivers/staging/brcm80211/brcmsmac/wl_mac80211.c   |    7 +-
4760  drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c     |   24 +-
4761  drivers/staging/brcm80211/brcmsmac/wlc_bmac.c      |   71 +-
4762  drivers/staging/brcm80211/brcmsmac/wlc_main.c      |  128 +-
4763  drivers/staging/brcm80211/brcmsmac/wlc_main.h      |    2 +-
4764  drivers/staging/brcm80211/brcmsmac/wlc_pmu.c       | 1963 +++++
4765  drivers/staging/brcm80211/brcmsmac/wlc_pmu.h       |   58 +
4766  drivers/staging/brcm80211/brcmsmac/wlc_pub.h       |    6 +-
4767  drivers/staging/brcm80211/brcmsmac/wlc_stf.c       |   12 +-
4768  drivers/staging/brcm80211/include/bcmdevs.h        |   72 +-
4769  drivers/staging/brcm80211/include/bcmsrom_fmt.h    |    2 +-
4770  drivers/staging/brcm80211/include/bcmutils.h       |   18 +-
4771  drivers/staging/brcm80211/include/hndpmu.h         |    1 -
4772  drivers/staging/brcm80211/include/pcicfg.h         |  510 +--
4773  drivers/staging/brcm80211/util/bcmsrom.c           | 1336 ----
4774  drivers/staging/brcm80211/util/hnddma.c            |    3 -
4775  drivers/staging/brcm80211/util/hndpmu.c            |   49 -
4776  drivers/staging/brcm80211/util/nicpci.c            |   51 +-
4777  drivers/staging/brcm80211/util/nvram/nvram_ro.c    |    3 +-
4778  drivers/staging/brcm80211/util/siutils.c           |   75 +-
4779  .../comedi/drivers/addi-data/APCI1710_Ssi.c        |   16 +-
4780  drivers/staging/comedi/drivers/adl_pci9118.c       |    4 +-
4781  drivers/staging/comedi/drivers/cb_pcidda.c         |    2 +-
4782  drivers/staging/comedi/drivers/cb_pcimdas.c        |    2 +-
4783  drivers/staging/comedi/drivers/ni_660x.c           |    2 +-
4784  drivers/staging/comedi/drivers/ni_mio_common.c     |    6 +-
4785  drivers/staging/comedi/drivers/ni_tio.c            |    6 +-
4786  drivers/staging/comedi/drivers/pcl724.c            |    2 +-
4787  drivers/staging/comedi/drivers/pcl818.c            |    2 +-
4788  drivers/staging/comedi/drivers/pcm3724.c           |    2 +-
4789  drivers/staging/comedi/drivers/usbdux.c            |    2 +-
4790  drivers/staging/crystalhd/bc_dts_types.h           |    1 -
4791  drivers/staging/crystalhd/crystalhd_misc.c         |    4 +-
4792  drivers/staging/cx25821/cx25821-video.c            |    3 +-
4793  drivers/staging/easycap/easycap_main.c             |  229 +-
4794  drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      |  151 +-
4795  drivers/staging/gma500/Makefile                    |   15 +-
4796  drivers/staging/gma500/mrst.h                      |  217 +
4797  drivers/staging/gma500/mrst_crtc.c                 |  619 ++
4798  drivers/staging/gma500/mrst_lvds.c                 |  371 +
4799  drivers/staging/gma500/psb_2d.c                    |    9 +-
4800  drivers/staging/gma500/psb_bl.c                    |  118 +-
4801  drivers/staging/gma500/psb_buffer.c                |  450 --
4802  drivers/staging/gma500/psb_drm.h                   |  122 -
4803  drivers/staging/gma500/psb_drv.c                   |  731 +--
4804  drivers/staging/gma500/psb_drv.h                   |  462 +-
4805  drivers/staging/gma500/psb_fb.c                    |  363 +-
4806  drivers/staging/gma500/psb_fb.h                    |   16 +-
4807  drivers/staging/gma500/psb_fence.c                 |  122 -
4808  drivers/staging/gma500/psb_gem.c                   |  209 +
4809  drivers/staging/gma500/psb_gtt.c                   | 1224 +---
4810  drivers/staging/gma500/psb_gtt.h                   |   83 +-
4811  drivers/staging/gma500/psb_intel_display.c         |  147 +-
4812  drivers/staging/gma500/psb_intel_drv.h             |   13 +-
4813  drivers/staging/gma500/psb_intel_lvds.c            |   50 +-
4814  drivers/staging/gma500/psb_intel_sdvo.c            |    4 +-
4815  drivers/staging/gma500/psb_irq.c                   |  178 +-
4816  drivers/staging/gma500/{psb_reset.c => psb_lid.c}  |    0
4817  drivers/staging/gma500/psb_mmu.c                   |   61 -
4818  drivers/staging/gma500/psb_powermgmt.c             |  755 +--
4819  drivers/staging/gma500/psb_powermgmt.h             |   55 +-
4820  drivers/staging/gma500/psb_pvr_glue.c              |   73 -
4821  drivers/staging/gma500/psb_pvr_glue.h              |   25 -
4822  drivers/staging/gma500/psb_sgx.c                   |  238 -
4823  drivers/staging/gma500/psb_sgx.h                   |   32 -
4824  drivers/staging/gma500/psb_ttm_fence.c             |  605 --
4825  drivers/staging/gma500/psb_ttm_fence_api.h         |  272 -
4826  drivers/staging/gma500/psb_ttm_fence_driver.h      |  302 -
4827  drivers/staging/gma500/psb_ttm_fence_user.c        |  237 -
4828  drivers/staging/gma500/psb_ttm_fence_user.h        |  140 -
4829  drivers/staging/gma500/psb_ttm_glue.c              |  349 -
4830  drivers/staging/gma500/psb_ttm_placement_user.c    |  628 --
4831  drivers/staging/gma500/psb_ttm_placement_user.h    |  252 -
4832  drivers/staging/gma500/psb_ttm_userobj_api.h       |   85 -
4833  drivers/staging/hv/Makefile                        |    2 +-
4834  drivers/staging/hv/blkvsc.c                        |  102 -
4835  drivers/staging/hv/blkvsc_drv.c                    | 1508 ++---
4836  drivers/staging/hv/channel.c                       |   79 +-
4837  drivers/staging/hv/channel_mgmt.c                  |   76 +-
4838  drivers/staging/hv/connection.c                    |   65 +-
4839  drivers/staging/hv/hv.c                            |   64 +-
4840  drivers/staging/hv/hv_kvp.c                        |    9 +-
4841  drivers/staging/hv/hv_mouse.c                      |  420 +-
4842  drivers/staging/hv/hv_timesource.c                 |    3 +-
4843  drivers/staging/hv/hv_util.c                       |   31 +-
4844  drivers/staging/hv/netvsc.c                        |  943 +--
4845  drivers/staging/hv/netvsc_drv.c                    |   46 +-
4846  drivers/staging/hv/ring_buffer.c                   |   21 +-
4847  drivers/staging/hv/rndis_filter.c                  |   64 +-
4848  drivers/staging/hv/storvsc.c                       |  396 +-
4849  drivers/staging/hv/storvsc_api.h                   |  107 +-
4850  drivers/staging/hv/storvsc_drv.c                   |  185 +-
4851  drivers/staging/hv/vmbus_drv.c                     | 1043 +--
4852  drivers/staging/hv/vstorage.h                      |    5 +
4853  drivers/staging/iio/Documentation/device.txt       |    2 +-
4854  drivers/staging/iio/Documentation/generic_buffer.c |    2 +-
4855  drivers/staging/iio/Documentation/sysfs-bus-iio    |   13 +
4856  .../staging/iio/Documentation/sysfs-bus-iio-light  |   13 +
4857  .../iio/Documentation/sysfs-bus-iio-light-tsl2583  |   20 +
4858  drivers/staging/iio/accel/adis16201_core.c         |   28 +-
4859  drivers/staging/iio/accel/adis16201_trigger.c      |   45 +-
4860  drivers/staging/iio/accel/adis16203_core.c         |   28 +-
4861  drivers/staging/iio/accel/adis16203_trigger.c      |   46 +-
4862  drivers/staging/iio/accel/adis16204_core.c         |   28 +-
4863  drivers/staging/iio/accel/adis16204_trigger.c      |   46 +-
4864  drivers/staging/iio/accel/adis16209_core.c         |   28 +-
4865  drivers/staging/iio/accel/adis16209_trigger.c      |   45 +-
4866  drivers/staging/iio/accel/adis16220_core.c         |    2 +-
4867  drivers/staging/iio/accel/adis16240_core.c         |   28 +-
4868  drivers/staging/iio/accel/adis16240_trigger.c      |   46 +-
4869  drivers/staging/iio/accel/kxsd9.c                  |    2 +-
4870  drivers/staging/iio/accel/lis3l02dq_core.c         |    4 +-
4871  drivers/staging/iio/accel/sca3000_core.c           |    2 +-
4872  drivers/staging/iio/accel/sca3000_ring.c           |    8 +-
4873  drivers/staging/iio/adc/Kconfig                    |   11 +
4874  drivers/staging/iio/adc/Makefile                   |    1 +
4875  drivers/staging/iio/adc/ad7150.c                   |    2 +-
4876  drivers/staging/iio/adc/ad7152.c                   |    2 +-
4877  drivers/staging/iio/adc/ad7291.c                   |    2 +-
4878  drivers/staging/iio/adc/ad7298_core.c              |    2 +-
4879  drivers/staging/iio/adc/ad7314.c                   |    2 +-
4880  drivers/staging/iio/adc/ad7476_core.c              |    2 +-
4881  drivers/staging/iio/adc/ad7606_core.c              |    2 +-
4882  drivers/staging/iio/adc/ad7745.c                   |    2 +-
4883  drivers/staging/iio/adc/ad7780.c                   |  329 +
4884  drivers/staging/iio/adc/ad7780.h                   |   30 +
4885  drivers/staging/iio/adc/ad7816.c                   |    2 +-
4886  drivers/staging/iio/adc/ad7887_core.c              |    2 +-
4887  drivers/staging/iio/adc/ad799x_core.c              |    2 +-
4888  drivers/staging/iio/adc/adt7310.c                  |    2 +-
4889  drivers/staging/iio/adc/adt7410.c                  |    2 +-
4890  drivers/staging/iio/adc/adt75.c                    |    2 +-
4891  drivers/staging/iio/adc/max1363.h                  |    2 -
4892  drivers/staging/iio/adc/max1363_core.c             |  189 +-
4893  drivers/staging/iio/adc/max1363_ring.c             |   21 +-
4894  drivers/staging/iio/addac/adt7316.c                |    8 +-
4895  drivers/staging/iio/dac/Kconfig                    |   20 +
4896  drivers/staging/iio/dac/Makefile                   |    2 +
4897  drivers/staging/iio/dac/ad5446.c                   |    9 +-
4898  drivers/staging/iio/dac/ad5446.h                   |    1 +
4899  drivers/staging/iio/dac/ad5504.c                   |  426 +
4900  drivers/staging/iio/dac/ad5504.h                   |   74 +
4901  drivers/staging/iio/dac/ad5624r_spi.c              |    2 +-
4902  drivers/staging/iio/dac/ad5791.c                   |  418 +
4903  drivers/staging/iio/dac/ad5791.h                   |  109 +
4904  drivers/staging/iio/dac/max517.c                   |    2 +-
4905  drivers/staging/iio/dds/ad5930.c                   |    2 +-
4906  drivers/staging/iio/dds/ad9832.c                   |    2 +-
4907  drivers/staging/iio/dds/ad9834.c                   |    2 +-
4908  drivers/staging/iio/dds/ad9850.c                   |    2 +-
4909  drivers/staging/iio/dds/ad9852.c                   |    2 +-
4910  drivers/staging/iio/dds/ad9910.c                   |    2 +-
4911  drivers/staging/iio/dds/ad9951.c                   |    2 +-
4912  drivers/staging/iio/gyro/Kconfig                   |   10 +
4913  drivers/staging/iio/gyro/Makefile                  |    3 +
4914  drivers/staging/iio/gyro/adis16060_core.c          |    2 +-
4915  drivers/staging/iio/gyro/adis16080_core.c          |    2 +-
4916  drivers/staging/iio/gyro/adis16130_core.c          |    2 +-
4917  drivers/staging/iio/gyro/adis16260_core.c          |   27 +-
4918  drivers/staging/iio/gyro/adis16260_trigger.c       |   46 +-
4919  drivers/staging/iio/gyro/adxrs450.h                |   58 +
4920  drivers/staging/iio/gyro/adxrs450_core.c           |  446 ++
4921  drivers/staging/iio/gyro/gyro.h                    |    3 +
4922  drivers/staging/iio/iio.h                          |   17 +-
4923  drivers/staging/iio/imu/adis16300_core.c           |   28 +-
4924  drivers/staging/iio/imu/adis16300_trigger.c        |   48 +-
4925  drivers/staging/iio/imu/adis16350_core.c           |   28 +-
4926  drivers/staging/iio/imu/adis16350_trigger.c        |   48 +-
4927  drivers/staging/iio/imu/adis16400_core.c           |   28 +-
4928  drivers/staging/iio/imu/adis16400_trigger.c        |   47 +-
4929  drivers/staging/iio/industrialio-core.c            |   15 +-
4930  drivers/staging/iio/industrialio-ring.c            |   12 +-
4931  drivers/staging/iio/industrialio-trigger.c         |   27 +-
4932  drivers/staging/iio/kfifo_buf.c                    |    8 +-
4933  drivers/staging/iio/kfifo_buf.h                    |   10 +-
4934  drivers/staging/iio/light/Kconfig                  |    6 +
4935  drivers/staging/iio/light/Makefile                 |    1 +
4936  drivers/staging/iio/light/isl29018.c               |    2 +-
4937  drivers/staging/iio/light/tsl2563.c                |   72 +-
4938  drivers/staging/iio/light/tsl2583.c                |  960 +++
4939  drivers/staging/iio/magnetometer/ak8975.c          |  122 +-
4940  drivers/staging/iio/magnetometer/hmc5843.c         |    2 +-
4941  drivers/staging/iio/meter/ade7753.c                |    2 +-
4942  drivers/staging/iio/meter/ade7754.c                |    2 +-
4943  drivers/staging/iio/meter/ade7758_core.c           |   32 +-
4944  drivers/staging/iio/meter/ade7758_trigger.c        |   48 +-
4945  drivers/staging/iio/meter/ade7759.c                |    2 +-
4946  drivers/staging/iio/meter/ade7854.c                |    2 +-
4947  drivers/staging/iio/resolver/ad2s120x.c            |    2 +-
4948  drivers/staging/iio/resolver/ad2s1210.c            |    2 +-
4949  drivers/staging/iio/resolver/ad2s90.c              |    2 +-
4950  drivers/staging/iio/ring_generic.h                 |   10 +-
4951  drivers/staging/iio/ring_sw.c                      |   13 +-
4952  drivers/staging/iio/ring_sw.h                      |   14 +-
4953  drivers/staging/iio/sysfs.h                        |    1 +
4954  drivers/staging/iio/trigger.h                      |    7 -
4955  .../staging/intel_sst/intel_sst_app_interface.c    |    8 +-
4956  drivers/staging/intel_sst/intel_sst_pvt.c          |    2 +-
4957  drivers/staging/keucr/msscsi.c                     |   29 +-
4958  drivers/staging/keucr/scsiglue.c                   |   35 +-
4959  drivers/staging/keucr/smilmain.c                   |   16 +-
4960  drivers/staging/keucr/transport.c                  |  140 +-
4961  drivers/staging/keucr/usb.c                        |   88 +-
4962  drivers/staging/lirc/lirc_serial.c                 |    2 +-
4963  drivers/staging/octeon/ethernet-mdio.c             |    2 -
4964  drivers/staging/olpc_dcon/olpc_dcon_xo_1.c         |    2 +-
4965  drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c       |   22 +-
4966  drivers/staging/rt2860/Kconfig                     |   10 -
4967  drivers/staging/rt2860/Makefile                    |   52 -
4968  drivers/staging/rt2860/TODO                        |   16 -
4969  drivers/staging/rt2860/ap.h                        |   68 -
4970  drivers/staging/rt2860/chip/mac_pci.h              |  355 -
4971  drivers/staging/rt2860/chip/mac_usb.h              |  345 -
4972  drivers/staging/rt2860/chip/rt2860.h               |   54 -
4973  drivers/staging/rt2860/chip/rt2870.h               |   46 -
4974  drivers/staging/rt2860/chip/rt3070.h               |   67 -
4975  drivers/staging/rt2860/chip/rt3090.h               |   72 -
4976  drivers/staging/rt2860/chip/rt30xx.h               |   47 -
4977  drivers/staging/rt2860/chip/rtmp_mac.h             | 1308 ----
4978  drivers/staging/rt2860/chip/rtmp_phy.h             |  516 --
4979  drivers/staging/rt2860/chips/rt3070.c              |  169 -
4980  drivers/staging/rt2860/chips/rt3090.c              |  121 -
4981  drivers/staging/rt2860/chips/rt30xx.c              |  516 --
4982  drivers/staging/rt2860/chlist.h                    |  113 -
4983  drivers/staging/rt2860/common/action.c             |  606 --
4984  drivers/staging/rt2860/common/action.h             |   56 -
4985  drivers/staging/rt2860/common/ba_action.c          | 1650 ----
4986  drivers/staging/rt2860/common/cmm_aes.c            | 1311 ----
4987  drivers/staging/rt2860/common/cmm_asic.c           | 2565 ------
4988  drivers/staging/rt2860/common/cmm_cfg.c            |  258 -
4989  drivers/staging/rt2860/common/cmm_data.c           | 2361 ------
4990  drivers/staging/rt2860/common/cmm_data_pci.c       | 1096 ---
4991  drivers/staging/rt2860/common/cmm_data_usb.c       |  951 ---
4992  drivers/staging/rt2860/common/cmm_info.c           |  955 ---
4993  drivers/staging/rt2860/common/cmm_mac_pci.c        | 1661 ----
4994  drivers/staging/rt2860/common/cmm_mac_usb.c        | 1162 ---
4995  drivers/staging/rt2860/common/cmm_sanity.c         | 1205 ---
4996  drivers/staging/rt2860/common/cmm_sync.c           |  718 --
4997  drivers/staging/rt2860/common/cmm_tkip.c           |  833 --
4998  drivers/staging/rt2860/common/cmm_wep.c            |  473 --
4999  drivers/staging/rt2860/common/cmm_wpa.c            | 3010 --------
5000  drivers/staging/rt2860/common/crypt_hmac.c         |  187 -
5001  drivers/staging/rt2860/common/crypt_md5.c          |  339 -
5002  drivers/staging/rt2860/common/crypt_sha2.c         |  269 -
5003  drivers/staging/rt2860/common/dfs.c                |   68 -
5004  drivers/staging/rt2860/common/ee_efuse.c           |  351 -
5005  drivers/staging/rt2860/common/ee_prom.c            |  197 -
5006  drivers/staging/rt2860/common/eeprom.c             |   91 -
5007  drivers/staging/rt2860/common/mlme.c               | 6068 ---------------
5008  drivers/staging/rt2860/common/rt_channel.c         | 1705 ----
5009  drivers/staging/rt2860/common/rt_rf.c              |  187 -
5010  drivers/staging/rt2860/common/rtmp_init.c          | 3536 ---------
5011  drivers/staging/rt2860/common/rtmp_mcu.c           |  336 -
5012  drivers/staging/rt2860/common/rtmp_timer.c         |  302 -
5013  drivers/staging/rt2860/common/spectrum.c           | 2205 ------
5014  drivers/staging/rt2860/crypt_hmac.h                |   65 -
5015  drivers/staging/rt2860/crypt_md5.h                 |   73 -
5016  drivers/staging/rt2860/crypt_sha2.h                |   73 -
5017  drivers/staging/rt2860/dfs.h                       |   39 -
5018  drivers/staging/rt2860/eeprom.h                    |   67 -
5019  drivers/staging/rt2860/iface/rtmp_pci.h            |   80 -
5020  drivers/staging/rt2860/iface/rtmp_usb.h            |  196 -
5021  drivers/staging/rt2860/mlme.h                      | 1050 ---
5022  drivers/staging/rt2860/oid.h                       |  779 --
5023  drivers/staging/rt2860/pci_main_dev.c              | 1192 ---
5024  drivers/staging/rt2860/rt_config.h                 |   71 -
5025  drivers/staging/rt2860/rt_linux.c                  | 1367 ----
5026  drivers/staging/rt2860/rt_linux.h                  |  835 --
5027  drivers/staging/rt2860/rt_main_dev.c               |  736 --
5028  drivers/staging/rt2860/rt_pci_rbus.c               |  837 --
5029  drivers/staging/rt2860/rt_usb.c                    |  794 --
5030  drivers/staging/rt2860/rtmp.h                      | 4332 -----------
5031  drivers/staging/rt2860/rtmp_chip.h                 |  258 -
5032  drivers/staging/rt2860/rtmp_ckipmic.h              |   63 -
5033  drivers/staging/rt2860/rtmp_def.h                  | 1427 ----
5034  drivers/staging/rt2860/rtmp_dot11.h                |  100 -
5035  drivers/staging/rt2860/rtmp_iface.h                |   75 -
5036  drivers/staging/rt2860/rtmp_mcu.h                  |   49 -
5037  drivers/staging/rt2860/rtmp_os.h                   |   90 -
5038  drivers/staging/rt2860/rtmp_timer.h                |  148 -
5039  drivers/staging/rt2860/rtmp_type.h                 |   89 -
5040  drivers/staging/rt2860/rtusb_io.h                  |  185 -
5041  drivers/staging/rt2860/spectrum.h                  |  189 -
5042  drivers/staging/rt2860/spectrum_def.h              |  202 -
5043  drivers/staging/rt2860/sta/assoc.c                 | 1602 ----
5044  drivers/staging/rt2860/sta/auth.c                  |  517 --
5045  drivers/staging/rt2860/sta/auth_rsp.c              |  142 -
5046  drivers/staging/rt2860/sta/connect.c               | 2613 -------
5047  drivers/staging/rt2860/sta/rtmp_data.c             | 2552 ------
5048  drivers/staging/rt2860/sta/sanity.c                |  362 -
5049  drivers/staging/rt2860/sta/sync.c                  | 1968 -----
5050  drivers/staging/rt2860/sta/wpa.c                   |  374 -
5051  drivers/staging/rt2860/sta_ioctl.c                 | 2912 -------
5052  drivers/staging/rt2860/usb_main_dev.c              |  927 ---
5053  drivers/staging/rt2860/wpa.h                       |  390 -
5054  drivers/staging/rt2870/Kconfig                     |    9 -
5055  drivers/staging/rt2870/Makefile                    |   55 -
5056  drivers/staging/rt2870/TODO                        |   17 -
5057  drivers/staging/rt2870/aironet.h                   |    1 -
5058  drivers/staging/rt2870/ap.h                        |    1 -
5059  drivers/staging/rt2870/chips/rt3070.c              |    1 -
5060  drivers/staging/rt2870/chips/rt30xx.c              |    1 -
5061  drivers/staging/rt2870/chlist.h                    |    1 -
5062  drivers/staging/rt2870/common/acction.c            |    1 -
5063  drivers/staging/rt2870/common/action.c             |    1 -
5064  drivers/staging/rt2870/common/action.h             |    1 -
5065  drivers/staging/rt2870/common/ba_action.c          |    1 -
5066  drivers/staging/rt2870/common/cmm_aes.c            |    1 -
5067  drivers/staging/rt2870/common/cmm_asic.c           |    1 -
5068  drivers/staging/rt2870/common/cmm_cfg.c            |    1 -
5069  drivers/staging/rt2870/common/cmm_data.c           |    1 -
5070  drivers/staging/rt2870/common/cmm_data_usb.c       |    1 -
5071  drivers/staging/rt2870/common/cmm_info.c           |    1 -
5072  drivers/staging/rt2870/common/cmm_mac_usb.c        |    1 -
5073  drivers/staging/rt2870/common/cmm_profile.c        |    1 -
5074  drivers/staging/rt2870/common/cmm_sanity.c         |    1 -
5075  drivers/staging/rt2870/common/cmm_sync.c           |    1 -
5076  drivers/staging/rt2870/common/cmm_tkip.c           |    1 -
5077  drivers/staging/rt2870/common/cmm_wep.c            |    1 -
5078  drivers/staging/rt2870/common/cmm_wpa.c            |    1 -
5079  drivers/staging/rt2870/common/crypt_hmac.c         |    1 -
5080  drivers/staging/rt2870/common/crypt_md5.c          |    1 -
5081  drivers/staging/rt2870/common/crypt_sha2.c         |    1 -
5082  drivers/staging/rt2870/common/dfs.c                |    1 -
5083  drivers/staging/rt2870/common/ee_efuse.c           |    1 -
5084  drivers/staging/rt2870/common/eeprom.c             |    1 -
5085  drivers/staging/rt2870/common/md5.c                |    1 -
5086  drivers/staging/rt2870/common/mlme.c               |    1 -
5087  drivers/staging/rt2870/common/rt_channel.c         |    1 -
5088  drivers/staging/rt2870/common/rt_rf.c              |    1 -
5089  drivers/staging/rt2870/common/rtmp_init.c          |    1 -
5090  drivers/staging/rt2870/common/rtmp_mcu.c           |    1 -
5091  drivers/staging/rt2870/common/rtmp_timer.c         |    1 -
5092  drivers/staging/rt2870/common/rtmp_tkip.c          |    1 -
5093  drivers/staging/rt2870/common/rtmp_wep.c           |    1 -
5094  drivers/staging/rt2870/common/rtusb_bulk.c         | 1232 ---
5095  drivers/staging/rt2870/common/rtusb_data.c         |  262 -
5096  drivers/staging/rt2870/common/rtusb_io.c           | 2104 -----
5097  drivers/staging/rt2870/common/spectrum.c           |    1 -
5098  drivers/staging/rt2870/dfs.h                       |    1 -
5099  drivers/staging/rt2870/md5.h                       |    1 -
5100  drivers/staging/rt2870/mlme.h                      |    1 -
5101  drivers/staging/rt2870/oid.h                       |    1 -
5102  drivers/staging/rt2870/rt28xx.h                    |    1 -
5103  drivers/staging/rt2870/rt_config.h                 |    1 -
5104  drivers/staging/rt2870/rt_linux.c                  |    1 -
5105  drivers/staging/rt2870/rt_linux.h                  |    1 -
5106  drivers/staging/rt2870/rt_main_dev.c               |    1 -
5107  drivers/staging/rt2870/rt_profile.c                |    1 -
5108  drivers/staging/rt2870/rt_usb.c                    |    1 -
5109  drivers/staging/rt2870/rtmp.h                      |    1 -
5110  drivers/staging/rt2870/rtmp_ckipmic.h              |    1 -
5111  drivers/staging/rt2870/rtmp_def.h                  |    1 -
5112  drivers/staging/rt2870/rtmp_type.h                 |    1 -
5113  drivers/staging/rt2870/spectrum.h                  |    1 -
5114  drivers/staging/rt2870/spectrum_def.h              |    1 -
5115  drivers/staging/rt2870/sta/aironet.c               |    1 -
5116  drivers/staging/rt2870/sta/assoc.c                 |    1 -
5117  drivers/staging/rt2870/sta/auth.c                  |    1 -
5118  drivers/staging/rt2870/sta/auth_rsp.c              |    1 -
5119  drivers/staging/rt2870/sta/connect.c               |    1 -
5120  drivers/staging/rt2870/sta/rtmp_data.c             |    1 -
5121  drivers/staging/rt2870/sta/sanity.c                |    1 -
5122  drivers/staging/rt2870/sta/sync.c                  |    1 -
5123  drivers/staging/rt2870/sta/wpa.c                   |    1 -
5124  drivers/staging/rt2870/sta_ioctl.c                 |    1 -
5125  drivers/staging/rt2870/usb_main_dev.c              |    1 -
5126  drivers/staging/rt2870/wpa.h                       |    1 -
5127  drivers/staging/rtl8712/ieee80211.h                |   26 +-
5128  drivers/staging/rtl8712/if_ether.h                 |    4 +-
5129  drivers/staging/rtl8712/ip.h                       |   34 +-
5130  drivers/staging/rtl8712/mlme_osdep.h               |    4 +-
5131  drivers/staging/rtl8712/osdep_service.h            |    3 +-
5132  drivers/staging/rtl8712/recv_osdep.h               |    4 +-
5133  drivers/staging/rtl8712/rtl8712_event.h            |   25 +-
5134  drivers/staging/rtl8712/rtl8712_hal.h              |  100 +-
5135  drivers/staging/rtl8712/rtl8712_led.c              |    2 +-
5136  drivers/staging/rtl8712/rtl8712_recv.c             |    2 +-
5137  drivers/staging/rtl8712/rtl8712_recv.h             |    2 +-
5138  drivers/staging/rtl8712/rtl8712_xmit.h             |   11 +-
5139  drivers/staging/rtl8712/rtl871x_cmd.c              |    7 +-
5140  drivers/staging/rtl8712/rtl871x_cmd.h              |   26 +-
5141  drivers/staging/rtl8712/rtl871x_event.h            |   12 +-
5142  drivers/staging/rtl8712/rtl871x_io.c               |    6 +-
5143  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    9 +-
5144  drivers/staging/rtl8712/rtl871x_ioctl_rtl.c        |    2 +-
5145  drivers/staging/rtl8712/rtl871x_ioctl_set.h        |   16 +-
5146  drivers/staging/rtl8712/rtl871x_mp.c               |    8 +-
5147  drivers/staging/rtl8712/rtl871x_mp_ioctl.h         |   10 +-
5148  drivers/staging/rtl8712/rtl871x_recv.c             |   16 +-
5149  drivers/staging/rtl8712/rtl871x_recv.h             |    4 +-
5150  drivers/staging/rtl8712/rtl871x_rf.h               |    2 +-
5151  drivers/staging/rtl8712/rtl871x_security.h         |   51 +-
5152  drivers/staging/rtl8712/rtl871x_xmit.c             |    3 +-
5153  drivers/staging/rtl8712/rtl871x_xmit.h             |    3 +-
5154  drivers/staging/rtl8712/wifi.h                     |   63 +-
5155  drivers/staging/rtl8712/wlan_bssdef.h              |  212 +-
5156  drivers/staging/rts_pstor/ms.c                     |   52 +-
5157  drivers/staging/rts_pstor/rtsx.h                   |    3 -
5158  drivers/staging/rts_pstor/sd.c                     |    1 +
5159  drivers/staging/rts_pstor/spi.c                    |   34 +-
5160  drivers/staging/rts_pstor/xd.c                     |    4 +-
5161  drivers/staging/sbe-2t3e3/dc.c                     |   33 +-
5162  drivers/staging/sep/sep_driver.c                   |    9 +-
5163  drivers/staging/tty/istallion.c                    |    2 +-
5164  drivers/staging/vt6655/bssdb.c                     |    8 +-
5165  drivers/staging/vt6655/device_main.c               |   14 +-
5166  drivers/staging/vt6655/dpc.c                       |   10 +-
5167  drivers/staging/vt6655/ioctl.c                     |   44 +-
5168  drivers/staging/vt6655/power.c                     |    2 +-
5169  drivers/staging/vt6655/rxtx.c                      |    4 +-
5170  drivers/staging/vt6655/wcmd.c                      |   14 +-
5171  drivers/staging/vt6655/wmgr.c                      |   46 +-
5172  drivers/staging/vt6655/wpactl.c                    |   10 +-
5173  drivers/staging/vt6656/bssdb.c                     |    8 +-
5174  drivers/staging/vt6656/dpc.c                       |   10 +-
5175  drivers/staging/vt6656/ioctl.c                     |   44 +-
5176  drivers/staging/vt6656/main_usb.c                  |    4 +-
5177  drivers/staging/vt6656/rxtx.c                      |    4 +-
5178  drivers/staging/vt6656/wcmd.c                      |    8 +-
5179  drivers/staging/vt6656/wmgr.c                      |   48 +-
5180  drivers/staging/vt6656/wpactl.c                    |   10 +-
5181  .../arch/arm/mach-omap2/cyashalomap_kernel.c       |    2 +-
5182  .../westbridge/astoria/block/cyasblkdev_block.c    |    2 +-
5183  drivers/staging/winbond/mto.c                      |   10 -
5184  drivers/staging/winbond/phy_calibration.c          |    8 +-
5185  drivers/staging/winbond/wb35tx.c                   |    3 +-
5186  drivers/staging/xgifb/XGI_main.h                   |  136 -
5187  drivers/staging/xgifb/XGI_main_26.c                |  947 +--
5188  drivers/staging/xgifb/XGIfb.h                      |  142 +-
5189  drivers/staging/xgifb/vb_def.h                     | 1269 ++--
5190  drivers/staging/xgifb/vb_ext.c                     |  138 +-
5191  drivers/staging/xgifb/vb_ext.h                     |   25 +-
5192  drivers/staging/xgifb/vb_init.c                    |  527 +-
5193  drivers/staging/xgifb/vb_init.h                    |    7 +-
5194  drivers/staging/xgifb/vb_setmode.c                 | 1885 +++--
5195  drivers/staging/xgifb/vb_setmode.h                 |   97 +-
5196  drivers/staging/xgifb/vb_struct.h                  |  823 +--
5197  drivers/staging/xgifb/vb_table.h                   | 8147 ++++++++++----------
5198  drivers/staging/xgifb/vb_util.c                    |    2 +-
5199  drivers/staging/xgifb/vgatypes.h                   |  113 +-
5200  kernel/module.c                                    |    4 +-
5201  528 files changed, 20038 insertions(+), 105945 deletions(-)
5202  delete mode 100644 drivers/staging/ath6kl/include/athendpack.h
5203  delete mode 100644 drivers/staging/ath6kl/include/athstartpack.h
5204  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c
5205  delete mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c
5206  delete mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c
5207  delete mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c
5208  create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmchip.h
5209  create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pmu.c
5210  create mode 100644 drivers/staging/brcm80211/brcmsmac/wlc_pmu.h
5211  create mode 100644 drivers/staging/gma500/mrst.h
5212  create mode 100644 drivers/staging/gma500/mrst_crtc.c
5213  create mode 100644 drivers/staging/gma500/mrst_lvds.c
5214  delete mode 100644 drivers/staging/gma500/psb_buffer.c
5215  delete mode 100644 drivers/staging/gma500/psb_fence.c
5216  create mode 100644 drivers/staging/gma500/psb_gem.c
5217  rename drivers/staging/gma500/{psb_reset.c => psb_lid.c} (100%)
5218  delete mode 100644 drivers/staging/gma500/psb_pvr_glue.c
5219  delete mode 100644 drivers/staging/gma500/psb_pvr_glue.h
5220  delete mode 100644 drivers/staging/gma500/psb_sgx.c
5221  delete mode 100644 drivers/staging/gma500/psb_sgx.h
5222  delete mode 100644 drivers/staging/gma500/psb_ttm_fence.c
5223  delete mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h
5224  delete mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h
5225  delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c
5226  delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h
5227  delete mode 100644 drivers/staging/gma500/psb_ttm_glue.c
5228  delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c
5229  delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h
5230  delete mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h
5231  delete mode 100644 drivers/staging/hv/blkvsc.c
5232  create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583
5233  create mode 100644 drivers/staging/iio/adc/ad7780.c
5234  create mode 100644 drivers/staging/iio/adc/ad7780.h
5235  create mode 100644 drivers/staging/iio/dac/ad5504.c
5236  create mode 100644 drivers/staging/iio/dac/ad5504.h
5237  create mode 100644 drivers/staging/iio/dac/ad5791.c
5238  create mode 100644 drivers/staging/iio/dac/ad5791.h
5239  create mode 100644 drivers/staging/iio/gyro/adxrs450.h
5240  create mode 100644 drivers/staging/iio/gyro/adxrs450_core.c
5241  create mode 100644 drivers/staging/iio/light/tsl2583.c
5242  delete mode 100644 drivers/staging/rt2860/Kconfig
5243  delete mode 100644 drivers/staging/rt2860/Makefile
5244  delete mode 100644 drivers/staging/rt2860/TODO
5245  delete mode 100644 drivers/staging/rt2860/ap.h
5246  delete mode 100644 drivers/staging/rt2860/chip/mac_pci.h
5247  delete mode 100644 drivers/staging/rt2860/chip/mac_usb.h
5248  delete mode 100644 drivers/staging/rt2860/chip/rt2860.h
5249  delete mode 100644 drivers/staging/rt2860/chip/rt2870.h
5250  delete mode 100644 drivers/staging/rt2860/chip/rt3070.h
5251  delete mode 100644 drivers/staging/rt2860/chip/rt3090.h
5252  delete mode 100644 drivers/staging/rt2860/chip/rt30xx.h
5253  delete mode 100644 drivers/staging/rt2860/chip/rtmp_mac.h
5254  delete mode 100644 drivers/staging/rt2860/chip/rtmp_phy.h
5255  delete mode 100644 drivers/staging/rt2860/chips/rt3070.c
5256  delete mode 100644 drivers/staging/rt2860/chips/rt3090.c
5257  delete mode 100644 drivers/staging/rt2860/chips/rt30xx.c
5258  delete mode 100644 drivers/staging/rt2860/chlist.h
5259  delete mode 100644 drivers/staging/rt2860/common/action.c
5260  delete mode 100644 drivers/staging/rt2860/common/action.h
5261  delete mode 100644 drivers/staging/rt2860/common/ba_action.c
5262  delete mode 100644 drivers/staging/rt2860/common/cmm_aes.c
5263  delete mode 100644 drivers/staging/rt2860/common/cmm_asic.c
5264  delete mode 100644 drivers/staging/rt2860/common/cmm_cfg.c
5265  delete mode 100644 drivers/staging/rt2860/common/cmm_data.c
5266  delete mode 100644 drivers/staging/rt2860/common/cmm_data_pci.c
5267  delete mode 100644 drivers/staging/rt2860/common/cmm_data_usb.c
5268  delete mode 100644 drivers/staging/rt2860/common/cmm_info.c
5269  delete mode 100644 drivers/staging/rt2860/common/cmm_mac_pci.c
5270  delete mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c
5271  delete mode 100644 drivers/staging/rt2860/common/cmm_sanity.c
5272  delete mode 100644 drivers/staging/rt2860/common/cmm_sync.c
5273  delete mode 100644 drivers/staging/rt2860/common/cmm_tkip.c
5274  delete mode 100644 drivers/staging/rt2860/common/cmm_wep.c
5275  delete mode 100644 drivers/staging/rt2860/common/cmm_wpa.c
5276  delete mode 100644 drivers/staging/rt2860/common/crypt_hmac.c
5277  delete mode 100644 drivers/staging/rt2860/common/crypt_md5.c
5278  delete mode 100644 drivers/staging/rt2860/common/crypt_sha2.c
5279  delete mode 100644 drivers/staging/rt2860/common/dfs.c
5280  delete mode 100644 drivers/staging/rt2860/common/ee_efuse.c
5281  delete mode 100644 drivers/staging/rt2860/common/ee_prom.c
5282  delete mode 100644 drivers/staging/rt2860/common/eeprom.c
5283  delete mode 100644 drivers/staging/rt2860/common/mlme.c
5284  delete mode 100644 drivers/staging/rt2860/common/rt_channel.c
5285  delete mode 100644 drivers/staging/rt2860/common/rt_rf.c
5286  delete mode 100644 drivers/staging/rt2860/common/rtmp_init.c
5287  delete mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c
5288  delete mode 100644 drivers/staging/rt2860/common/rtmp_timer.c
5289  delete mode 100644 drivers/staging/rt2860/common/spectrum.c
5290  delete mode 100644 drivers/staging/rt2860/crypt_hmac.h
5291  delete mode 100644 drivers/staging/rt2860/crypt_md5.h
5292  delete mode 100644 drivers/staging/rt2860/crypt_sha2.h
5293  delete mode 100644 drivers/staging/rt2860/dfs.h
5294  delete mode 100644 drivers/staging/rt2860/eeprom.h
5295  delete mode 100644 drivers/staging/rt2860/iface/rtmp_pci.h
5296  delete mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h
5297  delete mode 100644 drivers/staging/rt2860/mlme.h
5298  delete mode 100644 drivers/staging/rt2860/oid.h
5299  delete mode 100644 drivers/staging/rt2860/pci_main_dev.c
5300  delete mode 100644 drivers/staging/rt2860/rt_config.h
5301  delete mode 100644 drivers/staging/rt2860/rt_linux.c
5302  delete mode 100644 drivers/staging/rt2860/rt_linux.h
5303  delete mode 100644 drivers/staging/rt2860/rt_main_dev.c
5304  delete mode 100644 drivers/staging/rt2860/rt_pci_rbus.c
5305  delete mode 100644 drivers/staging/rt2860/rt_usb.c
5306  delete mode 100644 drivers/staging/rt2860/rtmp.h
5307  delete mode 100644 drivers/staging/rt2860/rtmp_chip.h
5308  delete mode 100644 drivers/staging/rt2860/rtmp_ckipmic.h
5309  delete mode 100644 drivers/staging/rt2860/rtmp_def.h
5310  delete mode 100644 drivers/staging/rt2860/rtmp_dot11.h
5311  delete mode 100644 drivers/staging/rt2860/rtmp_iface.h
5312  delete mode 100644 drivers/staging/rt2860/rtmp_mcu.h
5313  delete mode 100644 drivers/staging/rt2860/rtmp_os.h
5314  delete mode 100644 drivers/staging/rt2860/rtmp_timer.h
5315  delete mode 100644 drivers/staging/rt2860/rtmp_type.h
5316  delete mode 100644 drivers/staging/rt2860/rtusb_io.h
5317  delete mode 100644 drivers/staging/rt2860/spectrum.h
5318  delete mode 100644 drivers/staging/rt2860/spectrum_def.h
5319  delete mode 100644 drivers/staging/rt2860/sta/assoc.c
5320  delete mode 100644 drivers/staging/rt2860/sta/auth.c
5321  delete mode 100644 drivers/staging/rt2860/sta/auth_rsp.c
5322  delete mode 100644 drivers/staging/rt2860/sta/connect.c
5323  delete mode 100644 drivers/staging/rt2860/sta/rtmp_data.c
5324  delete mode 100644 drivers/staging/rt2860/sta/sanity.c
5325  delete mode 100644 drivers/staging/rt2860/sta/sync.c
5326  delete mode 100644 drivers/staging/rt2860/sta/wpa.c
5327  delete mode 100644 drivers/staging/rt2860/sta_ioctl.c
5328  delete mode 100644 drivers/staging/rt2860/usb_main_dev.c
5329  delete mode 100644 drivers/staging/rt2860/wpa.h
5330  delete mode 100644 drivers/staging/rt2870/Kconfig
5331  delete mode 100644 drivers/staging/rt2870/Makefile
5332  delete mode 100644 drivers/staging/rt2870/TODO
5333  delete mode 100644 drivers/staging/rt2870/aironet.h
5334  delete mode 100644 drivers/staging/rt2870/ap.h
5335  delete mode 100644 drivers/staging/rt2870/chips/rt3070.c
5336  delete mode 100644 drivers/staging/rt2870/chips/rt30xx.c
5337  delete mode 100644 drivers/staging/rt2870/chlist.h
5338  delete mode 100644 drivers/staging/rt2870/common/acction.c
5339  delete mode 100644 drivers/staging/rt2870/common/action.c
5340  delete mode 100644 drivers/staging/rt2870/common/action.h
5341  delete mode 100644 drivers/staging/rt2870/common/ba_action.c
5342  delete mode 100644 drivers/staging/rt2870/common/cmm_aes.c
5343  delete mode 100644 drivers/staging/rt2870/common/cmm_asic.c
5344  delete mode 100644 drivers/staging/rt2870/common/cmm_cfg.c
5345  delete mode 100644 drivers/staging/rt2870/common/cmm_data.c
5346  delete mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c
5347  delete mode 100644 drivers/staging/rt2870/common/cmm_info.c
5348  delete mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c
5349  delete mode 100644 drivers/staging/rt2870/common/cmm_profile.c
5350  delete mode 100644 drivers/staging/rt2870/common/cmm_sanity.c
5351  delete mode 100644 drivers/staging/rt2870/common/cmm_sync.c
5352  delete mode 100644 drivers/staging/rt2870/common/cmm_tkip.c
5353  delete mode 100644 drivers/staging/rt2870/common/cmm_wep.c
5354  delete mode 100644 drivers/staging/rt2870/common/cmm_wpa.c
5355  delete mode 100644 drivers/staging/rt2870/common/crypt_hmac.c
5356  delete mode 100644 drivers/staging/rt2870/common/crypt_md5.c
5357  delete mode 100644 drivers/staging/rt2870/common/crypt_sha2.c
5358  delete mode 100644 drivers/staging/rt2870/common/dfs.c
5359  delete mode 100644 drivers/staging/rt2870/common/ee_efuse.c
5360  delete mode 100644 drivers/staging/rt2870/common/eeprom.c
5361  delete mode 100644 drivers/staging/rt2870/common/md5.c
5362  delete mode 100644 drivers/staging/rt2870/common/mlme.c
5363  delete mode 100644 drivers/staging/rt2870/common/rt_channel.c
5364  delete mode 100644 drivers/staging/rt2870/common/rt_rf.c
5365  delete mode 100644 drivers/staging/rt2870/common/rtmp_init.c
5366  delete mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c
5367  delete mode 100644 drivers/staging/rt2870/common/rtmp_timer.c
5368  delete mode 100644 drivers/staging/rt2870/common/rtmp_tkip.c
5369  delete mode 100644 drivers/staging/rt2870/common/rtmp_wep.c
5370  delete mode 100644 drivers/staging/rt2870/common/rtusb_bulk.c
5371  delete mode 100644 drivers/staging/rt2870/common/rtusb_data.c
5372  delete mode 100644 drivers/staging/rt2870/common/rtusb_io.c
5373  delete mode 100644 drivers/staging/rt2870/common/spectrum.c
5374  delete mode 100644 drivers/staging/rt2870/dfs.h
5375  delete mode 100644 drivers/staging/rt2870/md5.h
5376  delete mode 100644 drivers/staging/rt2870/mlme.h
5377  delete mode 100644 drivers/staging/rt2870/oid.h
5378  delete mode 100644 drivers/staging/rt2870/rt28xx.h
5379  delete mode 100644 drivers/staging/rt2870/rt_config.h
5380  delete mode 100644 drivers/staging/rt2870/rt_linux.c
5381  delete mode 100644 drivers/staging/rt2870/rt_linux.h
5382  delete mode 100644 drivers/staging/rt2870/rt_main_dev.c
5383  delete mode 100644 drivers/staging/rt2870/rt_profile.c
5384  delete mode 100644 drivers/staging/rt2870/rt_usb.c
5385  delete mode 100644 drivers/staging/rt2870/rtmp.h
5386  delete mode 100644 drivers/staging/rt2870/rtmp_ckipmic.h
5387  delete mode 100644 drivers/staging/rt2870/rtmp_def.h
5388  delete mode 100644 drivers/staging/rt2870/rtmp_type.h
5389  delete mode 100644 drivers/staging/rt2870/spectrum.h
5390  delete mode 100644 drivers/staging/rt2870/spectrum_def.h
5391  delete mode 100644 drivers/staging/rt2870/sta/aironet.c
5392  delete mode 100644 drivers/staging/rt2870/sta/assoc.c
5393  delete mode 100644 drivers/staging/rt2870/sta/auth.c
5394  delete mode 100644 drivers/staging/rt2870/sta/auth_rsp.c
5395  delete mode 100644 drivers/staging/rt2870/sta/connect.c
5396  delete mode 100644 drivers/staging/rt2870/sta/rtmp_data.c
5397  delete mode 100644 drivers/staging/rt2870/sta/sanity.c
5398  delete mode 100644 drivers/staging/rt2870/sta/sync.c
5399  delete mode 100644 drivers/staging/rt2870/sta/wpa.c
5400  delete mode 100644 drivers/staging/rt2870/sta_ioctl.c
5401  delete mode 100644 drivers/staging/rt2870/usb_main_dev.c
5402  delete mode 100644 drivers/staging/rt2870/wpa.h
5403 Merging slabh/slabh
5404 $ git merge slabh/slabh
5405 Already up-to-date.
5406 Merging bkl-config/config
5407 $ git merge bkl-config/config
5408 Already up-to-date.
5409 Merging cleancache/linux-next
5410 $ git merge cleancache/linux-next
5411 Auto-merging fs/btrfs/extent_io.c
5412 Auto-merging fs/btrfs/super.c
5413 Merge made by recursive.
5414  .../ABI/testing/sysfs-kernel-mm-cleancache         |   11 +
5415  Documentation/vm/cleancache.txt                    |  278 ++++++++++++++++++++
5416  arch/x86/include/asm/xen/hypercall.h               |    7 +
5417  drivers/xen/Makefile                               |    1 +
5418  drivers/xen/tmem.c                                 |  264 +++++++++++++++++++
5419  fs/btrfs/extent_io.c                               |    9 +
5420  fs/btrfs/super.c                                   |    2 +
5421  fs/buffer.c                                        |    5 +
5422  fs/ext3/super.c                                    |    2 +
5423  fs/ext4/super.c                                    |    2 +
5424  fs/mpage.c                                         |    7 +
5425  fs/ocfs2/super.c                                   |    2 +
5426  fs/super.c                                         |    3 +
5427  include/linux/cleancache.h                         |  122 +++++++++
5428  include/linux/fs.h                                 |    5 +
5429  include/xen/interface/xen.h                        |   22 ++
5430  mm/Kconfig                                         |   23 ++
5431  mm/Makefile                                        |    1 +
5432  mm/cleancache.c                                    |  244 +++++++++++++++++
5433  mm/filemap.c                                       |   11 +
5434  mm/truncate.c                                      |    6 +
5435  21 files changed, 1027 insertions(+), 0 deletions(-)
5436  create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache
5437  create mode 100644 Documentation/vm/cleancache.txt
5438  create mode 100644 drivers/xen/tmem.c
5439  create mode 100644 include/linux/cleancache.h
5440  create mode 100644 mm/cleancache.c
5441 Merging scsi-post-merge/merge-base:master
5442 $ git clone -s -l -n -q . ../rebase-tmp
5443 $ cd ../rebase-tmp
5444 $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master
5445 From ../next
5446  * [new branch]      scsi-post-merge/master -> scsi-post-merge/master
5447 $ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base
5448 From ../next
5449  * [new branch]      scsi-post-merge/merge-base -> scsi-post-merge/merge-base
5450 $ git checkout scsi-post-merge/master
5451 Switched to branch 'scsi-post-merge/master'
5452 $ git rebase --onto master scsi-post-merge/merge-base
5453 First, rewinding head to replay your work on top of it...
5454 Fast-forwarded scsi-post-merge/master to master.
5455 $ cd ../next
5456 $ git pull -f ../rebase-tmp scsi-post-merge/master
5457 From ../rebase-tmp
5458  * branch            scsi-post-merge/master -> FETCH_HEAD
5459 Already up-to-date.
5460 $ rm -rf ../rebase-tmp