---

yaml
---
r: 326522
b: refs/heads/master
c: 032c1bb
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e51036d348956a3cdb5a977234c395fdb82e170
+refs/heads/master: 032c1bbe9b1d93010b63f142752572f1e181ee34

trunk/Documentation/ABI/testing/sysfs-tty

@@ -17,12 +17,3 @@ Description:
 		 device, like 'tty1'.
 		 The file supports poll() to detect virtual
 		 console switches.
-
-What:		/sys/class/tty/ttyS0/uartclk
-Date:		Sep 2012
-Contact:	Tomas Hlavacek <tmshlvck@gmail.com>
-Description:
-		 Shows the current uartclk value associated with the
-		 UART port in serial_core, that is bound to TTY like ttyS0.
-		 uartclk = 16 * baud_base
-

trunk/Documentation/arm/memory.txt

@@ -51,9 +51,6 @@ ffc00000	ffefffff	DMA memory mapping region.  Memory returned
 ff000000	ffbfffff	Reserved for future expansion of DMA
 				mapping region.
 
-fee00000	feffffff	Mapping of PCI I/O space. This is a static
-				mapping within the vmalloc space.
-
 VMALLOC_START	VMALLOC_END-1	vmalloc() / ioremap() space.
 				Memory returned by vmalloc/ioremap will
 				be dynamically placed in this region.

trunk/Documentation/devicetree/bindings/arm/pmu.txt

@@ -7,12 +7,8 @@ representation in the device tree should be done as under:-
 Required properties:
 
 - compatible : should be one of
-	"arm,cortex-a15-pmu"
 	"arm,cortex-a9-pmu"
 	"arm,cortex-a8-pmu"
-	"arm,cortex-a7-pmu"
-	"arm,cortex-a5-pmu"
-	"arm,arm11mpcore-pmu"
 	"arm,arm1176-pmu"
 	"arm,arm1136-pmu"
 - interrupts : 1 combined interrupt or 1 per core.

trunk/Documentation/devicetree/bindings/regulator/tps6586x.txt

@@ -8,8 +8,7 @@ Required properties:
 - gpio-controller: mark the device as a GPIO controller
 - regulators: list of regulators provided by this controller, must have
   property "regulator-compatible" to match their hardware counterparts:
-  sys, sm[0-2], ldo[0-9] and ldo_rtc
-- sys-supply: The input supply for SYS.
+  sm[0-2], ldo[0-9] and ldo_rtc
 - vin-sm0-supply: The input supply for the SM0.
 - vin-sm1-supply: The input supply for the SM1.
 - vin-sm2-supply: The input supply for the SM2.
@@ -21,9 +20,6 @@ Required properties:
 
 Each regulator is defined using the standard binding for regulators.
 
-Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver
-      take care of making proper parent child relationship.
-
 Example:
 
 	pmu: tps6586x@34 {
@@ -34,7 +30,6 @@ Example:
 		#gpio-cells = <2>;
 		gpio-controller;
 
-		sys-supply = <&some_reg>;
 		vin-sm0-supply = <&some_reg>;
 		vin-sm1-supply = <&some_reg>;
 		vin-sm2-supply = <&some_reg>;
@@ -48,107 +43,99 @@ Example:
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			sys_reg: regulator@0 {
+			sm0_reg: regulator@0 {
 				reg = <0>;
-				regulator-compatible = "sys";
-				regulator-name = "vdd_sys";
-				regulator-boot-on;
-				regulator-always-on;
-			};
-
-			sm0_reg: regulator@1 {
-				reg = <1>;
 				regulator-compatible = "sm0";
 				regulator-min-microvolt = < 725000>;
 				regulator-max-microvolt = <1500000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
 
-			sm1_reg: regulator@2 {
-				reg = <2>;
+			sm1_reg: regulator@1 {
+				reg = <1>;
 				regulator-compatible = "sm1";
 				regulator-min-microvolt = < 725000>;
 				regulator-max-microvolt = <1500000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
 
-			sm2_reg: regulator@3 {
-				reg = <3>;
+			sm2_reg: regulator@2 {
+				reg = <2>;
 				regulator-compatible = "sm2";
 				regulator-min-microvolt = <3000000>;
 				regulator-max-microvolt = <4550000>;
 				regulator-boot-on;
 				regulator-always-on;
 			};
 
-			ldo0_reg: regulator@4 {
-				reg = <4>;
+			ldo0_reg: regulator@3 {
+				reg = <3>;
 				regulator-compatible = "ldo0";
 				regulator-name = "PCIE CLK";
 				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			ldo1_reg: regulator@5 {
-				reg = <5>;
+			ldo1_reg: regulator@4 {
+				reg = <4>;
 				regulator-compatible = "ldo1";
 				regulator-min-microvolt = < 725000>;
 				regulator-max-microvolt = <1500000>;
 			};
 
-			ldo2_reg: regulator@6 {
-				reg = <6>;
+			ldo2_reg: regulator@5 {
+				reg = <5>;
 				regulator-compatible = "ldo2";
 				regulator-min-microvolt = < 725000>;
 				regulator-max-microvolt = <1500000>;
 			};
 
-			ldo3_reg: regulator@7 {
-				reg = <7>;
+			ldo3_reg: regulator@6 {
+				reg = <6>;
 				regulator-compatible = "ldo3";
 				regulator-min-microvolt = <1250000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			ldo4_reg: regulator@8 {
-				reg = <8>;
+			ldo4_reg: regulator@7 {
+				reg = <7>;
 				regulator-compatible = "ldo4";
 				regulator-min-microvolt = <1700000>;
 				regulator-max-microvolt = <2475000>;
 			};
 
-			ldo5_reg: regulator@9 {
-				reg = <9>;
+			ldo5_reg: regulator@8 {
+				reg = <8>;
 				regulator-compatible = "ldo5";
 				regulator-min-microvolt = <1250000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			ldo6_reg: regulator@10 {
-				reg = <10>;
+			ldo6_reg: regulator@9 {
+				reg = <9>;
 				regulator-compatible = "ldo6";
 				regulator-min-microvolt = <1250000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			ldo7_reg: regulator@11 {
-				reg = <11>;
+			ldo7_reg: regulator@10 {
+				reg = <10>;
 				regulator-compatible = "ldo7";
 				regulator-min-microvolt = <1250000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			ldo8_reg: regulator@12 {
-				reg = <12>;
+			ldo8_reg: regulator@11 {
+				reg = <11>;
 				regulator-compatible = "ldo8";
 				regulator-min-microvolt = <1250000>;
 				regulator-max-microvolt = <3300000>;
 			};
 
-			ldo9_reg: regulator@13 {
-				reg = <13>;
+			ldo9_reg: regulator@12 {
+				reg = <12>;
 				regulator-compatible = "ldo9";
 				regulator-min-microvolt = <1250000>;
 				regulator-max-microvolt = <3300000>;

trunk/Documentation/devicetree/bindings/tty/serial/of-serial.txt

@@ -25,8 +25,6 @@ Optional properties:
   accesses to the UART (e.g. TI davinci).
 - used-by-rtas : set to indicate that the port is in use by the OpenFirmware
   RTAS and should not be registered.
-- no-loopback-test: set to indicate that the port does not implements loopback
-  test mode
 
 Example:
 

trunk/Documentation/serial/00-INDEX

@@ -2,6 +2,8 @@
 	- this file.
 README.cycladesZ
 	- info on Cyclades-Z firmware loading.
+computone.txt
+	- info on Computone Intelliport II/Plus Multiport Serial Driver.
 digiepca.txt
 	- info on Digi Intl. {PC,PCI,EISA}Xx and Xem series cards.
 hayes-esp.txt