Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/Documentation/DocBook
Linus Torvalds 29a6ccca38 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (97 commits)
  mtd: kill CONFIG_MTD_PARTITIONS
  mtd: remove add_mtd_partitions, add_mtd_device and friends
  mtd: convert remaining users to mtd_device_register()
  mtd: samsung onenand: convert to mtd_device_register()
  mtd: omap2 onenand: convert to mtd_device_register()
  mtd: txx9ndfmc: convert to mtd_device_register()
  mtd: tmio_nand: convert to mtd_device_register()
  mtd: socrates_nand: convert to mtd_device_register()
  mtd: sharpsl: convert to mtd_device_register()
  mtd: s3c2410 nand: convert to mtd_device_register()
  mtd: ppchameleonevb: convert to mtd_device_register()
  mtd: orion_nand: convert to mtd_device_register()
  mtd: omap2: convert to mtd_device_register()
  mtd: nomadik_nand: convert to mtd_device_register()
  mtd: ndfc: convert to mtd_device_register()
  mtd: mxc_nand: convert to mtd_device_register()
  mtd: mpc5121_nfc: convert to mtd_device_register()
  mtd: jz4740_nand: convert to mtd_device_register()
  mtd: h1910: convert to mtd_device_register()
  mtd: fsmc_nand: convert to mtd_device_register()
  ...

Fixed up trivial conflicts in
 - drivers/mtd/maps/integrator-flash.c: removed in ARM tree
 - drivers/mtd/maps/physmap.c: addition of afs partition probe type
   clashing with removal of CONFIG_MTD_PARTITIONS
2011-05-27 20:06:53 -07:00
..
dvb [media] Media DocBook: fix validation errors 2011-05-25 07:51:59 -03:00
v4l [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook 2011-05-25 19:50:17 -03:00
.gitignore [media] ignore Documentation/DocBook/media/ 2011-05-20 09:27:48 -03:00
80211.tmpl
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
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
Makefile kbuild: move scripts/basic/docproc.c to scripts/docproc.c 2011-05-02 22:48:03 +02:00
mcabook.tmpl
media-entities.tmpl [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook 2011-05-25 19:50:17 -03:00
media-indices.tmpl
media.tmpl
mtdnand.tmpl mtd: kill CONFIG_MTD_PARTITIONS 2011-05-25 02:25:35 +01: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 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-an-alsa-driver.tmpl Fix common misspellings 2011-03-31 11:26:23 -03:00
writing_usb_driver.tmpl
z8530book.tmpl