Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 08:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
8033fe65a6
linux/drivers/mtd/maps
History
Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually
2008-10-13 14:12:40 -07:00
..
alchemy-flash.c [MTD] Remove useless references to MIPS_HYDROGEN3 and MIPS_MIRAGE_WHY. 2007-07-23 12:50:51 +01:00
amd76xrom.c removed unused #include <linux/version.h>'s 2008-08-23 12:14:12 -07:00
autcpu12-nvram.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
bfin-async-flash.c [MTD] [MAPS] Blackfin Async Flash Maps 2008-06-04 17:57:23 +01:00
cdb89712.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ceiva.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
cfi_flagadm.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ck804xrom.c removed unused #include <linux/version.h>'s 2008-08-23 12:14:12 -07:00
dbox2-flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
dc21285.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
dilnetpc.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
dmv182.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ebony.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
edb7312.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
esb2rom.c removed unused #include <linux/version.h>'s 2008-08-23 12:14:12 -07:00
fortunet.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
h720x-flash.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ichxrom.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
impa7.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
integrator-flash.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
intel_vr_nor.c [MTD] map driver for NOR flash on the Intel Vermilion Range chipset 2007-09-23 18:51:25 +01:00
ipaq-flash.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
ixp4xx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ixp2000.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
Kconfig Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6 2008-07-25 10:40:14 -04:00
l440gx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
Makefile Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6 2008-07-25 10:40:14 -04:00
map_funcs.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mbx860.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
netsc520.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
nettel.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ocotea.c
octagon-5066.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
omap_nor.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
omap-toto-flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
pci.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
pcmciamtd.c pcmcia: remove unused argument to pcmcia_parse_tuple() 2008-08-31 15:50:33 +02:00
physmap_of.c [MTD] Factor out OF partition support from the NOR driver. 2008-02-03 18:06:48 +11:00
physmap.c [MTD] physmap: resume already suspended chips on failure to suspend 2008-07-25 09:53:26 -04:00
plat-ram.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
pmcmsp-flash.c [MTD] replace remaining __FUNCTION__ occurrences 2008-04-22 12:36:04 +01:00
pmcmsp-ramroot.c [MTD] Remove references to ROOT_DEV from map drivers. 2007-06-28 20:13:27 +01:00
pxa2xx-flash.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
redwood.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
rpxlite.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sa1100-flash.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
sbc8240.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sbc_gxx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sc520cdp.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
scb2_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
scx200_docflash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sharpsl-flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
solutionengine.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
sun_uflash.c sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07:00
tqm8xxl.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ts5500_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
tsunami_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
uclinux.c Merge git://git.infradead.org/mtd-2.6 2008-07-26 20:30:56 -07:00
vmax301.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
walnut.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
wr_sbc82xx_flash.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00