Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92c260f7 authored by David Brown's avatar David Brown
Browse files

Merge remote branch 'rmk/for-linus' into for-linus 

* rmk/for-linus: (1557 commits)
  ARM: 6806/1: irq: introduce entry and exit functions for chained handlers
  ARM: 6781/1: Thumb-2: Work around buggy Thumb-2 short branch relocations in gas
  ARM: 6747/1: P2V: Thumb2 support
  ARM: 6798/1: aout-core: zero thread debug registers in a.out core dump
  ARM: 6796/1: Footbridge: Fix I/O mappings for NOMMU mode
  ARM: 6784/1: errata: no automatic Store Buffer drain on Cortex-A9
  ARM: 6772/1: errata: possible fault MMU translations following an ASID switch
  ARM: 6776/1: mach-ux500: activate fix for errata 753970
  ARM: 6794/1: SPEAr: Append UL to device address macros.
  ARM: 6793/1: SPEAr: Remove unused *_SIZE macros from spear*.h files
  ARM: 6792/1: SPEAr: Replace SIZE macro's with SZ_4K macros
  ARM: 6791/1: SPEAr3xx: Declare device structures after shirq code
  ARM: 6790/1: SPEAr: Clock Framework: Rename usbd clock and align apb_clk entry
  ARM: 6789/1: SPEAr3xx: Rename sdio to sdhci
  ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h
  ARM: 6787/1: SPEAr: Reorder #includes in .h & .c files.
  ARM: 6681/1: SPEAr: add debugfs support to clk API
  ARM: 6703/1: SPEAr: update clk API support
  ARM: 6679/1: SPEAr: make clk API functions more generic
  ARM: 6737/1: SPEAr: formalized timer support
  ...

Conflicts:
	arch/arm/mach-msm/board-msm7x27.c
	arch/arm/mach-msm/board-msm7x30.c
	arch/arm/mach-msm/board-qsd8x50.c
	arch/arm/mach-msm/board-sapphire.c
	arch/arm/mach-msm/include/mach/memory.h
parents 8e76a809 05e34754

.gitignore

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.gz

*.bz2

*.bz2

*.lzma

*.lzma

*.xz

*.lzo

*.lzo

*.patch

*.patch

*.gcno

*.gcno

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu> 
Arnaud Patard <arnaud.patard@rtp-net.org>

Arnaud Patard <arnaud.patard@rtp-net.org>

Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Ben Gardner <bgardner@wabtec.com>

Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Björn Steinbrink <B.Steinbrink@gmx.de>

Documentation/ABI/testing/sysfs-platform-at91

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
What:		/sys/devices/platform/at91_can/net/<iface>/mb0_id

Date:		January 2011

KernelVersion:	2.6.38

Contact:	Marc Kleine-Budde <kernel@pengutronix.de>

Description:

		Value representing the can_id of mailbox 0.



		Default: 0x7ff (standard frame)



		Due to a chip bug (errata 50.2.6.3 & 50.3.5.3 in

		"AT91SAM9263 Preliminary 6249H-ATARM-27-Jul-09") the

		contents of mailbox 0 may be send under certain

		conditions (even if disabled or in rx mode).



		The workaround in the errata suggests not to use the

		mailbox and load it with an unused identifier.



		In order to use an extended can_id add the

		CAN_EFF_FLAG (0x80000000U) to the can_id. Example:



		- standard id 0x7ff:

		echo 0x7ff      > /sys/class/net/can0/mb0_id



		- extended id 0x1fffffff:

		echo 0x9fffffff > /sys/class/net/can0/mb0_id

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Iinclude/linux/serial_core.h

!Edrivers/serial/serial_core.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/serial/8250.c

!Edrivers/tty/serial/8250.c

  </chapter>

  </chapter>





  <chapter id="fbdev">

  <chapter id="fbdev">

Documentation/DocBook/drm.tmpl

+3 −3
Original line number Original line Diff line number Diff line
@@ -73,8 +73,8 @@ 
      services.

      services.

    </para>

    </para>

    <para>

    <para>

      The core of every DRM driver is struct drm_device.  Drivers

      The core of every DRM driver is struct drm_driver.  Drivers

      will typically statically initialize a drm_device structure,

      will typically statically initialize a drm_driver structure,

      then pass it to drm_init() at load time.

      then pass it to drm_init() at load time.

    </para>

    </para>
@@ -84,7 +84,7 @@ 
    <title>Driver initialization</title>

    <title>Driver initialization</title>

    <para>

    <para>

      Before calling the DRM initialization routines, the driver must

      Before calling the DRM initialization routines, the driver must

      first create and fill out a struct drm_device structure.

      first create and fill out a struct drm_driver structure.

    </para>

    </para>

    <programlisting>

    <programlisting>

      static struct drm_driver driver = {

      static struct drm_driver driver = {