diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 03:36:17 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 03:36:17 -0500 |
| commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 (patch) | |
| tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd /Documentation/DocBook/sh.tmpl | |
| parent | 96886c4361f1ae3f6c775d7c9295e2d557101d0f (diff) | |
| parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 (diff) | |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Documentation/DocBook/sh.tmpl')
| -rw-r--r-- | Documentation/DocBook/sh.tmpl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/DocBook/sh.tmpl b/Documentation/DocBook/sh.tmpl index d858d92cf6d9..4a38f604fa66 100644 --- a/Documentation/DocBook/sh.tmpl +++ b/Documentation/DocBook/sh.tmpl | |||
| @@ -79,10 +79,6 @@ | |||
| 79 | </sect2> | 79 | </sect2> |
| 80 | </sect1> | 80 | </sect1> |
| 81 | </chapter> | 81 | </chapter> |
| 82 | <chapter id="clk"> | ||
| 83 | <title>Clock Framework Extensions</title> | ||
| 84 | !Iinclude/linux/sh_clk.h | ||
| 85 | </chapter> | ||
| 86 | <chapter id="mach"> | 82 | <chapter id="mach"> |
| 87 | <title>Machine Specific Interfaces</title> | 83 | <title>Machine Specific Interfaces</title> |
| 88 | <sect1 id="dreamcast"> | 84 | <sect1 id="dreamcast"> |