Merge 3.7-rc5 into usb-next

This pulls in the 3.7-rc5 branch into usb-next
This commit is contained in:
Greg Kroah-Hartman 2012-11-13 10:33:29 -08:00
commit b240add62c
387 changed files with 3859 additions and 2312 deletions

View file

@ -0,0 +1,19 @@
* EETI eGalax Multiple Touch Controller
Required properties:
- compatible: must be "eeti,egalax_ts"
- reg: i2c slave address
- interrupt-parent: the phandle for the interrupt controller
- interrupts: touch controller interrupt
- wakeup-gpios: the gpio pin to be used for waking up the controller
as well as uased as irq pin
Example:
egalax_ts@04 {
compatible = "eeti,egalax_ts";
reg = <0x04>;
interrupt-parent = <&gpio1>;
interrupts = <9 2>;
wakeup-gpios = <&gpio1 9 0>;
};