Staging: fixed multiple spelling errors.

Fixed multiple spelling errors.

Signed-off-by: Carlos E. Garcia <carlos@cgarcia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion_priv.h b/drivers/staging/android/ion/ion_priv.h
index 18a5f93..52f1cd1 100644 (file)
--- a/drivers/staging/android/ion/ion_priv.h
+++ b/drivers/staging/android/ion/ion_priv.h
@@ -33,7 +33,7 @@ struct ion_buffer *ion_handle_buffer(struct ion_handle *handle);
 
 /**
  * struct ion_buffer - metadata for a particular buffer
- * @ref:               refernce count
+ * @ref:               reference count
  * @node:              node in the ion_device buffers tree
  * @dev:               back pointer to the ion_device
  * @heap:              back pointer to the heap the buffer came from
@@ -46,7 +46,7 @@ struct ion_buffer *ion_handle_buffer(struct ion_handle *handle);
  *                     an ion_phys_addr_t (and someday a phys_addr_t)
  * @lock:              protects the buffers cnt fields
  * @kmap_cnt:          number of times the buffer is mapped to the kernel
- * @vaddr:             the kenrel mapping if kmap_cnt is not zero
+ * @vaddr:             the kernel mapping if kmap_cnt is not zero
  * @dmap_cnt:          number of times the buffer is mapped for dma
  * @sg_table:          the sg table for the buffer if dmap_cnt is not zero
  * @pages:             flat array of pages in the buffer -- used by fault
@@ -266,7 +266,7 @@ void ion_heap_freelist_add(struct ion_heap *heap, struct ion_buffer *buffer);
 /**
  * ion_heap_freelist_drain - drain the deferred free list
  * @heap:              the heap
- * @size:              ammount of memory to drain in bytes
+ * @size:              amount of memory to drain in bytes
  *
  * Drains the indicated amount of memory from the deferred freelist immediately.
  * Returns the total amount freed.  The total freed may be higher depending

diff --git a/drivers/staging/android/uapi/ion.h b/drivers/staging/android/uapi/ion.h
index 6aa4956..68a14b4 100644 (file)
--- a/drivers/staging/android/uapi/ion.h
+++ b/drivers/staging/android/uapi/ion.h
@@ -179,7 +179,7 @@ struct ion_custom_data {
  * DOC: ION_IOC_SYNC - syncs a shared file descriptors to memory
  *
  * Deprecated in favor of using the dma_buf api's correctly (syncing
- * will happend automatically when the buffer is mapped to a device).
+ * will happen automatically when the buffer is mapped to a device).
  * If necessary should be used after touching a cached buffer from the cpu,
  * this will make the buffer in memory coherent.
  */

diff --cc drivers/staging/comedi/comedi_fops.c
Simple merge

diff --cc drivers/staging/dgnc/TODO
Simple merge

diff --cc drivers/staging/dgnc/dgnc_neo.c
Simple merge

diff --cc drivers/staging/emxx_udc/emxx_udc.c
Simple merge

diff --cc drivers/staging/fbtft/Kconfig
Simple merge

diff --cc drivers/staging/fwserial/dma_fifo.c
Simple merge

diff --cc drivers/staging/fwserial/fwserial.h
Simple merge

diff --cc drivers/staging/iio/Documentation/device.txt
Simple merge

diff --cc drivers/staging/iio/iio_simple_dummy.h
Simple merge

diff --cc drivers/staging/lustre/TODO
Simple merge

diff --cc drivers/staging/media/bcm2048/radio-bcm2048.c
Simple merge

diff --cc drivers/staging/octeon-usb/octeon-hcd.c
Simple merge

diff --cc drivers/staging/octeon-usb/octeon-hcd.h
Simple merge

diff --cc drivers/staging/rtl8188eu/include/rtl8188e_hal.h
Simple merge

diff --cc drivers/staging/rtl8192u/r8192U_dm.c
Simple merge

diff --cc drivers/staging/rtl8712/rtl8712_xmit.c
Simple merge

diff --cc drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h
Simple merge

diff --cc drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/odm.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/rtl8723au_xmit.c
Simple merge

diff --cc drivers/staging/rtl8723au/hal/usb_halinit.c
Simple merge

diff --cc drivers/staging/rtl8723au/include/odm_debug.h
Simple merge

diff --cc drivers/staging/rtl8723au/include/rtl8723a_hal.h
Simple merge

diff --cc drivers/staging/rtl8723au/include/rtw_cmd.h
Simple merge

diff --cc drivers/staging/rtl8723au/include/rtw_mlme.h
Simple merge

diff --cc drivers/staging/rtl8723au/include/rtw_mlme_ext.h
Simple merge

diff --cc drivers/staging/rtl8723au/include/sta_info.h
Simple merge

diff --cc drivers/staging/sm750fb/ddk750_help.h
Simple merge

diff --cc drivers/staging/sm750fb/ddk750_mode.c
Simple merge

diff --cc drivers/staging/sm750fb/ddk750_reg.h
Simple merge

diff --cc drivers/staging/sm750fb/ddk750_sii164.c
Simple merge

diff --cc drivers/staging/sm750fb/readme
Simple merge

diff --cc drivers/staging/sm750fb/sm750.c
Simple merge

diff --cc drivers/staging/sm750fb/sm750_accel.c
Simple merge

diff --cc drivers/staging/sm750fb/sm750_hw.h
Simple merge

diff --cc drivers/staging/unisys/include/guestlinuxdebug.h
Simple merge

diff --cc drivers/staging/vt6655/rxtx.c
Simple merge