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

Commit f19693a1 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge commit 'v2.6.38-rc4' into imx-for-2.6.39 



Conflicts:
	arch/arm/mach-mxs/clock-mx28.c

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parents 23b120cd 100b33c8

.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/dvb/dvbapi.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
	<holder>Convergence GmbH</holder>

	<holder>Convergence GmbH</holder>

</copyright>

</copyright>

<copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

</copyright>

Documentation/DocBook/media.tmpl

+2 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
<title>LINUX MEDIA INFRASTRUCTURE API</title>

<title>LINUX MEDIA INFRASTRUCTURE API</title>





<copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>LinuxTV Developers</holder>

	<holder>LinuxTV Developers</holder>

</copyright>

</copyright>
@@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled 
</author>

</author>

</authorgroup>

</authorgroup>

<copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

</copyright>