leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2ff0720933
linux/Documentation/DocBook
History
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 mac80211: add doc short section on LED triggers 2011-01-10 15:40:52 -05: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 docbook: fix signal_pending() argument 2009-12-09 18:59:52 -08: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
lsm.tmpl
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 Fix common misspellings 2011-03-31 11:26:23 -03:00
z8530book.tmpl Rationalise Randy's address a bit 2008-10-30 11:38:47 -07:00