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
80211.tmpl
alsa-driver-api.tmpl
debugobjects.tmpl
device-drivers.tmpl
deviceiobook.tmpl
drm.tmpl
filesystems.tmpl
gadget.tmpl
genericirq.tmpl
kernel-api.tmpl
kernel-hacking.tmpl
kernel-locking.tmpl
kgdb.tmpl
libata.tmpl
librs.tmpl
lsm.tmpl
Makefile
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
regulator.tmpl
s390-drivers.tmpl
scsi.tmpl
sh.tmpl
stylesheet.xsl
tracepoint.tmpl
uio-howto.tmpl
usb.tmpl
writing_usb_driver.tmpl
writing-an-alsa-driver.tmpl
z8530book.tmpl