[GIT PATCH] STAGING patches for 2.6.33-git

Greg KH greg at kroah.com
Thu Mar 4 20:04:21 UTC 2010


Here is the big staging tree merge for your 2.6.33-git tree.

There are 2 merges within this pull, one generated by me due to the need
for a way to apply patches from different people that were modifying the
same file.  The other to merge the staging patches to your tree and
resolve some conflicts that were there due to changes done by the
wireless tree (which I knew was going to happen).  Then a final api
fixup patch was applied to get everything to build properly after the
merge (the wireless tree api changes missed one of the staging drivers,
no big deal).

There are a few new drivers in this merge, and a number of existing ones
are removed for a variety of reasons (duplicates of other in-kernel
drivers that are now working properly, authors asking for the code to be
removed, or lack of development effort.)

Everything is self-contained to the drivers/staging/ directory, which in
one case looks a bit odd (the patches for the dream android device which
are required because that arch does not look like it is ever going to be
merged through the correct channel any time soon, as the code needs lots
of work.)

The final diffstat shows that we did do a few more insertions than
removals here, but nothing major:
 478 files changed, 29064 insertions(+), 24384 deletions(-)

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/staging-2.6.git/

All of these patches have been in the linux-next and mm trees.

The patches will be sent as a follow-on to this message to the
driver-devel list for people to see.

thanks,

greg k-h

--------------

 drivers/staging/Kconfig                            |   14 +-
 drivers/staging/Makefile                           |    8 +-
 drivers/staging/altpciechdma/Kconfig               |   10 -
 drivers/staging/altpciechdma/Makefile              |    2 -
 drivers/staging/altpciechdma/TODO                  |   15 -
 drivers/staging/altpciechdma/altpciechdma.c        | 1182 ------
 drivers/staging/arlan/Makefile                     |    2 +-
 drivers/staging/arlan/arlan.h                      |  136 +-
 drivers/staging/asus_oled/asus_oled.c              |   21 +-
 drivers/staging/b3dfg/Kconfig                      |   10 -
 drivers/staging/b3dfg/Makefile                     |    1 -
 drivers/staging/b3dfg/TODO                         |    4 -
 drivers/staging/b3dfg/b3dfg.c                      | 1100 -----
 drivers/staging/batman-adv/Kconfig                 |    6 +-
 drivers/staging/batman-adv/Makefile                |    2 +-
 drivers/staging/batman-adv/README                  |   84 +-
 drivers/staging/batman-adv/TODO                    |   24 -
 drivers/staging/batman-adv/aggregation.c           |   13 +-
 drivers/staging/batman-adv/bitarray.c              |   15 +-
 drivers/staging/batman-adv/compat.h                |   75 -
 drivers/staging/batman-adv/device.c                |   53 +-
 drivers/staging/batman-adv/hard-interface.c        |  209 +-
 drivers/staging/batman-adv/hard-interface.h        |    4 +
 drivers/staging/batman-adv/hash.c                  |   23 +-
 drivers/staging/batman-adv/hash.h                  |    5 +
 drivers/staging/batman-adv/log.c                   |  179 -
 drivers/staging/batman-adv/main.c                  |   55 +-
 drivers/staging/batman-adv/main.h                  |   46 +-
 drivers/staging/batman-adv/originator.c            |  252 ++
 drivers/staging/batman-adv/{log.h => originator.h} |   19 +-
 drivers/staging/batman-adv/packet.h                |    2 +-
 drivers/staging/batman-adv/proc.c                  |  508 +--
 drivers/staging/batman-adv/proc.h                  |   13 +-
 drivers/staging/batman-adv/routing.c               | 1304 +++---
 drivers/staging/batman-adv/routing.h               |   21 +-
 drivers/staging/batman-adv/send.c                  |  172 +-
 drivers/staging/batman-adv/send.h                  |    5 +-
 drivers/staging/batman-adv/soft-interface.c        |   96 +-
 drivers/staging/batman-adv/soft-interface.h        |    3 +-
 drivers/staging/batman-adv/translation-table.c     |   94 +-
 drivers/staging/batman-adv/translation-table.h     |    1 +
 drivers/staging/batman-adv/types.h                 |   14 +-
 drivers/staging/batman-adv/vis.c                   |  201 +-
 drivers/staging/batman-adv/vis.h                   |   13 +-
 drivers/staging/comedi/comedi_compat32.c           |    1 -
 drivers/staging/comedi/comedi_fops.c               |   12 +-
 drivers/staging/comedi/drivers.c                   |   30 +-
 .../comedi/drivers/addi-data/APCI1710_Chrono.c     |    2 +-
 .../comedi/drivers/addi-data/APCI1710_Dig_io.c     |    2 +-
 .../comedi/drivers/addi-data/APCI1710_INCCPT.c     |    2 +-
 .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c    |    2 +-
 .../comedi/drivers/addi-data/APCI1710_Pwm.c        |    2 +-
 .../comedi/drivers/addi-data/APCI1710_Ssi.c        |    2 +-
 .../comedi/drivers/addi-data/APCI1710_Tor.c        |    2 +-
 .../comedi/drivers/addi-data/APCI1710_Ttl.c        |    2 +-
 .../comedi/drivers/addi-data/addi_amcc_S5920.c     |    7 +-
 .../staging/comedi/drivers/addi-data/addi_common.c |    2 +-
 .../staging/comedi/drivers/addi-data/addi_common.h |    4 +-
 .../staging/comedi/drivers/addi-data/addi_eeprom.c |    2 +-
 .../comedi/drivers/addi-data/hwdrv_APCI1710.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci035.c       |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci1032.c      |   12 +-
 .../comedi/drivers/addi-data/hwdrv_apci1500.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci1516.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci1564.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci16xx.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci2016.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci2032.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci2200.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci3120.c      |  121 +-
 .../comedi/drivers/addi-data/hwdrv_apci3200.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci3501.c      |    2 +-
 .../comedi/drivers/addi-data/hwdrv_apci3xxx.c      |    6 +-
 drivers/staging/comedi/drivers/adl_pci9118.c       |    6 +-
 drivers/staging/comedi/drivers/adq12b.c            |   66 +-
 drivers/staging/comedi/drivers/adv_pci1710.c       |   21 +-
 drivers/staging/comedi/drivers/aio_iiro_16.c       |    4 +-
 drivers/staging/comedi/drivers/amplc_dio200.c      |  122 +-
 drivers/staging/comedi/drivers/amplc_pc236.c       |   46 +-
 drivers/staging/comedi/drivers/amplc_pci224.c      |   16 +-
 drivers/staging/comedi/drivers/c6xdigio.c          |   57 +-
 drivers/staging/comedi/drivers/cb_pcidas.c         |   28 +-
 drivers/staging/comedi/drivers/cb_pcidda.c         |   12 +-
 drivers/staging/comedi/drivers/cb_pcidio.c         |    6 +-
 drivers/staging/comedi/drivers/cb_pcimdas.c        |    8 +-
 drivers/staging/comedi/drivers/cb_pcimdda.c        |    8 +-
 drivers/staging/comedi/drivers/comedi_bond.c       |    2 +-
 drivers/staging/comedi/drivers/contec_pci_dio.c    |    3 +-
 drivers/staging/comedi/drivers/das08_cs.c          |    4 +-
 drivers/staging/comedi/drivers/das6402.c           |    2 +-
 drivers/staging/comedi/drivers/das800.c            |    6 +-
 drivers/staging/comedi/drivers/dmm32at.c           |    5 +-
 drivers/staging/comedi/drivers/dt2801.c            |   33 +-
 drivers/staging/comedi/drivers/dt2815.c            |   89 +-
 drivers/staging/comedi/drivers/dt9812.c            |    2 +-
 drivers/staging/comedi/drivers/fl512.c             |   72 +-
 drivers/staging/comedi/drivers/jr3_pci.c           |    2 +
 drivers/staging/comedi/drivers/mpc624.c            |    2 +-
 drivers/staging/comedi/drivers/ni_65xx.c           |   49 +-
 drivers/staging/comedi/drivers/ni_660x.c           |   73 +-
 drivers/staging/comedi/drivers/ni_670x.c           |   32 +-
 drivers/staging/comedi/drivers/ni_atmio.c          |   34 +-
 drivers/staging/comedi/drivers/ni_daq_700.c        |   24 +-
 drivers/staging/comedi/drivers/ni_labpc.c          |  276 +-
 drivers/staging/comedi/drivers/ni_mio_common.c     |    2 +-
 drivers/staging/comedi/drivers/ni_pcidio.c         |   83 +-
 drivers/staging/comedi/drivers/pcl711.c            |   29 +-
 drivers/staging/comedi/drivers/pcl724.c            |   26 +-
 drivers/staging/comedi/drivers/pcl725.c            |    6 +-
 drivers/staging/comedi/drivers/pcl730.c            |    6 +-
 drivers/staging/comedi/drivers/pcl812.c            |   16 +-
 drivers/staging/comedi/drivers/pcl816.c            |   66 +-
 drivers/staging/comedi/drivers/pcl818.c            |   39 +-
 drivers/staging/comedi/drivers/pcm3724.c           |   85 +-
 drivers/staging/comedi/drivers/pcm3730.c           |    6 +-
 drivers/staging/comedi/drivers/pcmad.c             |   22 +-
 drivers/staging/comedi/drivers/pcmmio.c            |    2 +-
 drivers/staging/comedi/drivers/poc.c               |   14 +-
 drivers/staging/comedi/drivers/rti800.c            |   61 +-
 drivers/staging/comedi/drivers/rti802.c            |    8 +-
 drivers/staging/comedi/drivers/s626.c              |    2 +-
 drivers/staging/comedi/drivers/serial2002.c        |    2 +-
 drivers/staging/comedi/drivers/ssv_dnp.c           |    6 +-
 drivers/staging/comedi/drivers/usbdux.c            |    5 +-
 drivers/staging/comedi/drivers/usbduxfast.c        |    5 +-
 drivers/staging/comedi/drivers/vmk80xx.c           |    2 +-
 drivers/staging/crystalhd/Kconfig                  |    6 +
 drivers/staging/crystalhd/Makefile                 |    6 +
 drivers/staging/crystalhd/TODO                     |   16 +
 drivers/staging/crystalhd/bc_dts_defs.h            |  498 +++
 drivers/staging/crystalhd/bc_dts_glob_lnx.h        |  299 ++
 drivers/staging/crystalhd/bc_dts_types.h           |  121 +
 drivers/staging/crystalhd/bcm_70012_regs.h         |  757 ++++
 drivers/staging/crystalhd/crystalhd_cmds.c         | 1058 +++++
 drivers/staging/crystalhd/crystalhd_cmds.h         |   88 +
 drivers/staging/crystalhd/crystalhd_fw_if.h        |  369 ++
 drivers/staging/crystalhd/crystalhd_hw.c           | 2395 +++++++++++
 drivers/staging/crystalhd/crystalhd_hw.h           |  398 ++
 drivers/staging/crystalhd/crystalhd_lnx.c          |  765 ++++
 drivers/staging/crystalhd/crystalhd_lnx.h          |   96 +
 drivers/staging/crystalhd/crystalhd_misc.c         | 1030 +++++
 drivers/staging/crystalhd/crystalhd_misc.h         |  229 ++
 drivers/staging/cx25821/cx25821-audups11.c         |    3 +-
 drivers/staging/cx25821/cx25821-medusa-video.c     |    4 +-
 drivers/staging/cx25821/cx25821-video.c            |    5 +-
 drivers/staging/dream/camera/Kconfig               |    2 +-
 drivers/staging/dream/camera/Makefile              |    1 +
 drivers/staging/dream/camera/msm_camera.c          |   69 +-
 drivers/staging/dream/camera/msm_vfe7x.c           |    3 +-
 drivers/staging/dream/camera/s5k3e2fx.c            |   30 +-
 drivers/staging/dream/include/linux/android_pmem.h |   80 +
 drivers/staging/dream/include/linux/gpio_event.h   |  154 +
 drivers/staging/dream/include/linux/msm_adsp.h     |   84 +
 drivers/staging/dream/include/linux/msm_audio.h    |  115 +
 .../staging/dream/include/linux/msm_rpcrouter.h    |   47 +
 drivers/staging/dream/include/linux/wakelock.h     |   91 +
 drivers/staging/dream/include/mach/camera.h        |  279 ++
 drivers/staging/dream/include/mach/msm_adsp.h      |  112 +
 drivers/staging/dream/include/mach/msm_rpcrouter.h |  179 +
 drivers/staging/dream/include/mach/msm_smd.h       |  107 +
 .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h    |   94 +
 .../dream/include/mach/qdsp5/qdsp5audplaymsg.h     |   70 +
 .../dream/include/mach/qdsp5/qdsp5audppcmdi.h      |  914 +++++
 .../dream/include/mach/qdsp5/qdsp5audppmsg.h       |  318 ++
 .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h |  256 ++
 .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h  |   85 +
 .../dream/include/mach/qdsp5/qdsp5audreccmdi.h     |  176 +
 .../dream/include/mach/qdsp5/qdsp5audrecmsg.h      |  127 +
 .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h       |  376 ++
 .../dream/include/mach/qdsp5/qdsp5jpegmsg.h        |  177 +
 .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h        |   82 +
 .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h |   80 +
 .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h       |  235 ++
 .../dream/include/mach/qdsp5/qdsp5vdecmsg.h        |  107 +
 .../dream/include/mach/qdsp5/qdsp5venccmdi.h       |  212 +
 .../dream/include/mach/qdsp5/qdsp5vfecmdi.h        |  910 +++++
 .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h |  290 ++
 drivers/staging/dream/include/media/msm_camera.h   |  388 ++
 drivers/staging/dream/pmem.c                       |   26 +-
 drivers/staging/dream/qdsp5/Makefile               |    1 +
 drivers/staging/dream/qdsp5/audio_mp3.c            |    3 +-
 drivers/staging/dream/smd/Makefile                 |    1 +
 drivers/staging/dream/smd/smd_rpcrouter.c          |    2 -
 drivers/staging/dt3155/Kconfig                     |    4 +
 drivers/staging/dt3155/Makefile                    |    6 +
 drivers/staging/dt3155/TODO                        |   10 +
 drivers/staging/dt3155/allocator.README            |   98 +
 drivers/staging/dt3155/allocator.c                 |  295 ++
 drivers/staging/dt3155/allocator.h                 |   28 +
 drivers/staging/dt3155/dt3155.h                    |  171 +
 drivers/staging/dt3155/dt3155.sysvinit             |   60 +
 drivers/staging/dt3155/dt3155_drv.c                | 1095 +++++
 drivers/staging/dt3155/dt3155_drv.h                |   45 +
 drivers/staging/dt3155/dt3155_io.c                 |  175 +
 drivers/staging/dt3155/dt3155_io.h                 |  358 ++
 drivers/staging/dt3155/dt3155_isr.c                |  516 +++
 drivers/staging/dt3155/dt3155_isr.h                |   77 +
 drivers/staging/et131x/et1310_address_map.h        |  617 +--
 drivers/staging/et131x/et1310_eeprom.c             |   39 +-
 drivers/staging/et131x/et1310_eeprom.h             |  103 -
 drivers/staging/et131x/et1310_jagcore.h            |   94 -
 drivers/staging/et131x/et1310_mac.c                |  104 +-
 drivers/staging/et131x/et1310_mac.h                |   93 -
 drivers/staging/et131x/et1310_phy.c                |    7 +-
 drivers/staging/et131x/et1310_phy.h                |   34 -
 drivers/staging/et131x/et1310_pm.c                 |    6 +-
 drivers/staging/et131x/et1310_pm.h                 |   85 -
 drivers/staging/et131x/et1310_rx.c                 |  301 +-
 drivers/staging/et131x/et1310_rx.h                 |  253 +-
 drivers/staging/et131x/et1310_tx.c                 |   10 +-
 drivers/staging/et131x/et1310_tx.h                 |   14 -
 drivers/staging/et131x/et131x.h                    |  153 +
 drivers/staging/et131x/et131x_adapter.h            |   43 +-
 drivers/staging/et131x/et131x_config.h             |   67 -
 drivers/staging/et131x/et131x_initpci.c            |   12 +-
 drivers/staging/et131x/et131x_initpci.h            |   73 -
 drivers/staging/et131x/et131x_isr.c                |   34 +-
 drivers/staging/et131x/et131x_isr.h                |   65 -
 drivers/staging/et131x/et131x_netdev.c             |   63 +-
 drivers/staging/et131x/et131x_netdev.h             |   64 -
 drivers/staging/et131x/et131x_version.h            |    9 +-
 drivers/staging/frontier/alphatrack.c              |    2 +-
 drivers/staging/frontier/tranzport.c               |    2 +-
 drivers/staging/go7007/go7007-driver.c             |    2 +
 drivers/staging/go7007/go7007-usb.c                |    4 +-
 drivers/staging/go7007/s2250-board.c               |    2 +-
 drivers/staging/go7007/s2250-loader.c              |    4 +-
 drivers/staging/go7007/saa7134-go7007.c            |    1 +
 drivers/staging/go7007/wis-ov7640.c                |    2 +-
 drivers/staging/go7007/wis-saa7113.c               |    2 +-
 drivers/staging/go7007/wis-saa7115.c               |    2 +-
 drivers/staging/go7007/wis-sony-tuner.c            |    2 +-
 drivers/staging/go7007/wis-tw2804.c                |    2 +-
 drivers/staging/go7007/wis-tw9903.c                |    2 +-
 drivers/staging/go7007/wis-uda1342.c               |    2 +-
 drivers/staging/hv/Channel.c                       |    3 +-
 drivers/staging/hv/Hv.c                            |  205 +-
 drivers/staging/hv/Hv.h                            |   10 +-
 drivers/staging/hv/NetVscApi.h                     |    4 +-
 drivers/staging/hv/RingBuffer.c                    |  153 +-
 drivers/staging/hv/RndisFilter.c                   |   10 +-
 drivers/staging/hv/StorVsc.c                       |    3 +-
 drivers/staging/hv/StorVscApi.h                    |    5 +-
 drivers/staging/hv/VersionInfo.h                   |   22 +-
 drivers/staging/hv/Vmbus.c                         |    6 +-
 drivers/staging/hv/blkvsc_drv.c                    |   10 +-
 drivers/staging/hv/netvsc_drv.c                    |   29 +-
 drivers/staging/hv/storvsc_drv.c                   |  227 +-
 drivers/staging/hv/vmbus.h                         |   12 +-
 drivers/staging/hv/vmbus_drv.c                     |   68 +-
 drivers/staging/iio/industrialio-core.c            |   35 +-
 drivers/staging/iio/ring_generic.h                 |    3 +-
 drivers/staging/iio/ring_sw.c                      |    3 +-
 drivers/staging/iio/trigger_consumer.h             |    4 +-
 drivers/staging/line6/driver.c                     |    2 +-
 drivers/staging/line6/variax.c                     |    2 +-
 drivers/staging/mimio/Kconfig                      |   10 -
 drivers/staging/mimio/Makefile                     |    1 -
 drivers/staging/mimio/mimio.c                      |  914 -----
 drivers/staging/otus/80211core/cagg.c              |   18 +-
 drivers/staging/otus/80211core/ccmd.c              |    2 +-
 drivers/staging/otus/80211core/cfunc.c             |    2 -
 drivers/staging/otus/80211core/cmm.c               |    4 -
 drivers/staging/otus/80211core/cmmsta.c            |    7 +-
 drivers/staging/otus/80211core/cpsmgr.c            |    2 -
 drivers/staging/otus/80211core/cscanmgr.c          |    2 -
 drivers/staging/otus/80211core/ctkip.c             |    5 +-
 drivers/staging/otus/80211core/ctxrx.c             |    8 +-
 drivers/staging/otus/80211core/ledmgr.c            |    1 -
 drivers/staging/otus/80211core/pub_zfi.h           |    1 -
 drivers/staging/otus/Kconfig                       |    2 +
 drivers/staging/otus/apdbg.c                       |   53 +-
 drivers/staging/otus/hal/hpmain.c                  |    4 -
 drivers/staging/otus/hal/hpreg.c                   |  133 -
 drivers/staging/otus/hal/hprw.c                    |    1 -
 drivers/staging/otus/ioctl.c                       |   16 +-
 drivers/staging/otus/usbdrv.c                      |    4 +-
 drivers/staging/otus/wrap_pkt.c                    |   10 +-
 drivers/staging/otus/zdusb.c                       |    2 +-
 drivers/staging/p9auth/Kconfig                     |    9 -
 drivers/staging/p9auth/Makefile                    |    1 -
 drivers/staging/p9auth/p9auth.c                    |  408 --
 drivers/staging/panel/panel.c                      |    1 -
 drivers/staging/phison/phison.c                    |    2 +-
 drivers/staging/pohmelfs/inode.c                   |   28 +-
 drivers/staging/pohmelfs/netfs.h                   |    3 +
 drivers/staging/quatech_usb2/quatech_usb2.c        |    2 +-
 drivers/staging/ramzswap/Kconfig                   |    2 +-
 drivers/staging/ramzswap/ramzswap.txt              |    6 +-
 drivers/staging/ramzswap/ramzswap_drv.c            |  144 +-
 drivers/staging/ramzswap/ramzswap_drv.h            |   67 +-
 drivers/staging/ramzswap/ramzswap_ioctl.h          |    7 +-
 drivers/staging/ramzswap/xvmalloc.c                |    4 +-
 drivers/staging/ramzswap/xvmalloc.h                |    2 +-
 drivers/staging/ramzswap/xvmalloc_int.h            |    4 +-
 drivers/staging/rar/Kconfig                        |   17 -
 drivers/staging/rar/Makefile                       |    2 -
 drivers/staging/rar/rar_driver.c                   |  444 --
 drivers/staging/rar/rar_driver.h                   |   99 -
 drivers/staging/rar_register/Kconfig               |   30 +
 drivers/staging/rar_register/Makefile              |    2 +
 drivers/staging/rar_register/rar_register.c        |  615 +++
 drivers/staging/rar_register/rar_register.h        |   84 +
 drivers/staging/rt2860/Kconfig                     |    2 +
 drivers/staging/rt2860/common/firmware.h           |  558 ---
 drivers/staging/rt2860/common/firmware_3070.h      |  517 ---
 drivers/staging/rt2860/common/rtmp_mcu.c           |  167 +-
 drivers/staging/rt2860/rt_linux.c                  |   13 +-
 drivers/staging/rt2860/rt_linux.h                  |    4 +-
 drivers/staging/rt2860/rt_main_dev.c               |    2 +-
 drivers/staging/rt2860/rtmp.h                      |    7 +-
 drivers/staging/rt2860/sta/connect.c               |    4 +-
 drivers/staging/rt2860/sta_ioctl.c                 |    5 +-
 drivers/staging/rt2860/usb_main_dev.c              |    6 +-
 drivers/staging/rt2870/Kconfig                     |    2 +
 drivers/staging/rt2870/common/rtusb_io.c           |   10 +-
 drivers/staging/rt3070/firmware.h                  |  558 ---
 drivers/staging/rt3070/md4.h                       |    8 +-
 drivers/staging/rt3090/firmware.h                  |  517 ---
 drivers/staging/rtl8187se/Kconfig                  |    1 +
 drivers/staging/rtl8187se/Makefile                 |    1 -
 drivers/staging/rtl8187se/TODO                     |    1 -
 drivers/staging/rtl8187se/ieee80211/ieee80211.h    |    5 +-
 .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c     |   21 +-
 .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c     |   20 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c |   48 +-
 .../rtl8187se/ieee80211/ieee80211_softmac.c        |    2 +-
 .../rtl8187se/ieee80211/ieee80211_softmac_wx.c     |    3 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c |    6 +-
 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c |    6 +-
 drivers/staging/rtl8187se/r8180.h                  |    4 -
 drivers/staging/rtl8187se/r8180_93cx6.c            |  146 -
 drivers/staging/rtl8187se/r8180_93cx6.h            |   17 +-
 drivers/staging/rtl8187se/r8180_core.c             |  502 +--
 drivers/staging/rtl8187se/r8180_dm.c               |   69 +-
 drivers/staging/rtl8187se/r8180_rtl8225z2.c        |  232 +-
 drivers/staging/rtl8187se/r8185b_init.c            |  986 +-----
 drivers/staging/rtl8192e/Makefile                  |    9 +-
 drivers/staging/rtl8192e/dot11d.h                  |  138 +-
 drivers/staging/rtl8192e/ieee80211.h               |    3 -
 drivers/staging/rtl8192e/ieee80211/ieee80211.h     |  160 +-
 .../staging/rtl8192e/ieee80211/ieee80211_crypt.c   |    2 +-
 .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c      |   37 +-
 .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c      |   29 +-
 drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c  |  148 +-
 .../staging/rtl8192e/ieee80211/ieee80211_softmac.c |  246 +-
 .../rtl8192e/ieee80211/ieee80211_softmac_wx.c      |   26 +-
 drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c  |   80 +-
 drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c  |    6 +-
 .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c    |    6 +-
 drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h    |    4 +-
 .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c    |   65 +-
 .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c    |    6 +-
 drivers/staging/rtl8192e/r8180_93cx6.c             |   63 +-
 drivers/staging/rtl8192e/r8180_93cx6.h             |   33 +-
 drivers/staging/rtl8192e/r8190_rtl8256.c           |  360 +-
 drivers/staging/rtl8192e/r8190_rtl8256.h           |   49 +-
 drivers/staging/rtl8192e/r8192E.h                  |   23 +-
 drivers/staging/rtl8192e/r8192E_core.c             |  773 +++-
 drivers/staging/rtl8192e/r8192E_dm.c               |   40 +-
 drivers/staging/rtl8192e/r8192E_hw.h               |    8 +
 drivers/staging/rtl8192e/r8192E_wx.c               |  212 +-
 drivers/staging/rtl8192e/r8192E_wx.h               |    1 -
 drivers/staging/rtl8192e/r819xE_cmdpkt.c           |    2 +-
 drivers/staging/rtl8192e/r819xE_firmware.c         |   85 +-
 drivers/staging/rtl8192e/r819xE_phy.c              |    2 +-
 drivers/staging/rtl8192e/r819xE_phy.h              |  194 +-
 drivers/staging/rtl8192e/r819xE_phyreg.h           | 1117 +++---
 drivers/staging/rtl8192su/Kconfig                  |    3 +-
 drivers/staging/rtl8192su/TODO                     |    1 -
 drivers/staging/rtl8192su/ieee80211/ieee80211.h    |    5 +-
 .../staging/rtl8192su/ieee80211/ieee80211_crypt.c  |   19 +-
 .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c     |   21 +-
 .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c     |   20 +-
 .../staging/rtl8192su/ieee80211/ieee80211_module.c |    2 +-
 drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c |   48 +-
 .../rtl8192su/ieee80211/ieee80211_softmac.c        |    6 +-
 drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c |    4 +-
 drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c |    6 +-
 .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c   |   21 +-
 .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c   |    2 +-
 .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c   |    6 +-
 drivers/staging/rtl8192su/r8192SU_HWImg.c          | 4276 --------------------
 drivers/staging/rtl8192su/r8192SU_HWImg.h          |    2 -
 drivers/staging/rtl8192su/r8192S_firmware.c        |  126 +-
 drivers/staging/rtl8192su/r8192S_firmware.h        |    7 -
 drivers/staging/rtl8192su/r8192S_phy.c             |   16 +-
 drivers/staging/rtl8192su/r8192U.h                 |    1 -
 drivers/staging/rtl8192su/r8192U_core.c            |  183 +-
 drivers/staging/rtl8192su/r8192U_dm.c              |    2 +-
 drivers/staging/rtl8192u/Kconfig                   |    3 +-
 drivers/staging/rtl8192u/Makefile                  |    2 +-
 drivers/staging/rtl8192u/ieee80211.h               |    3 -
 drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    4 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c      |   21 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |   20 +-
 .../staging/rtl8192u/ieee80211/ieee80211_module.c  |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   48 +-
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    4 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c  |    6 +-
 .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c    |    6 +-
 .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c    |    4 +-
 .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c    |    6 +-
 drivers/staging/rtl8192u/r8192U_core.c             |    8 +-
 drivers/staging/samsung-laptop/samsung-laptop.c    |    9 +-
 drivers/staging/sep/sep_driver.c                   |   28 +-
 drivers/staging/serqt_usb2/serqt_usb2.c            |    4 +-
 drivers/staging/slicoss/slic.h                     |    9 -
 drivers/staging/slicoss/slicoss.c                  |  116 +-
 drivers/staging/sm7xx/Kconfig                      |    7 -
 drivers/staging/sm7xx/TODO                         |    1 +
 drivers/staging/sm7xx/smtc2d.c                     |  979 -----
 drivers/staging/sm7xx/smtc2d.h                     |  530 ---
 drivers/staging/sm7xx/smtcfb.c                     |  131 +-
 drivers/staging/udlfb/Kconfig                      |   14 +-
 drivers/staging/udlfb/udlfb.c                      | 1993 ++++++---
 drivers/staging/udlfb/udlfb.h                      |  281 +-
 drivers/staging/usbip/Kconfig                      |    7 +
 drivers/staging/usbip/Makefile                     |    2 +-
 drivers/staging/usbip/usbip_common.c               |   90 +-
 drivers/staging/usbip/usbip_common.h               |    8 +-
 drivers/staging/vme/Kconfig                        |    2 +
 drivers/staging/vme/Makefile                       |    1 +
 drivers/staging/vme/TODO                           |   28 -
 drivers/staging/vme/boards/Kconfig                 |    9 +
 drivers/staging/vme/boards/Makefile                |    5 +
 drivers/staging/vme/boards/vme_vmivme7805.c        |  124 +
 drivers/staging/vme/boards/vme_vmivme7805.h        |   37 +
 drivers/staging/vme/bridges/Kconfig                |    2 +
 drivers/staging/vme/bridges/vme_ca91cx42.c         | 1592 ++++----
 drivers/staging/vme/bridges/vme_ca91cx42.h         |  136 +-
 drivers/staging/vme/bridges/vme_tsi148.c           | 1010 ++---
 drivers/staging/vme/bridges/vme_tsi148.h           |   16 +
 drivers/staging/vme/devices/vme_user.c             |   65 +-
 drivers/staging/vme/vme.c                          |  248 +-
 drivers/staging/vme/vme.h                          |   33 +-
 drivers/staging/vme/vme_api.txt                    |   27 +-
 drivers/staging/vme/vme_bridge.h                   |  107 +-
 drivers/staging/vt6655/card.c                      |    6 +-
 drivers/staging/vt6655/device_main.c               |    5 +-
 drivers/staging/vt6655/iwctl.c                     |    2 +-
 drivers/staging/winbond/core.h                     |    2 +-
 drivers/staging/winbond/localpara.h                |   34 +-
 drivers/staging/winbond/mds_f.h                    |    3 -
 drivers/staging/winbond/mds_s.h                    |   28 -
 drivers/staging/winbond/mlme_s.h                   |    8 -
 drivers/staging/winbond/mto.h                      |    5 -
 drivers/staging/winbond/reg.c                      |   10 +-
 drivers/staging/winbond/scan_s.h                   |    1 -
 drivers/staging/winbond/sme_api.h                  |    4 +-
 drivers/staging/winbond/wb35reg_f.h                |    2 +-
 drivers/staging/winbond/wbusb.c                    |   24 +-
 drivers/staging/wlags49_h2/wl_main.c               |    2 +-
 drivers/staging/wlags49_h2/wl_netdev.c             |    2 +-
 drivers/staging/wlags49_h2/wl_pci.c                |    1 -
 drivers/staging/wlags49_h2/wl_profile.c            |   76 +-
 drivers/staging/wlags49_h2/wl_util.c               |   49 -
 drivers/staging/wlags49_h2/wl_util.h               |    2 -
 drivers/staging/wlan-ng/Kconfig                    |    4 +-
 drivers/staging/wlan-ng/hfa384x.h                  |  180 +-
 drivers/staging/wlan-ng/hfa384x_usb.c              |   42 +-
 drivers/staging/wlan-ng/p80211conv.c               |   16 +-
 drivers/staging/wlan-ng/p80211conv.h               |    4 +-
 drivers/staging/wlan-ng/p80211metadef.h            |   18 +-
 drivers/staging/wlan-ng/p80211mgmt.h               |   42 +-
 drivers/staging/wlan-ng/p80211netdev.c             |    7 +-
 drivers/staging/wlan-ng/p80211netdev.h             |   44 +-
 drivers/staging/wlan-ng/p80211req.c                |    2 +-
 drivers/staging/wlan-ng/p80211req.h                |    2 +-
 drivers/staging/wlan-ng/p80211types.h              |   18 +-
 drivers/staging/wlan-ng/p80211wext.c               |   83 +-
 drivers/staging/wlan-ng/prism2fw.c                 |   69 +-
 drivers/staging/wlan-ng/prism2mgmt.c               |   30 +-
 drivers/staging/wlan-ng/prism2mgmt.h               |   48 +-
 drivers/staging/wlan-ng/prism2mib.c                |   10 +-
 drivers/staging/wlan-ng/prism2sta.c                |   20 +-
 drivers/staging/wlan-ng/prism2usb.c                |    6 +-
 478 files changed, 29064 insertions(+), 24384 deletions(-)
 delete mode 100644 drivers/staging/altpciechdma/Kconfig
 delete mode 100644 drivers/staging/altpciechdma/Makefile
 delete mode 100644 drivers/staging/altpciechdma/TODO
 delete mode 100644 drivers/staging/altpciechdma/altpciechdma.c
 delete mode 100644 drivers/staging/b3dfg/Kconfig
 delete mode 100644 drivers/staging/b3dfg/Makefile
 delete mode 100644 drivers/staging/b3dfg/TODO
 delete mode 100644 drivers/staging/b3dfg/b3dfg.c
 delete mode 100644 drivers/staging/batman-adv/compat.h
 delete mode 100644 drivers/staging/batman-adv/log.c
 create mode 100644 drivers/staging/batman-adv/originator.c
 rename drivers/staging/batman-adv/{log.h => originator.h} (61%)
 create mode 100644 drivers/staging/crystalhd/Kconfig
 create mode 100644 drivers/staging/crystalhd/Makefile
 create mode 100644 drivers/staging/crystalhd/TODO
 create mode 100644 drivers/staging/crystalhd/bc_dts_defs.h
 create mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h
 create mode 100644 drivers/staging/crystalhd/bc_dts_types.h
 create mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h
 create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c
 create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h
 create mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h
 create mode 100644 drivers/staging/crystalhd/crystalhd_hw.c
 create mode 100644 drivers/staging/crystalhd/crystalhd_hw.h
 create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c
 create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h
 create mode 100644 drivers/staging/crystalhd/crystalhd_misc.c
 create mode 100644 drivers/staging/crystalhd/crystalhd_misc.h
 create mode 100644 drivers/staging/dream/include/linux/android_pmem.h
 create mode 100644 drivers/staging/dream/include/linux/gpio_event.h
 create mode 100644 drivers/staging/dream/include/linux/msm_adsp.h
 create mode 100644 drivers/staging/dream/include/linux/msm_audio.h
 create mode 100644 drivers/staging/dream/include/linux/msm_rpcrouter.h
 create mode 100644 drivers/staging/dream/include/linux/wakelock.h
 create mode 100644 drivers/staging/dream/include/mach/camera.h
 create mode 100644 drivers/staging/dream/include/mach/msm_adsp.h
 create mode 100644 drivers/staging/dream/include/mach/msm_rpcrouter.h
 create mode 100644 drivers/staging/dream/include/mach/msm_smd.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h
 create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h
 create mode 100644 drivers/staging/dream/include/media/msm_camera.h
 create mode 100644 drivers/staging/dt3155/Kconfig
 create mode 100644 drivers/staging/dt3155/Makefile
 create mode 100644 drivers/staging/dt3155/TODO
 create mode 100644 drivers/staging/dt3155/allocator.README
 create mode 100644 drivers/staging/dt3155/allocator.c
 create mode 100644 drivers/staging/dt3155/allocator.h
 create mode 100644 drivers/staging/dt3155/dt3155.h
 create mode 100644 drivers/staging/dt3155/dt3155.sysvinit
 create mode 100644 drivers/staging/dt3155/dt3155_drv.c
 create mode 100644 drivers/staging/dt3155/dt3155_drv.h
 create mode 100644 drivers/staging/dt3155/dt3155_io.c
 create mode 100644 drivers/staging/dt3155/dt3155_io.h
 create mode 100644 drivers/staging/dt3155/dt3155_isr.c
 create mode 100644 drivers/staging/dt3155/dt3155_isr.h
 delete mode 100644 drivers/staging/et131x/et1310_eeprom.h
 delete mode 100644 drivers/staging/et131x/et1310_jagcore.h
 delete mode 100644 drivers/staging/et131x/et1310_mac.h
 delete mode 100644 drivers/staging/et131x/et1310_pm.h
 create mode 100644 drivers/staging/et131x/et131x.h
 delete mode 100644 drivers/staging/et131x/et131x_config.h
 delete mode 100644 drivers/staging/et131x/et131x_initpci.h
 delete mode 100644 drivers/staging/et131x/et131x_isr.h
 delete mode 100644 drivers/staging/et131x/et131x_netdev.h
 delete mode 100644 drivers/staging/mimio/Kconfig
 delete mode 100644 drivers/staging/mimio/Makefile
 delete mode 100644 drivers/staging/mimio/mimio.c
 delete mode 100644 drivers/staging/p9auth/Kconfig
 delete mode 100644 drivers/staging/p9auth/Makefile
 delete mode 100644 drivers/staging/p9auth/p9auth.c
 delete mode 100644 drivers/staging/rar/Kconfig
 delete mode 100644 drivers/staging/rar/Makefile
 delete mode 100644 drivers/staging/rar/rar_driver.c
 delete mode 100644 drivers/staging/rar/rar_driver.h
 create mode 100644 drivers/staging/rar_register/Kconfig
 create mode 100644 drivers/staging/rar_register/Makefile
 create mode 100644 drivers/staging/rar_register/rar_register.c
 create mode 100644 drivers/staging/rar_register/rar_register.h
 delete mode 100644 drivers/staging/rt2860/common/firmware.h
 delete mode 100644 drivers/staging/rt2860/common/firmware_3070.h
 delete mode 100644 drivers/staging/rt3070/firmware.h
 delete mode 100644 drivers/staging/rt3090/firmware.h
 delete mode 100644 drivers/staging/rtl8187se/r8180_93cx6.c
 delete mode 100644 drivers/staging/sm7xx/smtc2d.c
 delete mode 100644 drivers/staging/sm7xx/smtc2d.h
 create mode 100644 drivers/staging/vme/boards/Kconfig
 create mode 100644 drivers/staging/vme/boards/Makefile
 create mode 100644 drivers/staging/vme/boards/vme_vmivme7805.c
 create mode 100644 drivers/staging/vme/boards/vme_vmivme7805.h

---------------

Adam Buchbinder (3):
      staging: Fix misspelling of "successful" and variants.
      staging: Fix misspelling of "should" and "shouldn't" in comments.
      staging: Fix misspelling of "invocation" in comment.

Alan Cox (35):
      Staging: sep: Fix build problems from header changes
      Staging: sep: Fix use of legacy ioctl fop
      Staging: et131x: kill off the FBR_NUM_DES type
      Staging: et131x: kill of FBR_WORD2
      Staging: et131x: fbr_desc is now only sane types
      Staging: et131x: Clean up rxdma_csr
      Staging: et131x: Kill off the rxdma type
      Staging: et131x: kill EXP_ROM
      Staging: et131x: GLOBAL_t is now sane so kill the GLOBAL_t itself
      Staging: et131x: Kill off TXDMA_t
      Staging: et131x: Kill off MMC_t
      Staging: et131x: Kill MAC_STAT_t
      Staging: et131x: Clean up the rx status word types
      Staging: et131x: kill off the rx interrupt state enum
      Staging: et131x: rx_status_block_t is now clean
      Staging: et131x: Fix rx_status typing
      Staging: et131x: Clean up the fbr lookup table
      Staging: et131x: clean up the pkt_desc_stat_t types
      Staging: et131x: Kill off RX_RING_t
      Staging: et131x: kill MP_ERR_COUNTERS which is unused
      Staging: et131x: Kill unused error defines
      Staging: et131x: Collapse all the function definitions into one place
      Staging: et131x: Kil the txmac type
      Staging: et131x: kill txmac err count typedef
      Staging: et131x: Kill off the TXMAC_ERR_t type
      Staging: et13x: kill off TXMAC_ERR_INT_t
      Staging: et131x: Kill rxmac crc fields
      Staging: et131x: kill off RXMAC_PF_CTRL_t
      Staging: et131x: Kill of the MCIF types
      Staging: et131x: Kill off the rxq_diag types
      Staging: et131x: Kill the SPACE_AVAIL type
      Staging: et131x: Kill MIF_CTL_t
      Staging: et131x: kill the rxmac ERROR_REG_t
      Staging: et131x: kill off the rxmac ctrl type
      Staging: et131x_kill MAC_STAT_t

Alessandro Ghedini (1):
      Staging: wlan-ng: fix most of the style issues in hfa384x.h

Alessio Igor Bogani (1):
      Staging: Cleanup useless headers

Alexander Beregalov (1):
      staging: cx25821: avoid NULL pointer dereference

Ameya Palande (5):
      Staging: mimio: Fix checkpatch.pl spacing errors
      Staging: mimio: Remove dead code
      Staging: mimio: checkpatch.pl line > 80 chars fixes
      Staging: iio: checkinclude.pl fix
      Staging: crystalhd: Misc improvements for crystalhd_lnx.c

Andrea Gelmini (21):
      Staging: comedi: addi_amcc_S5920.c: Checkpatch cleanup
      Staging: comedi: addi_common.h: Checkpatch cleanup
      Staging: comedi: hwdrv_apci1032.c: Checkpatch cleanup
      Staging: comedi: cb_pcidas.c: Checkpatch cleanup
      Staging: comedi: cb_pcidda.c: Checkpatch cleanup
      Staging: comedi: cb_pcidio.c: Checkpatch cleanup
      Staging: comedi: cb_pcimdas.c: Checkpatch cleanup
      Staging: comedi: cb_pcimdda.c: Checkpatch cleanup
      Staging: comedi: contec_pci_dio.c: Checkpatch cleanup
      Staging: comedi: das08_cs.c: Checkpatch cleanup
      Staging: comedi: hwdrv_apci3120.c: Checkpatch cleanup
      Staging: comedi: das6402.c: Checkpatch cleanup
      Staging: comedi: cb_pcimdas.c: more Checkpatch cleanup
      Staging: comedi: dmm32at.c: Checkpatch cleanup
      Staging: comedi: dt2801.c: Checkpatch cleanup
      Staging: arlan: arlan.h: Checkpatch cleanup
      Staging: rt3070: md4.h: Checkpatch cleanup
      Staging: arlan: Makefile: Checkpatch cleanup
      Staging: arlan: arlan.h: more Checkpatch cleanup
      Staging: comedi: drivers.c: Checkpatch cleanup
      Staging: comedi: comedi_fops.c: Checkpatch cleanup

Andrew Elwell (2):
      Staging: wlan-ng - checkpatch.pl fixups
      Staging: wlan-ng: More checkpatch.pl error cleanups

Andrew Lunn (12):
      Staging: batman-adv: replace internal logging mechanism.
      Staging: batman-adv: Refactor routing.c
      Staging: batman-adv: stop persistent warnings if a device is deactivated.
      Staging: batman-adv: Always receive when discarding.
      Staging: batman-adv: Split originator handling parts out of routing.c
      Staging: batman-adv: Fix the naming of the debug option.
      Staging: batman-adv: Replace KERN_DEBUG with bat_dbg
      Staging: batman-adv: moving vis output formats out of the kernel
      Staging: batman-adv: Allow the MAC address to be set
      Staging: batman-adv: Use printk(%pM) for MAC addresses
      Staging: batman-adv: Update the README for mainline usage.
      Staging: batman-adv: Fix skbuff leak in VIS code.

Andy Shevchenko (1):
      staging: wlags49: don't use custom implementation of atoi()

Arthur Benilov (4):
      Staging: vme: llseek support in user driver
      Staging: vme: Use A24 when requesting slave resource
      Staging: vme: Allocate memory buffers for master windows
      Staging: vme: VMIVME-7805 board support

Ben Hutchings (5):
      staging: declare MODULE_FIRMWARE in various drivers
      Staging: sep: include driver name in firmware filenames
      Staging: sep: declare MODULE_FIRMWARE
      Staging: rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite()
      Staging: rt{2860,2870}sta: Use request_firmware() to load firmware

Benjamin Adolphi (24):
      Staging: rar: Fix all coding style issues.
      Staging: comedi: adq12b: Checkpatch cleanups
      Staging: comedi: c6xdigio: Checkpatch cleanups
      Staging: comedi: rti800: Checkpatch cleanups
      Staging: comedi: pcl711: Checkpatch cleanups
      Staging: comedi: pcl724: Checkpatch cleanups
      Staging: comedi: pcl725: Checkpatch cleanups
      Staging: comedi: pcl730: Checkpatch cleanups
      Staging: comedi: pcm3724: Checkpatch cleanups
      Staging: comedi: pcm3730: Checkpatch cleanups
      Staging: comedi: poc: Checkpatch cleanups
      Staging: comedi: ni_660x: Checkpatch cleanups
      Staging: comedi: ni_670x: Checkpatch cleanups
      Staging: comedi: ni_65xx: Checkpatch cleanups
      Staging: comedi: fl512: Checkpatch cleanups
      Staging: comedi: adq12b: Checkpatch cleanups 2
      Staging: comedi: dt2815: Checkpatch cleanups
      Staging: comedi: rti802: Checkpatch cleanups
      Staging: comedi: ni_pcidio: Checkpatch cleanups
      Staging: comedi: rti800: more Checkpatch cleanups
      Staging: comedi: aio_iiro_16: Checkpatch cleanups
      Staging: comedi: amplc_dio200: Checkpatch cleanups
      Staging: comedi: amplc_pc236: Checkpatch cleanups
      Staging: comedi: pcmad: Checkpatch cleanups

Bernie Thompson (11):
      Staging: udlfb: add dynamic modeset support
      Staging: udlfb: checkpatch cleanup
      Staging: udlfb: reorganize function order
      Staging: udlfb: pre-allocated urb list helpers
      Staging: udlfb: clean up function naming
      Staging: udlfb: Add functions to expose sysfs metrics and controls
      Staging: udlfb: Rework startup and teardown to fix race conditions
      Staging: udlfb: improved rendering performance
      Staging: udlfb: Support for fbdev mmap clients (defio)
      Staging: udlfb: explicit dependencies and warnings
      Staging: udlfb: remove printk and small cleanup

Bruce Beare (3):
      Staging: comedi: pcmad: Cleanup: code indent warning messages
      Staging: comedi: pcmad: Cleanup: Remove unneeded braces
      Staging: comedi: pcmad: [PATCH 3/3] cleanup printk() warnings

C yp (1):
      Staging: ramzswap: Minor spelling fixes

C. Bartlett (1):
      Staging: hv: fix various coding style issues in RingBuffer.c

Chihau Chau (7):
      Staging: samsung-laptop: fix coding style issues
      Staging: comedi: poc: fix coding style issues
      Staging: dream: camera: msm_camera: fix coding style issues
      Staging: dream: camera: msm_camera: fix some code style issues
      Staging: comedi: poc: Adding some KERN_ facility level
      Staging: dream: camera: msm_camera: fix code style issues
      Staging: dream: camera: sk5k3e2fx: fix code style issues

Chris Nicholson (1):
      Staging: hv: fix brace coding style issue in Channel.c

Dan Carpenter (9):
      Staging: comedi: off by one in doDevConfig()
      Staging: comedi: reorder check in pcmmio_attach()
      Staging: cx25821: fix double unlock in medusa_video_init()
      Staging: cx25821: off by one in cx25821_enum_input()
      Staging: otus: off by one in usbdrvwext_siwessid()
      Staging: rtl8192su: buffer overflow in r8192U_core.c
      Staging: pohmelfs: avoid null dereference
      Staging: rtl8187se: fix if statement
      staging: vt6655: add missing curly braces

Dave Airlie (1):
      Staging: crystalhd: fix build on powerpc

Evgeniy Polyakov (1):
      Staging: Fixed pohmelfs regression because of per-bdi writeback.

Florian Schilhabel (4):
      Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c
      Staging: rtl8192su: fix for rtl819xU:Error TX URB for zero byte xxx, error -2
      Staging: rtl8192su: re-enable tx-stats
      Staging: rtl8192su: use list_for_each_safe() in ieee80211_crypto_deinit

Frank Mori Hess (1):
      Staging: comedi: Increased timeout for digital output dma loading

Graham M Howe (4):
      Staging: comedi: bracing fix to ni_atmio.c
      Staging: comedi: fix brace and 80 character coding style issue in ni_daq_700.c
      Staging: comedi: fix bracing coding style issue in ni_65xx.c
      Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c

Greg Kroah-Hartman (23):
      Staging: dt3155: add needed #include
      Staging: dt3155: add TODO file
      Staging: dt3155: add it to the build
      Staging: dt3155: coding style cleanups for allocator code
      Staging: dt3155: coding style cleanups for the .h files
      staging: remove the b3dfg driver
      Staging: p9auth: remove driver from tree
      Staging: altpciechdma: remove driver
      Staging: hv: remove unneeded OnHostRescan callback
      Staging: hv: storvsc_drv: move unused functions
      Staging: hv: remove unneeded OnHostReset callback
      Staging: hv: remove unneeded OnOpen callback
      Staging: hv: remove unneeded OnClose callback
      Staging: hv: add a pci device table
      Staging: hv: match on DMI values to know if we should run.
      Staging: comedi: ssc_dnp: fixed a brace coding style issue
      Staging: dt3155: fix build warnings
      Staging: dt3155: coding cleanups for dt3155_io.h
      Staging: dt3155: replace u_char usage
      Staging: dt3155: replace u_int and u_long usage
      Staging: dt3155: fix coding style issues in dt3155_io.c
      Staging: mimio: remove the mimio driver
      Staging: winbond: fix up wireless api errors

H Hartley Sweeten (5):
      Staging: et131x_netdev.c: use %pM to shown MAC address
      Staging: r8192E_core.c: use %pM to shown MAC address
      r8192U_core.c: use %pM to shown MAC address
      Staging: vt6655/device_main.c: use %pM to shown MAC address
      staging: dt3155: revert u_long to u64 usage

Haiyang Zhang (1):
      Staging: hv: Rename struct device_context and re-arrange the fields inside

Hank Janssen (2):
      Staging: hv: Remove xen legacy code and check for Hyper-V
      Staging: hv: Add proper versioning to HV drivers

Himanshu (1):
      Staging: usbip: Seperate usbip config debug from CONFIG_USB_DEBUG

Himanshu Chauhan (3):
      Staging: usbip: minor code cleanup
      Staging: usbip: use print_hex_dump() instead of open coding it.
      Staging: usbip: Remove dead code

Huang Weiyi (3):
      Staging: dream: remove duplicated #include
      Staging: wlags49_h2: remove duplicated #include
      Staging: ramzswap: remove unused #include <linux/version.h>

Ian Abbott (8):
      Staging: comedi: pcl812: Correct AI scan counting
      Staging: comedi: pcl816: Correct AI scan counting
      Staging: comedi: pcl818: Correct AI scan counting and channel checks
      Staging: comedi: adv_pci1710: Correct AI scan count and channel checks
      Staging: comedi: adv_pci1710: Remove unneeded chanlist_len check
      Staging: comedi: pcl812: Update MUX for multi-channel AI command
      Staging: comedi: pcl816: Check channel list in AI command test
      Staging: comedi: pcl818: Remove unneeded chanlist_len check

Jarod Wilson (3):
      staging: add Broadcom Crystal HD driver
      staging: crystalhd: add missing fixes for userspace lib build
      staging: crystalhd: trim register defines

Jeff Mahoney (5):
      Staging: rt2860: Use skb_tail_pointer
      Staging: rtl8192e: Use skb_tail_pointer
      Staging: rtl8192u: dont use -mhard-float
      Staging: otus: fix assignment makes integer from pointer without a cast warnings
      Staging: vme/tsi148: Depend on VIRT_TO_BUS

Jim Dog (1):
      Staging: wlan-ng: Fixed line length issues in prism2usb.c

Jochen Maes (3):
      staging: dream: Codestyle fix
      staging: dream: another Codestyle patch
      staging: dream: more Code style fixes

Joe Perches (4):
      Staging: rtl8187x: Use %pM for mac address output
      Staging: pohmelfs: Remove uses of NIPQUAD, use %pI4
      Staging: Fix continuation line formats
      Staging: Fix continuation line formats

Jonathan Cameron (2):
      staging: iio: Ensure mutex is correctly unlocked in __iio_push_event
      staging: iio: Fix incorrect existence check for a shared event pointer.

Julia Lawall (1):
      Staging: go7007: Eliminate useless code

Justin Madru (1):
      Staging: s5k3e2fx.c: simplify complexity by factoring

Larry Finger (6):
      Staging: r8187se: Fix a faulty if and do additional cleanups
      staging: r8187se: Change to use common eeprom routines in EEPROM_93CX
      Staging: r8187se: Fix for LED not following radio switch
      staging: r8187se: Remove write_phy routine
      Staging: r8187se: Remove two private variables that have a fixed value
      Staging: r8187se: Remove dead code from r8185b_init.c

Linus Luessing (2):
      Staging: batman-adv: remove obsoleted vis_format /proc file
      Staging: batman-adv: atomic variable for vis-srv activation

Linus Lüssing (2):
      Staging: batman-adv: Fixes rounding issues in vis.c
      Staging: batman-adv: Dont deactivate aggregation on wrong input

Marek Lindner (6):
      Staging: batman-adv: fix minor orig table layout bug
      Staging: batman-adv: splitting /proc vis file into vis_server and vis_data
      Staging: batman-adv: avoid having the same error message more than once
      Staging: batman-adv: remove obsolete variables
      Staging: batman-adv: avoid crash on memory allocation error
      Staging: batman-adv: fix module initialization

Mark Allyn (6):
      staging: rar_register: renaming driver to rar_register
      Staging: rar_register: renaming directory to rar_register
      Staging: rar_register: provide better explanation in Kconfig
      Staging: rar_register: fix checkpatch errors and debug header file
      Staging: rar_register: fix checkpatch errors and debug program file
      Staging: rar_register: add suspend and resume functions

Mark Brown (1):
      Staging: iio: Staticise non-exported functions

Martyn Welch (16):
      Staging: vme: Correct vme_user error message typo
      Staging: vme: Allow override of geographical address on tsi148
      Staging: vme: Allow override of geographical address on ca91c142
      Staging: vme: Fix checkpatch errors on VME core.
      Staging: vme: Remove old structures for implemented features
      Staging: vme: Allow drivers to co-exist
      Staging: vme: Renaming following split of GE Fanuc joint venture
      Staging: vme: Attribute Testing For Dma Request
      Staging: vme: Enable drivers to handle more than one bridge
      Staging: vme: Make vme_master_resource naming bus neutral
      Staging: vme: Add location monitor support for ca91cx42
      Staging: vme: add ca91cx42 dma support
      Staging: vme: Correct ca91cx42 resource handling
      Staging: vme: Add ca91cx42 rmw support
      Staging: vme: ca91cx42 slot detection
      Staging: vme: Remove legacy unsupported code

Maurice Dawson (3):
      Staging: comedi: fix brace coding style issue in ni_labpc.c
      Staging: comedi: fix another brace coding style issues in ni_labpc.c
      Staging: comedi: fix yet another brace coding style issue in ni_labpc.c

Minchan Kim (1):
      Staging: ramzswap: Free memory when create_device is failed

Nitin Gupta (7):
      Staging: ramzswap: Use lock for 64-bit stats
      Staging: ramzswap: Flush block device before reset
      Staging: ramzswap: Set block size to PAGE_SIZE
      Staging: ramzswap: Return proper error code on device create failure
      Staging: ramzswap: Remove redundant check for zero page
      Staging: ramzswap: Handle case for invalid backing swap
      Staging: ramzswap: Update copyright notice

Németh Márton (3):
      staging: make PCI device id constant
      staging: make USB device id constant
      staging: make i2c device id constant

OGAWA Hirofumi (1):
      Staging: comedi: serial2002: Fix filp_open usage

Paul Elms (1):
      Staging: comedi: fix brace coding style in comedi_fops.c

Pavel Machek (2):
      Staging: dream: add missing include files
      Staging: dream: fix memory leak in camera error path

Pavel Vasilyev (1):
      Staging: dream: HTC Dream camera, not need sizeof

Pekka Enberg (8):
      Staging: w35und: Convert typedef LOCAL_PARA to struct wb_local_para
      Staging: w35und: Convert typedef RadioOff to struct radio_off
      Staging: w35und: Remove unused typedef _EVENTLOG
      Staging: w35und: Convert typedef ChanInfo to struct chan_info
      Staging: w35und: Remove unused typedef CHAN_LIST
      Staging: w35und: Remove unused typedef TXRETRY_REC
      Staging: w35und: Remove unused typedef RXLAYER1
      Staging: w35und: Remove unused typedefs MLME_DEAUTHREQ_PARA and MLME_DISASSOCREQ_PARA

Peter Huewe (5):
      Staging: asus_oled: Add defines for asus vendor_id and device_id to be consistent with hid-ids.h
      Staging: asus_oled: Add NULL test for kmalloc
      Staging: otus: Add select WEXT_PRIV to Kconfig to prevent build failure
      Staging: rtl8192u: Add select WEXT_PRIV to Kconfig to prevent build failure
      Staging: wlan-ng: Add select WEXT_PRIV to Kconfig to prevent build failure

Radu Voicilas (5):
      Staging: rtl8192e: fix some codingstyle issues
      Staging: rtl8192e: fix more coding style issues.
      Staging: rtl8192e: Code style fix for r819xE_phyreg.h
      Staging: rtl8192e: Code style fixes for r819xE_phy.h
      Staging: rtl8192e: Small code fixes for r819xE_firmware.c

Randy Dunlap (4):
      Staging: rtl8187se: needs semaphore.h
      Staging: rtl8192* needs semaphore.h
      Staging: fix wlan-ng printk format warning
      Staging/pohmelfs: fix write_inode parameter warning

Richard Kennedy (1):
      Staging: wlan-ng: minor cleanups

Roel Kluin (9):
      Staging: otus: Fix branch in zfProtRspSim()
      Staging: rtl8192u: ieee80211: add missing parentheses
      Staging: rt2860: test off by one in RtmpAsicSendCommandToMcu()
      Staging: otus: 80211core: Fix &&/|| confusion
      Staging: v56655: add missing parentheses (in comment)
      Staging: rtl8192u: ieee80211: CurrentMPDUDensity assigned to itself in HTUseDefaultSetting()
      Staging: Comedi: G1-3 status registers not read in ni_gpct_to_660x_register()
      Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan()
      Staging: serqt_usb2: Two branches the same in qt_set_termios()

Scott Smedley (1):
      Staging: add dt3155 driver

Simon Horman (12):
      Staging: rtl8192su: Build should select WIRELESS_EXT
      Staging: rtl8192su: Use z format qualifier for output of sizeof()
      Staging: prism2-usb: Build should select WIRELESS_EXT
      Staging: wlan-ng: initialise mibitem
      Staging: DT3155: Use pci_get_device()
      Staging: rt2870: rtusb_probe() should be in section __devinit
      Staging: rt2870: Remove unnecessary forward declarations
      Staging: rtl8192e: print the elements of tx_pn and rx_pn not the arrays themselves
      Staging: rtl8192e: remove some functions from the __exit section
      Staging: rtl8192su, rtl8192u: use min_t() in store_debug_level()
      Staging: dt3155: remove compat code
      Staging: otus: zfTkipInit(): increment another pointer

Simon Wunderlich (7):
      Staging: batman-adv: update README for latest kernel
      Staging: batman-adv: initialize static hash iterators
      Staging: batman-adv: consistent spelling of "neighbors"
      Staging: batman-adv: check all kmalloc()s
      Staging: batman-adv: receive packets directly using skbs
      Staging: batman-adv: Remove compat.h
      Staging: batman-adv: don't lock while sending packets

Stewart Robertson (2):
      Staging: comedi: fix coding style issues in ni_labpc.c
      Staging: comedi: fix suspect code indent in ni_labpc.c

Sven Eckelmann (3):
      Staging: batman-adv: Remove NULL pointer check
      Staging: batman-adv: Use forw_bcast_list_lock always with disabled interrupts
      Staging: batman-adv: depend on NET instead of PACKET in Kconfig

Sven-Thorsten Dietrich (1):
      Staging: make drivers use spin_lock_init()

Svenne Krap (2):
      Staging: wlan-ng: clean up assignments in if statements
      Staging: wlan-ng: multiple safe style cleanups

Sylvain Trias (1):
      Staging: line6: variax.c: fixed a space a "x ? a : b" coding style issue

Thiago Farina (1):
      Staging: otus: fix some sparse warnings

Tim Schofield (1):
      Staging: rtl8192e: fix spacing style issues in r8180_93cx6.c

Uwe Kleine-König (4):
      staging: fix typos "enalbe" -> "enable"
      staging: fix typos "selct" -> "select"
      staging: fix typos "aquire" -> "acquire"
      staging: fix typos "couter" -> "counter"

Wu Zhangjin (1):
      staging: sm7xx: remove the buggy 2D acceleration support

Yong Zhang (1):
      Staging: rt2860: correct onstack wait_queue_head declaration

d binderman (2):
      Staging: otus: fix memory leak
      Staging: comedi: amplc_pci224.c: coding style cleanups

david woo (1):
      Staging: rtl9192e: fix power usage issues

horms at vergenet.net (4):
      Staging: otus: dont mix declarations and code
      Staging: otus: remove unused variables
      Staging: otus: remove unused constants
      Staging: otus: Fix ZM_SEQ_DEBUG macro for no-debug case

kirjanov at gmail.com (8):
      staging: slicoss Convert to netdev_tx_t
      staging: slicoss Check for valid hw address
      staging: slicoss No need type casting when using netdev_priv
      staging: slicoss No need to check pointer in debugfs_remove()
      staging: slicoss Use dev->stats rather than adapter->stats.
      staging: slicoss Use PCI_DEVICE_TABLE.
      staging: slicoss Use compare_ether_addr.
      staging: slicoss Use pci_set_consistent_dma_mask.

tony burrows (1):
      Staging: comedi: fix brace coding style issues in ni_labpc.c




More information about the devel mailing list