linux/Documentation/DocBook
Linus Torvalds e0d65113a7 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
2011-11-07 09:11:16 -08:00
..
media [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control 2011-11-03 18:29:09 -02:00
.gitignore [media] DocBook: Add a chapter to describe media errors 2011-07-27 17:53:35 -03:00
80211.tmpl mac80211: document client powersave 2011-09-30 15:57:24 -04:00
Makefile [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
alsa-driver-api.tmpl
debugobjects.tmpl
device-drivers.tmpl driver core: Add the device driver-model structures to kerneldoc 2011-05-06 18:01:05 -07:00
deviceiobook.tmpl
drm.tmpl
filesystems.tmpl
gadget.tmpl
genericirq.tmpl genirq: Update DocBook comments 2011-04-23 15:56:23 +02:00
kernel-api.tmpl
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
libata.tmpl Fix common misspellings 2011-03-31 11:26:23 -03:00
librs.tmpl
lsm.tmpl
mcabook.tmpl
media_api.tmpl [media] DVB: Point to the generic error chapter 2011-07-27 17:53:37 -03:00
mtdnand.tmpl mtd: doc: remove mention of MEMSETOOBSEL 2011-09-11 15:02:18 +03:00
networking.tmpl
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
scsi.tmpl
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl uio: Support physical addresses >32 bits on 32-bit systems 2011-10-18 11:18:57 -07:00
usb.tmpl Fix common misspellings 2011-03-31 11:26:23 -03:00
writing-an-alsa-driver.tmpl ALSA: mpu401: clean up interrupt specification 2011-09-14 11:00:51 +02:00
writing_usb_driver.tmpl
z8530book.tmpl