Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 ... This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file, and it fixes the build error in the arch/x86/kernel/microcode_core.c file, that the merge did not catch. The microcode_core.c patch was provided by Stephen Rothwell <sfr@canb.auug.org.au> who was invaluable in the merge issues involved with the large sysdev removal process in the driver-core tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>		2012-01-06 11:42:52 -08:00
..
gpmi-nand	mtd: gpmi: add missing include 'module.h'	2011-12-05 11:37:54 +00:00
alauda.c	USB: convert some miscellanies drivers to use module_usb_driver()	2011-11-18 09:52:10 -08:00
ams-delta.c
atmel_nand.c
atmel_nand_ecc.h
au1550nd.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c	mtd: bcm_umi_nand: clean up error handling code	2011-09-11 15:02:17 +03:00
bf5xx_nand.c
cafe_nand.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
cmx270_nand.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
cs553x_nand.c
davinci_nand.c
denali.c
denali.h
diskonchip.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
fsl_elbc_nand.c	mtd: eLBC NAND: update ecc_stats.corrected when lteccr available	2011-09-11 15:02:17 +03:00
fsl_upm.c
fsmc_nand.c
gpio.c
h1910.c
jz4740_nand.c
Kconfig	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
Makefile	mtd: add GPMI-NAND driver in the config and Makefile	2011-09-11 15:02:18 +03:00
mpc5121_nfc.c
mxc_nand.c	mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks	2011-09-23 15:25:35 +03:00
nand_base.c	mtd: nand: initialize ops.mode	2011-10-16 15:04:00 +03:00
nand_bbt.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
nand_bch.c	mtd: cleanup style on pr_debug messages	2011-09-11 15:02:16 +03:00
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c
nand_ids.c
nandsim.c
ndfc.c	mtd: ndfc: fix typo in structure dereference	2011-12-02 16:27:03 +00:00
nomadik_nand.c
nuc900_nand.c
omap2.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
orion_nand.c
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c
r852.c	mtd: r852: make r852_pm_ops static	2011-10-01 14:40:56 +03:00
r852.h
rtc_from4.c	mtd: replace DEBUG() with pr_debug()	2011-09-11 15:02:16 +03:00
s3c2410.c	mtd: s3c2410 nand: Remove uncessary null check	2011-09-11 15:02:17 +03:00
sh_flctl.c
sharpsl.c
sm_common.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
sm_common.h
socrates_nand.c
spia.c
tmio_nand.c
txx9ndfmc.c