diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 20:15:26 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 20:15:29 +0100 |
| commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
| tree | f190b142830153eaab05555a93c4f71a144ba3d4 /Documentation/DocBook/sh.tmpl | |
| parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
| download | kernel_samsung_smdk4412-8e9255e6a2141e050d51bc4d96dbef494a87d653.zip kernel_samsung_smdk4412-8e9255e6a2141e050d51bc4d96dbef494a87d653.tar.gz kernel_samsung_smdk4412-8e9255e6a2141e050d51bc4d96dbef494a87d653.tar.bz2 | |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 d858d92..4a38f60 100644 --- a/Documentation/DocBook/sh.tmpl +++ b/Documentation/DocBook/sh.tmpl @@ -79,10 +79,6 @@ </sect2> </sect1> </chapter> - <chapter id="clk"> - <title>Clock Framework Extensions</title> -!Iinclude/linux/sh_clk.h - </chapter> <chapter id="mach"> <title>Machine Specific Interfaces</title> <sect1 id="dreamcast"> |