David S. Miller 56c5d900db Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	sound/core/memalloc.c

2008-10-11 12:39:35 -07:00

..

chips

…

devices

…

maps

sparc: Annotate of_device_id arrays with const or __initdata.

2008-08-31 01:23:17 -07:00

nand

Merge branch 'pxa-all' into devel

2008-10-09 21:33:02 +01:00

onenand

…

ubi

…

afs.c

…

ar7part.c

…

cmdlinepart.c

…

ftl.c

Support 'discard sectors' operation.

2008-10-09 08:56:01 +02:00

inftlcore.c

…

inftlmount.c

…

Kconfig

…

Makefile

…

mtd_blkdevs.c

Support 'discard sectors' operation in translation layer support core

2008-10-09 08:56:01 +02:00

mtdblock_ro.c

…

mtdblock.c

…

mtdchar.c

[MTD] mtdchar.c: Fix regression in MEMGETREGIONINFO ioctl()

2008-09-02 09:29:05 +01:00

mtdconcat.c

…

mtdcore.c

…

mtdcore.h

…

mtdoops.c

…

mtdpart.c

…

mtdsuper.c

[MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c

2008-08-02 07:52:39 +01:00

nftlcore.c

…

nftlmount.c

…

ofpart.c

…

redboot.c

…

rfd_ftl.c

…

ssfdc.c

…