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

Commit fa2bd301 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3',... 

Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogic', 'wacom' and 'wiimote' into for-linus
parents 1ad346a9 4fe9f8e2 a80fe5d6 56fa9441 5844c1cd eb4e426a 8908dd80 a2f6e4e0

Documentation/ABI/testing/sysfs-driver-wacom

+13 −0
Original line number Diff line number Diff line 
WWhat:		/sys/class/hidraw/hidraw*/device/oled*_img

Date:		June 2012

Contact:	linux-bluetooth@vger.kernel.org

Description:

		The /sys/class/hidraw/hidraw*/device/oled*_img files control

		OLED mocro displays on Intuos4 Wireless tablet. Accepted image

		has to contain 256 bytes (64x32 px 1 bit colour). The format

		is the same as PBM image 62x32px without header (64 bits per

		horizontal line, 32 lines). An example of setting OLED No. 0:

		dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img

		The attribute is read only and no local copy of the image is

		stored.



What:		/sys/class/hidraw/hidraw*/device/speed

Date:		April 2010

Kernel Version:	2.6.35

Documentation/i2c/busses/i2c-i801

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Supported adapters: 
  * Intel DH89xxCC (PCH)

  * Intel Panther Point (PCH)

  * Intel Lynx Point (PCH)

  * Intel Lynx Point-LP (PCH)

   Datasheets: Publicly available at the Intel website



On Intel Patsburg and later chipsets, both the normal host SMBus controller

MAINTAINERS

+10 −3
Original line number Diff line number Diff line
@@ -3388,7 +3388,7 @@ M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de> 
L:	linux-i2c@vger.kernel.org

W:	http://i2c.wiki.kernel.org/

T:	quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/

T:	git git://git.fluff.org/bjdooks/linux.git

T:	git git://git.pengutronix.de/git/wsa/linux.git

S:	Maintained

F:	Documentation/i2c/

F:	drivers/i2c/
@@ -3666,11 +3666,12 @@ F: Documentation/networking/README.ipw2200 
F:	drivers/net/wireless/ipw2x00/



INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)

M:	Joseph Cihula <joseph.cihula@intel.com>

M:	Richard L Maliszewski <richard.l.maliszewski@intel.com>

M:	Gang Wei <gang.wei@intel.com>

M:	Shane Wang <shane.wang@intel.com>

L:	tboot-devel@lists.sourceforge.net

W:	http://tboot.sourceforge.net

T:	Mercurial http://www.bughost.org/repos.hg/tboot.hg

T:	hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot

S:	Supported

F:	Documentation/intel_txt.txt

F:	include/linux/tboot.h
@@ -5320,6 +5321,12 @@ L: linux-mtd@lists.infradead.org 
S:	Maintained

F:	drivers/mtd/devices/phram.c



PICOLCD HID DRIVER

M:	Bruno Prémont <bonbons@linux-vserver.org>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-picolcd*



PICOXCELL SUPPORT

M:	Jamie Iles <jamie@jamieiles.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 6

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config ARM 
	select HAVE_DMA_API_DEBUG

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_MEMBLOCK

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION