kevin/linux
1
Fork 0
Code
d7d3077a28
linux/arch/arm/mach-davinci
History
Linus Torvalds 7b3480f8b7 MTD pull for 3.3 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAk8Mq/MACgkQdwG7hYl686PeFACfZCgbdDWD9A/JL+i1RMfExVu6
 Pi0An3Hmc3PTCp0yQ21KtcKhpF9CAMEu
 =NfuL
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6

MTD pull for 3.3

* tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
  mtd: Fix dependency for MTD_DOC200x
  mtd: do not use mtd->block_markbad directly
  logfs: do not use 'mtd->block_isbad' directly
  mtd: introduce mtd_can_have_bb helper
  mtd: do not use mtd->suspend and mtd->resume directly
  mtd: do not use mtd->lock, unlock and is_locked directly
  mtd: do not use mtd->sync directly
  mtd: harmonize mtd_writev usage
  mtd: do not use mtd->lock_user_prot_reg directly
  mtd: mtd->write_user_prot_reg directly
  mtd: do not use mtd->read_*_prot_reg directly
  mtd: do not use mtd->get_*_prot_info directly
  mtd: do not use mtd->read_oob directly
  mtd: mtdoops: do not use mtd->panic_write directly
  romfs: do not use mtd->get_unmapped_area directly
  mtd: do not use mtd->get_unmapped_area directly
  mtd: do use mtd->point directly
  mtd: introduce mtd_has_oob helper
  mtd: mtdcore: export symbols cleanup
  mtd: clean-up the default_mtd_writev function
  ...

Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c
2012-01-10 13:45:22 -08:00
..
include/mach Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
aemif.c
board-da830-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-da850-evm.c MTD pull for 3.3 2012-01-10 13:45:22 -08:00
board-dm355-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm355-leopard.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm365-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm644x-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-dm646x-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-mityomapl138.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-neuros-osd2.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-omapl138-hawk.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-sffsdr.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
board-tnetv107x-evm.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c ARM: davinci: add support for multiple power domains 2011-12-03 00:35:52 +05:30
clock.h ARM: davinci: add support for multiple power domains 2011-12-03 00:35:52 +05:30
common.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
cp_intc.c arm: Cleanup the irq namespace 2011-03-29 14:47:57 +02:00
cpufreq.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2011-11-07 10:13:52 -08:00
da830.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
da850.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
devices-da8xx.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
devices-tnetv107x.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm355.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm365.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dm644x.c New feature development 2012-01-09 14:38:51 -08:00
dm646x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
dma.c ARM: davinci: edma: use kzalloc() 2011-09-17 15:54:09 +05:30
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: davinci: AM18x: Add wl1271/wlan support 2011-09-17 15:53:23 +05:30
Makefile ARM: mach-davinci: remove arch specific special handling for ioremap 2011-11-15 22:30:39 -05:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mux.c
mux.h
pm.c net: remove mm.h inclusion from netdevice.h 2011-06-21 19:17:20 -07:00
psc.c ARM: davinci: psc: fix incorrect offsets 2011-12-05 16:47:15 +05:30
serial.c
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c
time.c
tnetv107x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
usb.c