merge by hand - fix up rejections in Documentation/DocBook/Makefile

2026-09-14 18:22:56 +00:00 · 2005-05-20 15:27:44 -05:00 · 2005-05-20 15:27:44 -05:00 · ad34ea2cc3
commit ad34ea2cc3
parent 90356ac319 88d7bd8cb9
1285 changed files with 32403 additions and 15847 deletions
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
--- a/include/linux/auto_fs4.h
+++ b/include/linux/auto_fs4.h
--- a/include/linux/awe_voice.h
+++ b/include/linux/awe_voice.h
--- a/include/linux/binfmts.h
+++ b/include/linux/binfmts.h
--- a/include/linux/compiler-gcc2.h
+++ b/include/linux/compiler-gcc2.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/edd.h
+++ b/include/linux/edd.h
--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fddidevice.h
+++ b/include/linux/fddidevice.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/hippidevice.h
+++ b/include/linux/hippidevice.h
--- a/include/linux/if.h
+++ b/include/linux/if.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/linux/if_ltalk.h
+++ b/include/linux/if_ltalk.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/iso_fs.h
+++ b/include/linux/iso_fs.h
--- a/include/linux/iso_fs_i.h
+++ b/include/linux/iso_fs_i.h
--- a/include/linux/iso_fs_sb.h
+++ b/include/linux/iso_fs_sb.h
--- a/include/linux/ixjuser.h
+++ b/include/linux/ixjuser.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mpage.h
+++ b/include/linux/mpage.h
--- a/include/linux/net.h
+++ b/include/linux/net.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
--- a/include/linux/patchkey.h
+++ b/include/linux/patchkey.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/reboot_fixups.h
+++ b/include/linux/reboot_fixups.h
--- a/include/linux/reiserfs_acl.h
+++ b/include/linux/reiserfs_acl.h
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.h
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/signal.h
+++ b/include/linux/signal.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
--- a/include/linux/soundcard.h
+++ b/include/linux/soundcard.h
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/linux/tc_act/tc_defact.h
+++ b/include/linux/tc_act/tc_defact.h
--- a/include/linux/trdevice.h
+++ b/include/linux/trdevice.h
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h