1
0
Fork 0
alistair23-linux/Documentation/DocBook
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
dvb V4L/DVB: DocBook/dvb: Update spec to reflect the current FE capabilities 2010-08-02 15:03:17 -03:00
v4l [media] Fix videodev.h references at the V4L DocBook 2010-12-29 08:17:12 -02:00
.gitignore documentation: ignore byproducts from latex 2009-04-02 19:04:53 -07:00
80211.tmpl mac80211: publish SMPS docs 2010-12-02 15:16:58 -05:00
Makefile Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-08-25 14:51:42 -04:00
alsa-driver-api.tmpl ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks 2009-03-09 15:22:59 +01:00
debugobjects.tmpl debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem. 2009-06-15 21:30:28 -07:00
device-drivers.tmpl Input: include MT library as source for kerneldoc 2010-12-16 11:32:21 +01:00
deviceiobook.tmpl docbook: fix errors from x86 headers merger 2010-03-03 07:32:39 -08:00
drm.tmpl drm: use noop_llseek 2010-09-16 10:33:07 +02:00
filesystems.tmpl docbook: move pipe and splice to filesystems docbook 2008-02-13 16:21:19 -08:00
gadget.tmpl usb gadget: cdc obex glue 2008-10-17 14:40:53 -07:00
genericirq.tmpl genirq-update-kerneldoc.patch 2010-10-12 16:39:07 +02:00
kernel-api.tmpl docbook: add idr/ida to kernel-api docbook 2010-10-26 17:40:56 -07:00
kernel-hacking.tmpl docbook: fix signal_pending() argument 2009-12-09 18:59:52 -08:00
kernel-locking.tmpl Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu 2010-10-07 09:43:11 +02:00
kgdb.tmpl kdb: Add kdb kernel module sample 2010-10-29 13:14:39 -05:00
libata.tmpl Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 2010-05-20 09:27:37 -07:00
librs.tmpl docbook: librs typo fixes 2007-05-08 11:15:15 -07:00
lsm.tmpl Add missing section ID to lsm.tmpl 2008-02-07 08:42:16 -08:00
mcabook.tmpl Rationalise Randy's address a bit 2008-10-30 11:38:47 -07:00
media-entities.tmpl [media] v4l: document new Bayer and monochrome pixel formats 2010-10-23 09:16:08 -02:00
media-indices.tmpl V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation 2009-12-16 00:18:04 -02:00
media.tmpl V4L/DVB: DocBook/media: Add LIRC DocBook to media.html 2010-08-02 15:18:40 -03:00
mtdnand.tmpl tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
networking.tmpl wimax: Makefile, Kconfig and docbook linkage for the stack 2009-01-07 10:00:17 -08:00
rapidio.tmpl docbook: fix fatal rapidio yet again (and more to come) 2008-04-29 20:40:00 -07:00
regulator.tmpl regulator: Add basic DocBook manual 2009-01-08 20:10:34 +00:00
s390-drivers.tmpl docbook: fix s390 fatal error after header files moved 2008-08-05 16:56:29 -07:00
scsi.tmpl Documentation: update broken web addresses. 2010-08-04 15:21:40 +02:00
sh.tmpl sh: clkfwk: Kill off unused clk_set_rate_ex(). 2010-11-15 18:25:12 +09:00
stylesheet.xsl docbook: use IDs as filenames to support multiple books 2010-08-05 13:21:24 -07:00
tracepoint.tmpl workqueue: Add a workqueue chapter to the tracepoint docbook 2010-08-27 12:27:36 +02:00
uio-howto.tmpl Documentation: change email address for Hans Koch 2010-11-18 15:00:46 -08:00
usb.tmpl USB: remove usb DocBook warnings 2007-05-22 23:45:48 -07:00
writing-an-alsa-driver.tmpl ALSA: Update the documentation for changes of proc files 2010-04-13 12:55:09 +02:00
writing_usb_driver.tmpl USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
z8530book.tmpl Rationalise Randy's address a bit 2008-10-30 11:38:47 -07:00