leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ff4b8a57f0
linux/drivers/mtd
History
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
..
chips mtd: cleanup style on pr_debug messages 2011-09-11 15:02:16 +03:00
devices mtd: clean up usage of MTD_DOCPROBE_ADDRESS 2011-10-30 14:22:36 +02:00
lpddr mtd: Add module.h to drivers users that were implicitly using it. 2011-10-31 19:31:12 -04:00
maps mtd: plat_ram: call mtd_device_register only if partition data exists 2011-12-19 11:13:52 +00:00
nand Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
onenand Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
tests mtd: tests: don't use mtd0 as a default 2011-10-30 14:31:04 +02:00
ubi Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
afs.c mtd: abstract last MTD partition parser argument 2011-09-11 15:02:10 +03:00
ar7part.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
cmdlinepart.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
ftl.c mtd: spelling fixes 2011-09-11 15:02:16 +03:00
inftlcore.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
inftlmount.c mtd: spelling fixes 2011-09-11 15:02:16 +03:00
Kconfig Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
Makefile mtd: make ofpart buildable as a separate module 2011-09-11 15:02:13 +03:00
mtd_blkdevs.c mtd: mark block device queue as non-rotational 2011-10-14 11:22:48 +03:00
mtdblock_ro.c mtd: Add module.h to drivers users that were implicitly using it. 2011-10-31 19:31:12 -04:00
mtdblock.c mtd: replace DEBUG() with pr_debug() 2011-09-11 15:02:16 +03:00
mtdchar.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
mtdconcat.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
mtdcore.c mtd: check parts pointer before using it 2011-09-11 15:02:18 +03:00
mtdcore.h mtd: hide parse_mtd_partitions 2011-09-11 15:02:13 +03:00
mtdoops.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
mtdpart.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
mtdsuper.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
mtdswap.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
nftlcore.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
nftlmount.c mtd: spelling fixes 2011-09-11 15:02:16 +03:00
ofpart.c mtd: ofpart: add ofoldpart alias 2011-09-11 15:02:14 +03:00
redboot.c Merge git://git.infradead.org/mtd-2.6 2011-11-07 09:11:16 -08:00
rfd_ftl.c mtd: Add module.h to drivers users that were implicitly using it. 2011-10-31 19:31:12 -04:00
sm_ftl.c mtd: utilize `mtd_is_*()' functions 2011-09-21 09:19:06 +03:00
sm_ftl.h mtd: sm_ftl: cosmetic, use bool when possible 2010-10-25 01:33:08 +01:00
ssfdc.c mtd: rename MTD_OOB_* to MTD_OPS_* 2011-09-11 15:28:59 +03:00