kernel_optimize_test/arch/arm/plat-s3c
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
..
include Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
clock.c ARM: S3C: Fix Simtec copyright statements in Documentation/S3C24XX 2009-12-01 01:33:50 +00:00
dev-fb.c
dev-hsmmc1.c
dev-hsmmc2.c ARM: Merge next-s3c64xx-updates 2009-12-03 21:53:10 +00:00
dev-hsmmc.c
dev-i2c0.c ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
dev-i2c1.c ARM: S3C: Update Simtec copyright statements from , to - 2009-12-01 01:33:51 +00:00
dev-nand.c ARM: S3C: Add NAND device platform data set call 2009-12-01 01:34:16 +00:00
dev-usb-hsotg.c [ARM] S3C: Add USB high-speed/OtG device definitions 2009-05-16 22:13:52 +01:00
dev-usb.c
dma.c ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
gpio-config.c [ARM] S3C: Fix gpio-config off-by-one bug 2009-06-22 14:12:39 +01:00
gpio.c ARM: s3c: fix check of index into s3c_gpios[] 2009-09-19 12:14:06 +01:00
init.c
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2009-12-09 19:43:33 -08:00
Makefile ARM: S3C64XX: add HSMMC2 support 2009-12-01 01:35:41 +00:00
pm-check.c ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
pm-gpio.c [ARM] S3C: GPIO PM core GPIOlib integration 2009-05-07 11:04:56 +01:00
pm.c ARM: S3C: Update Simtec copyright statements from , to - [2] 2009-12-01 01:33:51 +00:00
pwm-clock.c
pwm.c ARM: S3C: move s3c_pwm_remove to .devexit.text 2009-12-08 00:45:55 +00:00
time.c