aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-15 16:32:47 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-15 16:32:47 +0000
commit9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch)
treedcb8a23b0245d3d4d2719d7ea987f7eee608c553 /drivers/mtd/nand/Kconfig
parent9b963f32c38b4c7d2da667e4458967b550f30bee (diff)
parentb0b6ff0b21057bb8e58b0be8b427a4713fd4b5a5 (diff)
downloadkernel_samsung_smdk4412-9ced9f03d12d7539e86b0bff5bc750153c976c34.zip
kernel_samsung_smdk4412-9ced9f03d12d7539e86b0bff5bc750153c976c34.tar.gz
kernel_samsung_smdk4412-9ced9f03d12d7539e86b0bff5bc750153c976c34.tar.bz2
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts: arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/mtd/nand/Kconfig')
0 files changed, 0 insertions, 0 deletions