linux-stable-rt/drivers/mtd/maps
Linus Torvalds 1c496784a0 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (149 commits)
  arm: omap: Add omap3_defconfig
  AM35xx: Defconfig for AM3517 EVM board
  AM35xx: Add support for AM3517 EVM board
  omap: 3630sdp: defconfig creation
  omap: 3630sdp: introduce 3630 sdp board support
  omap3: Add defconfig for IGEP v2 board
  omap3: Add minimal IGEP v2 support
  omap3: Add CompuLab CM-T35 defconfig
  omap3: Add CompuLab CM-T35 board support
  omap3: rx51: Add wl1251 wlan driver support
  omap3: rx51: Add SDRAM init
  omap1: Add default kernel configuration for Herald
  omap1: Add board support and LCD for HTC Herald
  omap: zoom2: update defconfig for LL_DEBUG_NONE
  omap: zoom3: defconfig creation
  omap3: zoom: Introduce zoom3 board support
  omap3: zoom: Drop i2c-1 speed to 2400
  omap3: zoom: rename zoom2 name to generic zoom
  omap3: zoom: split board file for software reuse
  omap3evm: MIgrate to smsc911x ethernet driver
  ...

Fix trivial conflict (two unrelated config options added next to each
other) in arch/arm/mach-omap2/Makefile
2009-12-08 08:15:29 -08:00
..
Kconfig
Makefile
alchemy-flash.c
amd76xrom.c
autcpu12-nvram.c
bfin-async-flash.c
cdb89712.c
ceiva.c
cfi_flagadm.c
ck804xrom.c
dbox2-flash.c
dc21285.c
dilnetpc.c
dmv182.c
edb7312.c
esb2rom.c
fortunet.c
gpio-addr-flash.c
h720x-flash.c
ichxrom.c
impa7.c
integrator-flash.c
intel_vr_nor.c
ipaq-flash.c
ixp4xx.c
ixp2000.c
l440gx.c
map_funcs.c
mbx860.c
netsc520.c
nettel.c
octagon-5066.c
omap_nor.c
pci.c
pcmciamtd.c pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer 2009-11-28 18:02:58 +01:00
physmap.c
physmap_of.c
plat-ram.c
pmcmsp-flash.c
pxa2xx-flash.c
rbtx4939-flash.c
redwood.c
rpxlite.c
sa1100-flash.c
sbc_gxx.c
sc520cdp.c
scb2_flash.c
scx200_docflash.c
solutionengine.c
sun_uflash.c
tqm8xxl.c
ts5500_flash.c
tsunami_flash.c
uclinux.c
vmax301.c
vmu-flash.c
wr_sbc82xx_flash.c