---

yaml --- r: 326677 b: refs/heads/master c: 1f926c4 h: refs/heads/master i: 326675: 520b894 v: v3
git-mirror · Sep 20, 2012 · 49cdf97 · 49cdf97
1 parent ad661b8
commit 49cdf97
Show file tree

Hide file tree

Showing 834 changed files with 19,580 additions and 20,403 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aec092eed5d8d2b19a62b0aeed3acea9471099a
+refs/heads/master: 1f926c4883590765004e003bbbefc668edd30dd5
diff --git a/trunk/Documentation/ABI/testing/sysfs-tty b/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
-
diff --git a/trunk/Documentation/devicetree/bindings/arm/bcm2835.txt b/trunk/Documentation/devicetree/bindings/arm/bcm2835.txt
diff --git a/trunk/Documentation/devicetree/bindings/arm/pmu.txt b/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.

diff --git a/trunk/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt b/trunk/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
diff --git a/trunk/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt b/trunk/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
diff --git a/trunk/Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt b/trunk/Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt
diff --git a/trunk/Documentation/devicetree/bindings/tty/serial/of-serial.txt b/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:
 

diff --git a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -10,7 +10,6 @@ apm	Applied Micro Circuits Corporation (APM)
 arm	ARM Ltd.
 atmel	Atmel Corporation
 bosch	Bosch Sensortec GmbH
-brcm	Broadcom Corporation
 cavium	Cavium, Inc.
 chrp	Common Hardware Reference Platform
 cortina	Cortina Systems, Inc.

diff --git a/trunk/Documentation/i2c/busses/i2c-i801 b/trunk/Documentation/i2c/busses/i2c-i801
@@ -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

diff --git a/trunk/Documentation/serial/00-INDEX b/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