AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity
0f4bd46ec2
kernel_optimize_test/drivers/mtd/maps
History
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6 
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -08:00
..
alchemy-flash.c [MTD] Make alchemy_mtd_init function static 2008-12-10 13:01:10 +00:00
amd76xrom.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00: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 Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
cdb89712.c [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants 2008-11-13 15:05:03 +00:00
ceiva.c Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
cfi_flagadm.c [MTD] Make init_flagadm function static 2008-12-10 13:01:00 +00:00
ck804xrom.c [MTD] [MAPS] Remove MODULE_DEVICE_TABLE() from ck804rom driver. 2009-02-27 04:52:45 +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 [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
fortunet.c [MTD] Make init_fortunet function static 2008-12-10 13:01:13 +00:00
gpio-addr-flash.c mtd/maps: gpio-addr-flash: pull in linux/ headers rather than asm/ 2009-09-24 12:50:32 -07:00
h720x-flash.c [MTD] Make h720x_mtd_init function static 2008-12-10 13:01:23 +00:00
ichxrom.c [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00: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 [MTD] map driver for NOR flash on the Intel Vermilion Range chipset 2007-09-23 18:51:25 +01:00
ixp4xx.c mtd: ixp4xx map: use resource_size 2009-11-30 09:47:24 +00:00
ixp2000.c trivial: fix typo "to to" in multiple files 2009-09-21 15:14:55 +02:00
Kconfig Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
l440gx.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
Makefile Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08: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 [MTD] Make init_oct5066 function static 2008-12-10 13:00:56 +00:00
omap_nor.c omap: headers: Move remaining headers from include/mach to include/plat 2009-10-20 09:40:47 -07:00
pci.c [MTD] [MAPS] Remove unused variable after ROM API cleanup. 2008-10-14 11:00:51 +01:00
pcmciamtd.c pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer 2009-11-28 18:02:58 +01:00
physmap_of.c mtd: maps: add mtd-ram support to physmap_of 2009-09-19 13:15:26 -07:00
physmap.c mtd: error return -EIO instead of EIO 2009-11-30 09:51:44 +00:00
plat-ram.c mtd: plat-ram: use resource_size 2009-09-04 09:37:34 +01:00
pmcmsp-flash.c mtd: pmcmsp-flash: fix error paths in init_msp_flash 2009-09-04 09:42:06 +01:00
pxa2xx-flash.c Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
rbtx4939-flash.c [MTD] Remove mtd->{suspend,resume} calls from board drivers 2009-05-26 16:45:44 +01:00
redwood.c [MTD] Make init_redwood_flash function static 2008-12-10 13:01:29 +00: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 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] 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 sparc: Annotate of_device_id arrays with const or __initdata. 2008-08-31 01:23:17 -07: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 [MTD] Make the function init_vmax301 static 2008-12-10 13:01:17 +00:00
vmu-flash.c mtd: error return -EIO instead of EIO 2009-11-30 09:51:44 +00:00
wr_sbc82xx_flash.c [MTD] Make init_sbc82xx_flash function static 2008-12-10 13:00:47 +00:00