You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		14 years ago
..
dvb	[media] Media DocBook: fix validation errors	14 years ago
v4l	[media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook	14 years ago
.gitignore	[media] ignore Documentation/DocBook/media/	14 years ago
80211.tmpl	mac80211: add doc short section on LED triggers	14 years ago
Makefile	kbuild: move scripts/basic/docproc.c to scripts/docproc.c	14 years ago
alsa-driver-api.tmpl	ALSA: Move ALSA docbooks to be with the rest of the kernel docbooks	16 years ago
debugobjects.tmpl	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	16 years ago
device-drivers.tmpl	driver core: Add the device driver-model structures to kerneldoc	14 years ago
deviceiobook.tmpl	docbook: fix errors from x86 headers merger	15 years ago
drm.tmpl	drm: fix wrong usages of drm_device in DRM Developer's Guide	14 years ago
filesystems.tmpl	Docbook: add fs/eventfd.c and fix typos in it	14 years ago
gadget.tmpl	usb gadget: cdc obex glue	17 years ago
genericirq.tmpl	genirq: Update DocBook comments	14 years ago
kernel-api.tmpl	docbook: add idr/ida to kernel-api docbook	15 years ago
kernel-hacking.tmpl	docbook: fix signal_pending() argument	15 years ago
kernel-locking.tmpl	Fix common misspellings	14 years ago
kgdb.tmpl	kdb: Add kdb kernel module sample	14 years ago
libata.tmpl	Fix common misspellings	14 years ago
librs.tmpl	…
lsm.tmpl	…
mcabook.tmpl	Rationalise Randy's address a bit	17 years ago
media-entities.tmpl	[media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook	14 years ago
media-indices.tmpl	V4L/DVB (13572): v4l2-spec: Digital Video Timings API documentation	15 years ago
media.tmpl	[media] media: Media device	14 years ago
mtdnand.tmpl	mtd: kill CONFIG_MTD_PARTITIONS	14 years ago
networking.tmpl	wimax: Makefile, Kconfig and docbook linkage for the stack	16 years ago
rapidio.tmpl	docbook: fix rapidio warning	14 years ago
regulator.tmpl	Fix common misspellings	14 years ago
s390-drivers.tmpl	…
scsi.tmpl	Documentation: update broken web addresses.	15 years ago
sh.tmpl	sh: clkfwk: Kill off unused clk_set_rate_ex().	14 years ago
stylesheet.xsl	docbook: use IDs as filenames to support multiple books	15 years ago
tracepoint.tmpl	workqueue: Add a workqueue chapter to the tracepoint docbook	15 years ago
uio-howto.tmpl	Fix common misspellings	14 years ago
usb.tmpl	Fix common misspellings	14 years ago
writing-an-alsa-driver.tmpl	Fix common misspellings	14 years ago
writing_usb_driver.tmpl	USB: rename usb_buffer_alloc() and usb_buffer_free() users	15 years ago
z8530book.tmpl	Rationalise Randy's address a bit	17 years ago