linux-stable-rt/arch/arm/mach-ixp4xx
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
..
include/mach Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-05-25 08:59:42 -07:00
Kconfig
Makefile
Makefile.boot
avila-pci.c
avila-setup.c
common-pci.c
common.c
coyote-pci.c
coyote-setup.c
dsmg600-pci.c
dsmg600-setup.c
fsg-pci.c
fsg-setup.c
gateway7001-pci.c
gateway7001-setup.c
goramo_mlr.c
gtwx5715-pci.c
gtwx5715-setup.c
ixdp425-pci.c
ixdp425-setup.c mtd: ixp: convert to mtd_device_register() 2011-05-25 02:20:41 +01:00
ixdpg425-pci.c
ixp4xx_npe.c
ixp4xx_qmgr.c
nas100d-pci.c
nas100d-setup.c
nslu2-pci.c
nslu2-setup.c
vulcan-pci.c
vulcan-setup.c
wg302v2-pci.c
wg302v2-setup.c