diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:31:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-11 17:31:52 -0400 |
| commit | 0d5959723e1db3fd7323c198a50c16cecf96c7a9 (patch) | |
| tree | 802b623fff261ebcbbddadf84af5524398364a18 /Documentation/DocBook/Makefile | |
| parent | 62fdac5913f71f8f200bd2c9bd59a02e9a1498e9 (diff) | |
| parent | 512626a04e72aca60effe111fa0333ed0b195d21 (diff) | |
Merge branch 'linus' into x86/mce3
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/irq.c
Merge reason: Resolve the conflicts above.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/DocBook/Makefile')
| -rw-r--r-- | Documentation/DocBook/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index b1eb661e6302..9632444f6c62 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile | |||
| @@ -13,7 +13,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ | |||
| 13 | gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ | 13 | gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \ |
| 14 | genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ | 14 | genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \ |
| 15 | mac80211.xml debugobjects.xml sh.xml regulator.xml \ | 15 | mac80211.xml debugobjects.xml sh.xml regulator.xml \ |
| 16 | alsa-driver-api.xml writing-an-alsa-driver.xml | 16 | alsa-driver-api.xml writing-an-alsa-driver.xml \ |
| 17 | tracepoint.xml | ||
| 17 | 18 | ||
| 18 | ### | 19 | ### |
| 19 | # The build process is as follows (targets): | 20 | # The build process is as follows (targets): |