summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authormaximilian attems <maks@debian.org>2010-07-09 17:26:06 +0200
committermaximilian attems <maks@debian.org>2010-07-09 17:27:33 +0200
commit6fa6a6b9ce1492caedb621c1bcfd5d3735c218e9 (patch)
treeb6bda80d6b3c040750e508f5c8eabb45d53db3b8 /init
parentb65a48670ef4ec22dd7801ad377ce19741f2387a (diff)
parentd78e243c8f73a16a307579c6df7683af6db8227a (diff)
downloadinitramfs-tools-6fa6a6b9ce1492caedb621c1bcfd5d3735c218e9.tar.gz
initramfs-tools-6fa6a6b9ce1492caedb621c1bcfd5d3735c218e9.zip
Merge branch 'sid'
Conflicts: mkinitramfs scripts/functions
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions