q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/blackfin
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
..
boot Blackfin: encode cpu-rev into uImage name 2011-01-10 07:18:27 -05:00
configs Blackfin: bf533-stamp/bf537-stamp: drop ad1980 from defconfigs 2011-05-25 08:13:43 -04:00
include kgdbts: unify/generalize gdb breakpoint adjustment 2011-05-26 17:12:36 -07:00
kernel Blackfin: use new common PERCPU_INPUT define 2011-05-25 08:24:15 -04:00
lib Fix common misspellings 2011-03-31 11:26:23 -03:00
mach-bf518 Blackfin: update anomaly lists to latest public info 2011-05-25 08:24:08 -04:00
mach-bf527 Blackfin: boards: update ASoC resources after machine driver overhaul 2011-05-25 08:24:14 -04:00
mach-bf533 Blackfin: update anomaly lists to latest public info 2011-05-25 08:24:08 -04:00
mach-bf537 Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
mach-bf538 Blackfin: update anomaly lists to latest public info 2011-05-25 08:24:08 -04:00
mach-bf548 Blackfin: boards: update ASoC resources after machine driver overhaul 2011-05-25 08:24:14 -04:00
mach-bf561 Merge git://git.infradead.org/mtd-2.6 2011-05-27 20:06:53 -07:00
mach-common Blackfin: convert old cpumask API to new one 2011-05-25 08:24:11 -04:00
mm Blackfin: convert /proc/sram to seq_file 2011-05-25 08:24:13 -04:00
oprofile Blackfin arch: remove hardware PM code, oprofile not use it 2009-01-07 23:14:39 +08:00
ADI_BSD.txt Blackfin: mass clean up of copyright/licensing info 2009-10-07 04:36:26 -04:00
Kconfig arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT} 2011-05-26 17:12:38 -07:00
Kconfig.debug Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin 2011-05-25 15:34:14 -07:00
Makefile Blackfin: encode cpu-rev into uImage name 2011-01-10 07:18:27 -05:00