Russell King 044e5f45e4 Merge branch 'pxa' into devel ...

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig

2008-07-13 12:05:49 +01:00

..

chips

[MTD][NOR] Add physical address to point() method

2008-05-01 18:59:11 +01:00

devices

[MTD] m25p80.c mutex unlock fix

2008-06-06 10:36:21 +01:00

maps

ARM: OMAP: Change omap_cf.c and omap_nor.c to use omap_readw/writew instead of __REG

2008-07-03 12:24:41 +03:00

nand

Merge branch 'pxa' into devel

2008-07-13 12:05:49 +01:00

onenand

[MTD] [MAPS] Fix cmdlineparse handling in mapping files

2008-06-05 07:51:13 +01:00

ubi

UBI: add a message

2008-04-23 11:32:10 +01:00

afs.c

[MTD] replace kmalloc+memset with kzalloc

2006-11-28 23:47:21 +00:00

ar7part.c

[MTD] Clean up AR7 partition map support

2008-04-23 09:39:49 +01:00

cmdlinepart.c

[MTD] cmdlinepart: Missing partition info is not an error

2008-04-22 19:10:15 +01:00

ftl.c

[MTD] ftl.c: make code static

2008-04-22 15:56:00 +01:00

inftlcore.c

[MTD] replace kmalloc+memset with kzalloc

2006-11-28 23:47:21 +00:00

inftlmount.c

[MTD] proper prototypes for inftl_{read,write}_oob()

2008-04-22 15:54:16 +01:00

Kconfig

[MTD] AR7 mtd partition map

2008-04-22 20:48:12 +01:00

Makefile

[MTD] AR7 mtd partition map

2008-04-22 20:48:12 +01:00

mtd_blkdevs.c

[MTD] Always initialise mutex in new mtd_blktrans_dev.

2007-12-03 12:46:12 +00:00

mtdblock_ro.c

[MTD] replace kmalloc+memset with kzalloc

2006-11-28 23:47:21 +00:00

mtdblock.c

[MTD] replace kmalloc+memset with kzalloc

2006-11-28 23:47:21 +00:00

mtdchar.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2008-02-03 18:30:32 +11:00

mtdconcat.c

[MTD] fix mtdconcat for subpage-write NAND

2007-10-14 13:38:02 +01:00

mtdcore.c

[MTD] Unlocking all Intel flash that is locked on power up.

2008-02-03 18:25:16 +11:00

mtdcore.h

[MTD] mtdcore.c: share syms with mtd_blkdev.c

2007-06-28 20:24:50 +01:00

mtdoops.c

[MTD] mtdoops.c: make struct oops_cxt static again

2008-04-22 12:35:34 +01:00

mtdpart.c

[MTD][NOR] Add physical address to point() method

2008-05-01 18:59:11 +01:00

mtdsuper.c

Introduce path_put()

2008-02-14 21:13:33 -08:00

nftlcore.c

PCI: Cleanup the includes of <linux/pci.h>

2007-05-02 19:02:35 -07:00

nftlmount.c

[MTD] proper prototypes for nftl_{read,write}_oob()

2008-04-22 15:54:29 +01:00

ofpart.c

[MTD] mtd/ofpart.c: add MODULE_LICENSE

2008-04-22 15:53:52 +01:00

redboot.c

Fix various old email addresses for dwmw2

2008-06-06 11:29:10 -07:00

rfd_ftl.c

[MTD] make struct rfd_ftl_tr static

2008-04-22 15:59:25 +01:00

ssfdc.c

[MTD] Fix ssfdc blksize typo

2006-12-11 09:43:38 +00:00