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

ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h

2011-08-08 14:27:44 +01:00

atmel_nand_ecc.h

…

atmel_nand.c

mtd: atmel_nand: optimize read/write buffer functions

2011-09-11 15:02:15 +03:00

au1550nd.c

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

autcpu12.c

mtd: nand: rename NAND_USE_FLASH_BBT

2011-09-11 15:01:56 +03:00

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

mtd: bf5xx_nand: convert to mtd_device_register()

2011-05-25 02:23:15 +01:00

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

mtd: cs553x_nand.c: use mtd_device_parse_register

2011-09-11 15:02:08 +03:00

davinci_nand.c

mtd: davinci_nand.c: use mtd_device_parse_register

2011-09-11 15:02:08 +03:00

denali.c

mtd: denali: detect the number of banks before resetting NAND

2011-09-11 15:02:04 +03:00

denali.h

mtd: denali: detect the number of banks

2011-05-25 02:02:12 +01:00

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

mtd: fsl_upm: fix a memory leak in fun_chip_init error path

2011-09-11 15:02:14 +03:00

fsmc_nand.c

mtd: fsmc_nand.c: use mtd_device_parse_register

2011-09-11 15:02:08 +03:00

gpio.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

h1910.c

mtd: h1910.c: use mtd_device_parse_register

2011-09-11 15:02:08 +03:00

jz4740_nand.c

mtd: jz4740_nand.c: use mtd_device_parse_register

2011-09-11 15:02:08 +03:00

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

mtd: mpc5121_nfc.c: use mtd_device_parse_register

2011-09-11 15:02:12 +03:00

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

mtd: spelling, capitalization, uniformity

2011-09-11 15:02:13 +03:00

nand_ids.c

mtd: nand: support new Toshiba SLC

2010-10-24 23:38:30 +01:00

nandsim.c

mtd: nand: rename NAND_USE_FLASH_BBT

2011-09-11 15:01:56 +03:00

ndfc.c

mtd: ndfc: fix typo in structure dereference

2011-12-02 16:27:03 +00:00

nomadik_nand.c

mtd: nomadik_nand: add missing nand_release in nomadik_nand_remove

2011-09-11 15:01:59 +03:00

nuc900_nand.c

mtd: nuc900_nand: add missing nand_release in nuc900_nand_remove

2011-09-11 15:01:58 +03:00

omap2.c

Merge git://git.infradead.org/mtd-2.6

2011-11-07 09:11:16 -08:00

orion_nand.c

mtd: orion_nand.c: use mtd_device_parse_register

2011-09-11 15:02:09 +03:00

pasemi_nand.c

mtd: nand: rename NAND_USE_FLASH_BBT

2011-09-11 15:01:56 +03:00

plat_nand.c

mtd: plat_nand.c: use mtd_device_parse_register

2011-09-11 15:02:09 +03:00

ppchameleonevb.c

mtd: ppchameleonevb.c: use mtd_device_parse_register

2011-09-11 15:02:09 +03:00

pxa3xx_nand.c

mtd: pxa3xx_nand: enable multiple chip select support

2011-09-11 15:02:15 +03:00

r852.c

mtd: r852: make r852_pm_ops static

2011-10-01 14:40:56 +03: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

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

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

sharpsl.c

mtd: sharpsl.c: use mtd_device_parse_register

2011-09-11 15:02:09 +03:00

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

mtd: socrates_nand.c: use mtd_device_parse_register

2011-09-11 15:02:13 +03:00

spia.c

mtd: convert remaining users to mtd_device_register()

2011-05-25 02:25:00 +01:00

tmio_nand.c

mtd: tmio_nand.c: use mtd_device_parse_register

2011-09-11 15:02:09 +03:00

txx9ndfmc.c

mtd: txx9ndfmc.c: use mtd_device_parse_register

2011-09-11 15:02:09 +03:00