original_kernel/arch/blackfin/kernel
Linus Torvalds 22ae77bc7a Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (53 commits)
  [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
  [MTD] [NOR] Fixup for Numonyx M29W128 chips
  [MTD] mtdpart: Make ecc_stats more realistic.
  powerpc/85xx: TQM8548: Update DTS file for multi-chip support
  powerpc: NAND: FSL UPM: document new bindings
  [MTD] [NAND] FSL-UPM: Add wait flags to support board/chip specific delays
  [MTD] [NAND] FSL-UPM: add multi chip support
  [MTD] [NOR] Add device parent info to physmap_of
  [MTD] [NAND] Add support for NAND on the Socrates board
  [MTD] [NAND] Add support for 4KiB pages.
  [MTD] sysfs support should not depend on CONFIG_PROC_FS
  [MTD] [NAND] Add parent info for CAFÉ controller
  [MTD] support driver model updates
  [MTD] driver model updates (part 2)
  [MTD] driver model updates
  [MTD] [NAND] move gen_nand's probe function to .devinit.text
  [MTD] [MAPS] move sa1100 flash's probe function to .devinit.text
  [MTD] fix use after free in register_mtd_blktrans
  [MTD] [MAPS] Drop now unused sharpsl-flash map
  [MTD] ofpart: Check name property to determine partition nodes.
  ...

Manually fix trivial conflict in drivers/mtd/maps/Makefile
2009-04-06 14:56:26 -07:00
..
cplb-mpu
cplb-nompu
Makefile
asm-offsets.c
bfin_dma_5xx.c
bfin_gpio.c Blackfin arch: be less noisy when gets a gpio conflict after kernel has booted 2009-03-29 01:10:30 +08:00
bfin_ksyms.c
cplbinfo.c
dma-mapping.c
early_printk.c
entry.S
fixed_code.S
flat.c
gptimers.c
init_task.c
ipipe.c
irqchip.c
kgdb.c
kgdb_test.c
mcount.S
module.c
process.c Merge git://git.infradead.org/mtd-2.6 2009-04-06 14:56:26 -07:00
ptrace.c
reboot.c
setup.c
signal.c
sys_bfin.c
time-ts.c
time.c
traps.c
vmlinux.lds.S Blackfin arch: add link-time asserts to make sure on-chip regions dont overflow 2009-03-29 00:47:31 +08:00