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

Commit fb7899b1 authored by Grant Likely's avatar Grant Likely
Browse files

Merge commit 'v2.6.33-rc6' into secretlab/next-spi

parents 212b3c8b abe94c75
Loading
Loading
Loading
Loading
+49 −0
Original line number Diff line number Diff line
@@ -493,3 +493,52 @@ Why: These two features use non-standard interfaces. There are the
Who:	Corentin Chary <corentin.chary@gmail.com>

----------------------------

What:	usbvideo quickcam_messenger driver
When:	2.6.35
Files:	drivers/media/video/usbvideo/quickcam_messenger.[ch]
Why:	obsolete v4l1 driver replaced by gspca_stv06xx
Who:	Hans de Goede <hdegoede@redhat.com>

----------------------------

What:	ov511 v4l1 driver
When:	2.6.35
Files:	drivers/media/video/ov511.[ch]
Why:	obsolete v4l1 driver replaced by gspca_ov519
Who:	Hans de Goede <hdegoede@redhat.com>

----------------------------

What:	w9968cf v4l1 driver
When:	2.6.35
Files:	drivers/media/video/w9968cf*.[ch]
Why:	obsolete v4l1 driver replaced by gspca_ov519
Who:	Hans de Goede <hdegoede@redhat.com>

----------------------------

What:	ovcamchip sensor framework
When:	2.6.35
Files:	drivers/media/video/ovcamchip/*
Why:	Only used by obsoleted v4l1 drivers
Who:	Hans de Goede <hdegoede@redhat.com>

----------------------------

What:	stv680 v4l1 driver
When:	2.6.35
Files:	drivers/media/video/stv680.[ch]
Why:	obsolete v4l1 driver replaced by gspca_stv0680
Who:	Hans de Goede <hdegoede@redhat.com>

----------------------------

What:	zc0301 v4l driver
When:	2.6.35
Files:	drivers/media/video/zc0301/*
Why:	Duplicate functionality with the gspca_zc3xx driver, zc0301 only
	supports 2 USB-ID's (because it only supports a limited set of
	sensors) wich are also supported by the gspca_zc3xx driver
	(which supports 53 USB-ID's in total)
Who:	Hans de Goede <hdegoede@redhat.com>
+40 −8
Original line number Diff line number Diff line
@@ -27,12 +27,30 @@ set of events/packets.

A set of ABS_MT events with the desired properties is defined. The events
are divided into categories, to allow for partial implementation.  The
minimum set consists of ABS_MT_TOUCH_MAJOR, ABS_MT_POSITION_X and
ABS_MT_POSITION_Y, which allows for multiple fingers to be tracked.  If the
device supports it, the ABS_MT_WIDTH_MAJOR may be used to provide the size
of the approaching finger. Anisotropy and direction may be specified with
ABS_MT_TOUCH_MINOR, ABS_MT_WIDTH_MINOR and ABS_MT_ORIENTATION.  The
ABS_MT_TOOL_TYPE may be used to specify whether the touching tool is a
minimum set consists of ABS_MT_POSITION_X and ABS_MT_POSITION_Y, which
allows for multiple fingers to be tracked.  If the device supports it, the
ABS_MT_TOUCH_MAJOR and ABS_MT_WIDTH_MAJOR may be used to provide the size
of the contact area and approaching finger, respectively.

The TOUCH and WIDTH parameters have a geometrical interpretation; imagine
looking through a window at someone gently holding a finger against the
glass.  You will see two regions, one inner region consisting of the part
of the finger actually touching the glass, and one outer region formed by
the perimeter of the finger. The diameter of the inner region is the
ABS_MT_TOUCH_MAJOR, the diameter of the outer region is
ABS_MT_WIDTH_MAJOR. Now imagine the person pressing the finger harder
against the glass. The inner region will increase, and in general, the
ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR, which is always smaller than
unity, is related to the finger pressure. For pressure-based devices,
ABS_MT_PRESSURE may be used to provide the pressure on the contact area
instead.

In addition to the MAJOR parameters, the oval shape of the finger can be
described by adding the MINOR parameters, such that MAJOR and MINOR are the
major and minor axis of an ellipse. Finally, the orientation of the oval
shape can be describe with the ORIENTATION parameter.

The ABS_MT_TOOL_TYPE may be used to specify whether the touching tool is a
finger or a pen or something else.  Devices with more granular information
may specify general shapes as blobs, i.e., as a sequence of rectangular
shapes grouped together by an ABS_MT_BLOB_ID. Finally, for the few devices
@@ -42,11 +60,9 @@ report finger tracking from hardware [5].
Here is what a minimal event sequence for a two-finger touch would look
like:

   ABS_MT_TOUCH_MAJOR
   ABS_MT_POSITION_X
   ABS_MT_POSITION_Y
   SYN_MT_REPORT
   ABS_MT_TOUCH_MAJOR
   ABS_MT_POSITION_X
   ABS_MT_POSITION_Y
   SYN_MT_REPORT
@@ -87,6 +103,12 @@ the contact. The ratio ABS_MT_TOUCH_MAJOR / ABS_MT_WIDTH_MAJOR approximates
the notion of pressure. The fingers of the hand and the palm all have
different characteristic widths [1].

ABS_MT_PRESSURE

The pressure, in arbitrary units, on the contact area. May be used instead
of TOUCH and WIDTH for pressure-based devices or any device with a spatial
signal intensity distribution.

ABS_MT_ORIENTATION

The orientation of the ellipse. The value should describe a signed quarter
@@ -170,6 +192,16 @@ There are a few devices that support trackingID in hardware. User space can
make use of these native identifiers to reduce bandwidth and cpu usage.


Gestures
--------

In the specific application of creating gesture events, the TOUCH and WIDTH
parameters can be used to, e.g., approximate finger pressure or distinguish
between index finger and thumb. With the addition of the MINOR parameters,
one can also distinguish between a sweeping finger and a pointing finger,
and with ORIENTATION, one can detect twisting of fingers.


Notes
-----

+8 −10
Original line number Diff line number Diff line
@@ -410,9 +410,8 @@ F: drivers/i2c/busses/i2c-ali1563.c

ALPHA PORT
M:	Richard Henderson <rth@twiddle.net>
S:	Odd Fixes for 2.4; Maintained for 2.6.
M:	Ivan Kokshaysky <ink@jurassic.park.msu.ru>
S:	Maintained for 2.4; PCI support for 2.6.
M:	Matt Turner <mattst88@gmail.com>
L:	linux-alpha@vger.kernel.org
F:	arch/alpha/

@@ -988,7 +987,6 @@ F: drivers/platform/x86/asus-laptop.c

ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
M:	Dan Williams <dan.j.williams@intel.com>
M:	Maciej Sosnowski <maciej.sosnowski@intel.com>
W:	http://sourceforge.net/projects/xscaleiop
S:	Supported
F:	Documentation/crypto/async-tx-api.txt
@@ -1638,9 +1636,8 @@ S: Maintained
F:	sound/pci/cs5535audio/

CX18 VIDEO4LINUX DRIVER
M:	Hans Verkuil <hverkuil@xs4all.nl>
M:	Andy Walls <awalls@radix.net>
L:	ivtv-devel@ivtvdriver.org
L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
L:	linux-media@vger.kernel.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W:	http://linuxtv.org
@@ -1825,7 +1822,6 @@ S: Supported
F:	fs/dlm/

DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
M:	Maciej Sosnowski <maciej.sosnowski@intel.com>
M:	Dan Williams <dan.j.williams@intel.com>
S:	Supported
F:	drivers/dma/
@@ -2788,7 +2784,7 @@ F: arch/x86/kernel/microcode_core.c
F:	arch/x86/kernel/microcode_intel.c

INTEL I/OAT DMA DRIVER
M:	Maciej Sosnowski <maciej.sosnowski@intel.com>
M:	Dan Williams <dan.j.williams@intel.com>
S:	Supported
F:	drivers/dma/ioat*

@@ -2826,10 +2822,11 @@ L: netdev@vger.kernel.org
S:	Maintained
F:	drivers/net/ixp2000/

INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/ixgb/ixgbe)
INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe)
M:	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
M:	Jesse Brandeburg <jesse.brandeburg@intel.com>
M:	Bruce Allan <bruce.w.allan@intel.com>
M:	Alex Duyck <alexander.h.duyck@intel.com>
M:	PJ Waskiewicz <peter.p.waskiewicz.jr@intel.com>
M:	John Ronciak <john.ronciak@intel.com>
L:	e1000-devel@lists.sourceforge.net
@@ -2839,6 +2836,7 @@ F: drivers/net/e100.c
F:	drivers/net/e1000/
F:	drivers/net/e1000e/
F:	drivers/net/igb/
F:	drivers/net/igbvf/
F:	drivers/net/ixgb/
F:	drivers/net/ixgbe/

@@ -3012,8 +3010,8 @@ S: Maintained
F:	drivers/isdn/hardware/eicon/

IVTV VIDEO4LINUX DRIVER
M:	Hans Verkuil <hverkuil@xs4all.nl>
L:	ivtv-devel@ivtvdriver.org
M:	Andy Walls <awalls@radix.net>
L:	ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
L:	linux-media@vger.kernel.org
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
W:	http://www.ivtvdriver.org
+2 −3
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 33
EXTRAVERSION = -rc4
EXTRAVERSION = -rc6
NAME = Man-Eating Seals of Antiquity

# *DOCUMENTATION*
@@ -18,10 +18,9 @@ MAKEFLAGS += -rR --no-print-directory

# Avoid funny character set dependencies
unexport LC_ALL
LC_CTYPE=C
LC_COLLATE=C
LC_NUMERIC=C
export LC_CTYPE LC_COLLATE LC_NUMERIC
export LC_COLLATE LC_NUMERIC

# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ static const struct cpumask *cpumask_of_node(int node)
{
	int cpu;

	if (node == -1)
		return cpu_all_mask;

	cpumask_clear(&node_to_cpumask_map[node]);

	for_each_online_cpu(cpu) {
Loading