Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/blackfin/mach-bf561
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
..
boards Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
include/mach Blackfin: update anomaly lists to latest public info 2011-05-25 08:24:08 -04:00
atomic.S Blackfin: SMP: kgdb: flush core internal write buffer before flushinv 2011-01-10 07:18:21 -05:00
coreb.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 2010-10-22 21:12:27 -07:00
dma.c Blackfin: dma: constify MMR pointer array 2011-01-10 07:18:05 -05:00
hotplug.c Blackfin: SMP: flush CoreB cache when shutting down 2011-03-22 21:03:16 -04:00
ints-priority.c Blackfin: bf561: rewrite SICA_xxx to just SIC_xxx 2010-10-22 16:30:02 -04:00
Kconfig
Makefile Blackfin: SMP: add PM/CPU hotplug support 2010-03-09 00:30:48 -05:00
secondary.S Blackfin: SMP: work around anomaly 05000491 2011-03-18 04:01:04 -04:00
smp.c Blackfin: don't touch cpu_possible_map and cpu_present_map directly 2011-05-25 08:24:10 -04:00