Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ...

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

2010-05-22 00:36:56 -06:00

..

chips

mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips

2010-05-20 16:57:00 +01:00

devices

mtd: sst25l: fix multi-part messages with broken spi masters

2010-05-14 01:52:24 +01:00

lpddr

drivers/mtd: Use kzalloc

2010-05-13 21:23:06 +01:00

maps

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

nand

Merge remote branch 'origin' into secretlab/next-devicetree

2010-05-22 00:36:56 -06:00

onenand

mtd: add Samsung SoC OneNAND driver

2010-05-14 01:51:20 +01:00

tests

drivers/mtd: Use kzalloc

2010-05-13 21:23:06 +01:00

ubi

UBI: misc comment fixes

2010-05-07 08:33:32 +03:00

afs.c

mtd: afs: fix build warning

2009-09-04 09:38:14 +01:00

ar7part.c

[MTD] mtdpart: Make all partition parsers return allocated array

2009-03-20 18:55:17 +00:00

cmdlinepart.c

mtd: cmdlineparts: Use 64-bit format when printing a debug message.

2009-06-25 08:18:12 +01:00

ftl.c

mtd: blktrans: Hotplug fixes

2010-02-26 17:05:26 +00:00

inftlcore.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-03-26 14:55:59 +00:00

inftlmount.c

mtd: inftl: misplaced parenthesis in find_boot_record

2010-02-26 13:22:07 +00:00

Kconfig

mtd: sm_ftl: remove CONFIG_SM_FTL_MUSEUM and make it always on

2010-03-26 15:28:59 +00:00

Makefile

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-10 14:32:46 +01:00

mtd_blkdevs.c

mtd: blktrans: do blk_cleanup_queue when it is really safe to do so

2010-03-08 18:57:42 -08:00

mtdblock_ro.c

mtd: mtdblock: test return value of add_mtd_blktrans_dev, because if can fail

2010-02-26 17:05:46 +00:00

mtdblock.c

mtd: Few follow up cleanups for Smartmedia/xD support

2010-02-26 20:13:49 +00:00

mtdchar.c

mtd: mtdchar: Do not corrupt backing device of device node inode

2010-05-18 12:19:36 +01:00

mtdconcat.c

drivers/mtd: Use kmemdup

2010-05-15 23:07:01 +01:00

mtdcore.c

mtd: update gfp/slab.h includes

2010-05-19 17:21:52 +01:00

mtdcore.h

mtd: Replace static array of devices with an idr structure

2010-02-25 11:55:14 +00:00

mtdoops.c

mtd: Remove unnecessary comparisons with MAX_MTD_DEVICES

2010-02-25 11:39:09 +00:00

mtdpart.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-20 05:55:36 -07:00

mtdsuper.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-10 14:32:46 +01:00

nftlcore.c

mtd: blktrans: Hotplug fixes

2010-02-26 17:05:26 +00:00

nftlmount.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

ofpart.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

redboot.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-11 14:36:25 +01:00

rfd_ftl.c

mtd: blktrans: Hotplug fixes

2010-02-26 17:05:26 +00:00

sm_ftl.c

bitops: rename for_each_bit() to for_each_set_bit(): mtd

2010-04-08 09:42:41 +01:00

sm_ftl.h

mtd: Add new SmartMedia/xD FTL

2010-02-26 19:06:50 +00:00

ssfdc.c

mtd: blktrans: Hotplug fixes

2010-02-26 17:05:26 +00:00