Merge branch 'linus' into x86/timers

	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

	xhci-hcd.quirks		[USB,KNL]

			A hex value specifying bitmask with supplemental xhci

			host controller quirks. Meaning of each bit can be

			consulted in header drivers/usb/host/xhci.h.

	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

				    Octa board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen4412    - for Exynos4412-based Insignal Origen board.

	- "insignal,origen4412"   - for Exynos4412-based Insignal Origen board.

Optional nodes:

 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.

   supports a single port with a single endpoint.

 - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and

   Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting

Nintendo Wii (Hollywood) GPIO controller

Required properties:

- compatible: "nintendo,hollywood-gpio

- compatible: "nintendo,hollywood-gpio"

- reg: Physical base address and length of the controller's registers.

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be <2>. The first cell is the pin number and the

		reg = <0x6c>;

		interrupt-parent = <&gpx1>;

		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;

		vdd-supply = <&ldo15_reg>";

		vdd-supply = <&ldo15_reg>;

		vid-supply = <&ldo18_reg>;

		reset-gpios = <&gpx1 5 0>;

		touchscreen-size-x = <1080>;