summaryrefslogtreecommitdiffstats
path: root/init/do_mounts_initrd.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-02 23:31:07 +0000
commit64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (patch)
treea434977a6caa9b41cc0daaf71dbd76ac8693aba6 /init/do_mounts_initrd.c
parentb93a4afcff7be859e30cad2a305731516057d6cf (diff)
parent17ccb834d517c66c09123c24ba8553c5b14e0f78 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'init/do_mounts_initrd.c')
0 files changed, 0 insertions, 0 deletions