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

diff --cc Documentation/00-INDEX
index f61be4a2b38b6f0301143a888d77b5e3475980ec,0f3e8bbab8d79c5fddfb173f1bb76adf82b008f5..45b3df936d2fbc0ba30f798264cff33273a969c0
--- 1/Documentation/00-INDEX
--- 2/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 b72d9fbf97a327d4c5ff583db3f29fbdd4e6cd04,dfdfe8bdc9c55b1ecc4515472aedd1058570a717..65d2bc9a0bde4a4d4f9f8129a2fe79f67e71a550
--- 1/arch/mips/cavium-octeon/executive/cvmx-helper-util.c
--- 2/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 e217aba1f5234aef1bbb62653de481539421003c,01c8ddd84ff8a9bacc230306891205802681505c..f446f212bbd4009355bcd8cd8953fcaef9ebde72
--- 1/arch/mips/include/asm/octeon/cvmx-helper-util.h
--- 2/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);

diff --cc arch/powerpc/platforms/85xx/p1022_ds.c
Simple merge

diff --cc arch/xtensa/Kconfig
Simple merge

diff --cc drivers/gpu/drm/i915/i915_debugfs.c
Simple merge

diff --cc drivers/hid/Kconfig
Simple merge

diff --cc drivers/media/platform/soc_camera/mx2_camera.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

diff --cc drivers/staging/octeon/ethernet.c
Simple merge

diff --cc fs/btrfs/extent-tree.c
Simple merge

diff --cc fs/btrfs/transaction.c
Simple merge

diff --cc net/bluetooth/hci_core.c
Simple merge

diff --cc net/sctp/sm_make_chunk.c
Simple merge

diff --cc sound/soc/codecs/wm8983.c
Simple merge

diff --cc sound/soc/codecs/wm8985.c
Simple merge