Next/merge.log

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