UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/mtd/maps
History
Linus Torvalds 1685e633b3 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:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
 		2010-08-06 12:25:06 -07:00
..
Kconfig Remove REDWOOD_[456] config options and conditional code 2010-07-26 09:06:04 -04:00
Makefile Merge with mainline to remove plat-omap/Kconfig conflict 2010-03-01 14:19:05 -08:00
amd76xrom.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09: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 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2010-05-10 14:32:46 +01:00
cdb89712.c [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants 2008-11-13 15:05:03 +00:00
ceiva.c mtd: maps: ceiva: do not return random numbers 2010-02-25 12:50:45 +00:00
cfi_flagadm.c [MTD] Make init_flagadm function static 2008-12-10 13:01:00 +00:00
ck804xrom.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
dbox2-flash.c [MTD] Make init_dbox2_flash static 2008-12-10 13:01:02 +00:00
dc21285.c Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07: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
edb7312.c [MTD] Make the init_edb7312nor function static 2008-12-10 13:00:51 +00:00
esb2rom.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fortunet.c [MTD] Make init_fortunet function static 2008-12-10 13:01:13 +00:00
gpio-addr-flash.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
h720x-flash.c [MTD] Make h720x_mtd_init function static 2008-12-10 13:01:23 +00:00
ichxrom.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
impa7.c [MTD] Make init_impa7 static 2008-12-10 13:01:32 +00:00
integrator-flash.c mtd: maps: Remove BUS_ID_SIZE from integrator_flash 2009-06-24 16:02:06 +01:00
intel_vr_nor.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ixp4xx.c drivers/mtd: Use kzalloc 2010-05-13 21:23:06 +01:00
ixp2000.c drivers/mtd: Use kzalloc 2010-05-13 21:23:06 +01:00
l440gx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
map_funcs.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mbx860.c [MTD] Make init_mbx function static 2008-12-10 13:01:20 +00:00
netsc520.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
nettel.c [MTD] [MAPS] Fix printk format warning in nettel.c 2009-01-09 14:17:50 +00:00
octagon-5066.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pci.c [MTD] [MAPS] Remove unused variable after ROM API cleanup. 2008-10-14 11:00:51 +01:00
pcmciamtd.c pcmcia: use struct resource for PCMCIA devices, part 2 2010-08-03 09:04:16 +02:00
physmap.c mtd/maps/physmap: catch failure to register MTD_PHYSMAP_COMPAT device 2010-04-20 08:53:52 +01:00
physmap_of.c Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
pismo.c i2c: Remove all i2c_set_clientdata(client, NULL) in drivers 2010-06-03 11:33:58 +02:00
plat-ram.c Fix spelling of 'platform' in comments and doc 2010-02-05 12:22:34 +01:00
pmcmsp-flash.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pxa2xx-flash.c drivers/mtd: Use kzalloc 2010-05-13 21:23:06 +01:00
rbtx4939-flash.c [MTD] Remove mtd->{suspend,resume} calls from board drivers 2009-05-26 16:45:44 +01:00
redwood.c Remove REDWOOD_[456] config options and conditional code 2010-07-26 09:06:04 -04:00
rpxlite.c [MTD] Make init_rpxlite function static 2008-12-10 13:00:43 +00:00
sa1100-flash.c ARM: Fix warning in sa1100-flash.c 2009-11-16 16:13:35 +00:00
sbc_gxx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
sc520cdp.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
scb2_flash.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
scx200_docflash.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 of/platform: remove all of_bus_type and of_platform_bus_type references 2010-07-24 09:57:52 -06:00
tqm8xxl.c [MTD] Make init_tqm_mtd function static 2008-12-10 13:00:37 +00: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 mtd/maps: uclinux: fix building when partition support is disabled 2009-09-19 11:44:51 -07:00
vmax301.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
vmu-flash.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
wr_sbc82xx_flash.c [MTD] Make init_sbc82xx_flash function static 2008-12-10 13:00:47 +00:00