diff options
| author | Arnd Bergmann | 2012-07-25 14:33:45 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-07-25 14:35:04 +0200 |
| commit | 8cef081c71dd4e16a01a1e63cedab21eef8b5735 (patch) | |
| tree | b5b0fb5ab09dc60dee5fc8fd8e980359abbd1b1e /Documentation/devicetree/bindings/mtd | |
| parent | ARM: tegra: harmony: add regulator supply name and its input supply (diff) | |
| parent | Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux (diff) | |
| download | kernel-qcow2-linux-8cef081c71dd4e16a01a1e63cedab21eef8b5735.tar.gz kernel-qcow2-linux-8cef081c71dd4e16a01a1e63cedab21eef8b5735.tar.xz kernel-qcow2-linux-8cef081c71dd4e16a01a1e63cedab21eef8b5735.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fixes
The merge of the 'clk-for-linus' branch caused an automated
merge failure. Pull that in here so we can fix the problem.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/mtd')
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/partition.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mtd/partition.txt b/Documentation/devicetree/bindings/mtd/partition.txt index f114ce1657c2..6e1f61f1e789 100644 --- a/Documentation/devicetree/bindings/mtd/partition.txt +++ b/Documentation/devicetree/bindings/mtd/partition.txt @@ -35,4 +35,4 @@ flash@0 { uimage@100000 { reg = <0x0100000 0x200000>; }; -]; +}; |