From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 03:28:05 +0000 (+1100)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20130220~43
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ee725df20ad555695e21a9fb4bb6cf6bc1ddf3a;p=karo-tx-linux.git

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	arch/mips/cavium-octeon/executive/cvmx-helper-util.c
	arch/mips/include/asm/octeon/cvmx-helper-util.h
---

5ee725df20ad555695e21a9fb4bb6cf6bc1ddf3a
diff --cc Documentation/00-INDEX
index f61be4a2b38b,0f3e8bbab8d7..45b3df936d2f
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@@ -226,12 -299,16 +299,18 @@@ memory-hotplug.tx
  	- Hotpluggable memory support, how to use and current status.
  memory.txt
  	- info on typical Linux memory problems.
 +metag/
 +	- directory with info about Linux on Meta architecture.
  mips/
  	- directory with info about Linux on MIPS architecture.
+ misc-devices/
+ 	- directory with info about devices using the misc dev subsystem
  mmc/
  	- directory with info about the MMC subsystem
+ mn10300/
+ 	- directory with info about the mn10300 architecture port
+ mtd/
+ 	- directory with info about memory technology devices (flash)
  mono.txt
  	- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
  mutex-design.txt
diff --cc arch/mips/cavium-octeon/executive/cvmx-helper-util.c
index b72d9fbf97a3,dfdfe8bdc9c5..65d2bc9a0bde
--- a/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
+++ b/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
@@@ -172,11 -172,11 +172,11 @@@ int cvmx_helper_dump_packet(cvmx_wqe_t 
   *
   * @queue:  Input queue to setup RED on (0-7)
   * @pass_thresh:
 - *               Packets will begin slowly dropping when there are less than
 - *               this many packet buffers free in FPA 0.
 + *		 Packets will begin slowly dropping when there are less than
 + *		 this many packet buffers free in FPA 0.
   * @drop_thresh:
-  *		 All incomming packets will be dropped when there are less
 - *               All incoming packets will be dropped when there are less
 - *               than this many free packet buffers in FPA 0.
++ *		 All incoming packets will be dropped when there are less
 + *		 than this many free packet buffers in FPA 0.
   * Returns Zero on success. Negative on failure
   */
  int cvmx_helper_setup_red_queue(int queue, int pass_thresh, int drop_thresh)
@@@ -207,11 -207,11 +207,11 @@@
   * Setup Random Early Drop to automatically begin dropping packets.
   *
   * @pass_thresh:
 - *               Packets will begin slowly dropping when there are less than
 - *               this many packet buffers free in FPA 0.
 + *		 Packets will begin slowly dropping when there are less than
 + *		 this many packet buffers free in FPA 0.
   * @drop_thresh:
-  *		 All incomming packets will be dropped when there are less
 - *               All incoming packets will be dropped when there are less
 - *               than this many free packet buffers in FPA 0.
++ *		 All incoming packets will be dropped when there are less
 + *		 than this many free packet buffers in FPA 0.
   * Returns Zero on success. Negative on failure
   */
  int cvmx_helper_setup_red(int pass_thresh, int drop_thresh)
diff --cc arch/mips/include/asm/octeon/cvmx-helper-util.h
index e217aba1f523,01c8ddd84ff8..f446f212bbd4
--- a/arch/mips/include/asm/octeon/cvmx-helper-util.h
+++ b/arch/mips/include/asm/octeon/cvmx-helper-util.h
@@@ -57,11 -57,11 +57,11 @@@ extern int cvmx_helper_dump_packet(cvmx
   *
   * @queue:  Input queue to setup RED on (0-7)
   * @pass_thresh:
 - *               Packets will begin slowly dropping when there are less than
 - *               this many packet buffers free in FPA 0.
 + *		 Packets will begin slowly dropping when there are less than
 + *		 this many packet buffers free in FPA 0.
   * @drop_thresh:
-  *		 All incomming packets will be dropped when there are less
 - *               All incoming packets will be dropped when there are less
 - *               than this many free packet buffers in FPA 0.
++ *		 All incoming packets will be dropped when there are less
 + *		 than this many free packet buffers in FPA 0.
   * Returns Zero on success. Negative on failure
   */
  extern int cvmx_helper_setup_red_queue(int queue, int pass_thresh,
@@@ -71,11 -71,11 +71,11 @@@
   * Setup Random Early Drop to automatically begin dropping packets.
   *
   * @pass_thresh:
 - *               Packets will begin slowly dropping when there are less than
 - *               this many packet buffers free in FPA 0.
 + *		 Packets will begin slowly dropping when there are less than
 + *		 this many packet buffers free in FPA 0.
   * @drop_thresh:
-  *		 All incomming packets will be dropped when there are less
 - *               All incoming packets will be dropped when there are less
 - *               than this many free packet buffers in FPA 0.
++ *		 All incoming packets will be dropped when there are less
 + *		 than this many free packet buffers in FPA 0.
   * Returns Zero on success. Negative on failure
   */
  extern int cvmx_helper_setup_red(int pass_thresh, int drop_thresh);