kernel-ark/drivers/mtd/nand
Linus Torvalds 411f5c7a50 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig
2011-03-17 19:08:06 -07:00
..
alauda.c
ams-delta.c mtd: nand: ams-delta: drop omap_read/write, use ioremap 2011-01-06 15:28:22 +00:00
atmel_nand_ecc.h
atmel_nand.c
au1550nd.c
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c
bf5xx_nand.c mtd: Blackfin NFC: fix badblock location with BootROM OOB 2010-10-25 01:15:22 +01:00
cafe_nand.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
cmx270_nand.c
cs553x_nand.c
davinci_nand.c Merge git://git.infradead.org/mtd-2.6 2010-10-30 08:31:35 -07:00
denali.c mtd: nand: denali should also handle NAND_CMD_PARAM 2010-10-24 23:45:05 +01:00
denali.h
diskonchip.c
edb7312.c
fsl_elbc_nand.c mtd: fsl_elbc_nand: fix jffs2 problem after NAND-flash image record in u-boot 2010-12-03 16:34:24 +00:00
fsl_upm.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
fsmc_nand.c mtd: FSMC NAND use the PrimeCell identifier macros 2010-12-03 16:35:30 +00:00
gpio.c
h1910.c
jz4740_nand.c mtd: NAND: jz4740: Remove custom {read,write}_page handlers 2010-12-03 16:29:45 +00:00
Kconfig ARM: imx5x: clean up ARCH_MX5X 2011-03-07 19:29:42 +01:00
Makefile mtd: generic FSMC NAND MTD driver 2010-10-25 00:33:48 +01:00
mpc5121_nfc.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
mxc_nand.c mtd: mxc_nand: Fix warning on nr_parts unused variable 2010-12-03 16:34:41 +00:00
nand_base.c Merge git://git.infradead.org/mtd-2.6 2011-01-17 11:15:30 -08:00
nand_bbt.c mtd: fix nand kernel-doc warnings 2010-12-03 16:31:24 +00:00
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c
nand_ids.c mtd: nand: support new Toshiba SLC 2010-10-24 23:38:30 +01:00
nandsim.c mtd: use vzalloc 2010-12-03 16:27:29 +00:00
ndfc.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
nomadik_nand.c
nuc900_nand.c
omap2.c mtd: add "platform:" prefix for platform modalias 2011-03-11 14:20:05 +00:00
orion_nand.c
pasemi_nand.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
plat_nand.c gen_nand: Test if nr_chips field is valid 2010-08-12 12:17:36 +01:00
ppchameleonevb.c
pxa3xx_nand.c mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe 2011-01-06 15:48:59 +00:00
r852.c workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable' 2011-02-16 17:48:59 +01:00
r852.h mtd: r852: remove useless pci powerup/down from suspend/resume routines 2010-10-25 01:32:21 +01:00
rtc_from4.c
s3c2410.c
sh_flctl.c
sharpsl.c
sm_common.c
sm_common.h
socrates_nand.c dt: Eliminate of_platform_{,un}register_driver 2011-02-28 13:22:46 -07:00
spia.c
tmio_nand.c
txx9ndfmc.c mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max) 2011-01-06 15:29:12 +00:00