---

yaml --- r: 344323 b: refs/heads/master c: 92ece1c h: refs/heads/master i: 344321: 37920ce 344319: 06c8c6d v: v3
git-mirror · Nov 14, 2012 · 9cacef5 · 9cacef5
1 parent f3110c0
commit 9cacef5
Show file tree

Hide file tree

Showing 257 changed files with 1,360 additions and 8,990 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e76b1b2329b4a19adfacd187bc2920f68126a95
+refs/heads/master: 92ece1cdd27eee32c53630dc6af6d031b55be199
diff --git a/trunk/Documentation/cgroups/memory.txt b/trunk/Documentation/cgroups/memory.txt
@@ -466,10 +466,6 @@ Note:
 5.3 swappiness
 
 Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
-Please note that unlike the global swappiness, memcg knob set to 0
-really prevents from any swapping even if there is a swap storage
-available. This might lead to memcg OOM killer if there are no file
-pages to reclaim.
 
 Following cgroups' swappiness can't be changed.
 - root cgroup (uses /proc/sys/vm/swappiness).

diff --git a/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt b/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-mpic.txt
@@ -6,15 +6,9 @@ Required properties:
 - interrupt-controller: Identifies the node as an interrupt controller.
 - #interrupt-cells: The number of cells to define the interrupts. Should be 1.
   The cell is the IRQ number
-
 - reg: Should contain PMIC registers location and length. First pair
   for the main interrupt registers, second pair for the per-CPU
-  interrupt registers. For this last pair, to be compliant with SMP
-  support, the "virtual" must be use (For the record, these registers
-  automatically map to the interrupt controller registers of the
-  current CPU)
-
-
+  interrupt registers
 
 Example:
 
@@ -24,6 +18,6 @@ Example:
               #address-cells = <1>;
               #size-cells = <1>;
               interrupt-controller;
-              reg = <0xd0020a00 0x1d0>,
-                    <0xd0021070 0x58>;
+              reg = <0xd0020000 0x1000>,
+                    <0xd0021000 0x1000>;
         };
diff --git a/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt b/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-pmsu.txt
diff --git a/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt b/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt
@@ -5,7 +5,6 @@ Required properties:
 - compatible: Should be "marvell,armada-370-xp-timer"
 - interrupts: Should contain the list of Global Timer interrupts
 - reg: Should contain the base address of the Global Timer registers
-- clocks: clock driving the timer hardware
 
 Optional properties:
 - marvell,timer-25Mhz: Tells whether the Global timer supports the 25

diff --git a/trunk/Documentation/devicetree/bindings/arm/coherency-fabric.txt b/trunk/Documentation/devicetree/bindings/arm/coherency-fabric.txt
diff --git a/trunk/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt b/trunk/Documentation/devicetree/bindings/clock/mvebu-core-clock.txt
diff --git a/trunk/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt b/trunk/Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt
diff --git a/trunk/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt b/trunk/Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt
diff --git a/trunk/Documentation/devicetree/bindings/dma/mv-xor.txt b/trunk/Documentation/devicetree/bindings/dma/mv-xor.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/trunk/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
diff --git a/trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt b/trunk/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt