aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 19:08:35 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 19:08:35 +0100
commitaf7c951d76708c61b862463d579d76be757130bf (patch)
treed047521fb2f8eafe92349ba4d6a66d6234886c87 /drivers/mtd
parentcc513ac0f29473de365664c4fba9cf033c1f2324 (diff)
parentebcce7b13be837616a3f9d996f637cf3241e3948 (diff)
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
Merge branch 'pxa-eseries' into pxa-machines Conflicts: arch/arm/mach-pxa/Makefile
Diffstat (limited to 'drivers/mtd')
0 files changed, 0 insertions, 0 deletions