diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:24:12 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 23:24:12 +0100 |
commit | d00ab2fdd4dc4361c97777bc1fef7234329d4659 (patch) | |
tree | b8d8f98c1af633bbc1570b4270b39727737beebf /usr/initramfs_data.S | |
parent | 88f502fedba82eff252b6420e8b8328e4ae25c67 (diff) | |
parent | 7c730ccdc1188b97f5c8cb690906242c7ed75c22 (diff) | |
download | linux-d00ab2fdd4dc4361c97777bc1fef7234329d4659.tar.gz |
Merge branch 'linus' into core/futexes
Diffstat (limited to 'usr/initramfs_data.S')
-rw-r--r-- | usr/initramfs_data.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S index c2e1ad424f4a..7c6973d8d829 100644 --- a/usr/initramfs_data.S +++ b/usr/initramfs_data.S @@ -26,5 +26,5 @@ SECTIONS */ .section .init.ramfs,"a" -.incbin "usr/initramfs_data.cpio.gz" +.incbin "usr/initramfs_data.cpio" |