2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-30 16:13:54 +08:00
linux-next/Documentation/DocBook
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
dvb [media] Media DocBook: fix validation errors 2011-05-25 07:51:59 -03:00
v4l treewide: fix potentially dangerous trailing ';' in #defined values/expressions 2011-07-21 14:10:00 +02:00
.gitignore [media] ignore Documentation/DocBook/media/ 2011-05-20 09:27:48 -03:00
80211.tmpl mac80211: fix docbook 2011-07-11 15:02:18 -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 driver core: Add the device driver-model structures to kerneldoc 2011-05-06 18:01:05 -07:00
deviceiobook.tmpl docbook: fix errors from x86 headers merger 2010-03-03 07:32:39 -08:00
drm.tmpl drm: fix wrong usages of drm_device in DRM Developer's Guide 2011-02-15 09:01:29 +10:00
filesystems.tmpl Docbook: add fs/eventfd.c and fix typos in it 2011-02-21 15:07:04 -08:00
gadget.tmpl usb gadget: cdc obex glue 2008-10-17 14:40:53 -07:00
genericirq.tmpl genirq: Update DocBook comments 2011-04-23 15:56:23 +02:00
kernel-api.tmpl docbook: add idr/ida to kernel-api docbook 2010-10-26 17:40:56 -07:00
kernel-hacking.tmpl sched: Generalize sleep inside spinlock detection 2011-06-23 00:44:38 +02:00
kernel-locking.tmpl Fix common misspellings 2011-03-31 11:26:23 -03:00
kgdb.tmpl kdb: Add kdb kernel module sample 2010-10-29 13:14:39 -05:00
libata.tmpl Fix common misspellings 2011-03-31 11:26:23 -03: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
Makefile kbuild: move scripts/basic/docproc.c to scripts/docproc.c 2011-05-02 22:48:03 +02:00
mcabook.tmpl Rationalise Randy's address a bit 2008-10-30 11:38:47 -07:00
media-entities.tmpl [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook 2011-05-25 19:50:17 -03:00
media-indices.tmpl V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation 2009-12-16 00:18:04 -02:00
media.tmpl [media] media: Media device 2011-03-22 04:53:09 -03:00
mtdnand.tmpl mtd: kill CONFIG_MTD_PARTITIONS 2011-05-25 02:25:35 +01:00
networking.tmpl wimax: Makefile, Kconfig and docbook linkage for the stack 2009-01-07 10:00:17 -08:00
rapidio.tmpl docbook: fix rapidio warning 2011-03-27 19:30:19 -07:00
regulator.tmpl Fix common misspellings 2011-03-31 11:26:23 -03: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 Fix common misspellings 2011-03-31 11:26:23 -03:00
usb.tmpl Fix common misspellings 2011-03-31 11:26:23 -03:00
writing_usb_driver.tmpl USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
writing-an-alsa-driver.tmpl ALSA: Update document for using KBUILD_MODNAME 2011-06-14 08:54:14 +02:00
z8530book.tmpl Rationalise Randy's address a bit 2008-10-30 11:38:47 -07:00