Commit 949c3676 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: Merge branch 'staging-next' into 2.6.38-rc3 



This was done to resolve conflicts in the following files due
to patches in Linus's tree and in the staging-next tree:
	drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
	drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents 836aded1 ebf53826

.mailmap

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

Arnd Bergmann <arnd@arndb.de>

Axel Dyks <xl@xlsigned.net>

Axel Lin <axel.lin@gmail.com>

Ben Gardner <bgardner@wabtec.com>

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

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

Documentation/ABI/testing/sysfs-platform-at91

0 → 100644
+25 −0
Original line number 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 Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c 
  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/serial/serial_core.c

!Edrivers/serial/8250.c

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

  </chapter>



  <chapter id="fbdev">

Documentation/DocBook/dvb/dvbapi.xml

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

</copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

Documentation/DocBook/media.tmpl

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



<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>LinuxTV Developers</holder>

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

</authorgroup>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>