diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 17:12:53 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-09 17:12:53 -0700 |
| commit | 573e21e410934f2293d5ac4c738af5f77083b43b (patch) | |
| tree | 006a2586447b7f2e9353556f74633db605436777 /debian/initramfs-tools.examples | |
| parent | 0de1ad17c333d645774ac3b48d652ccd4ecd6900 (diff) | |
| parent | 7a6f9e972def00f7f0435d9f2616bcb79dc619b7 (diff) | |
| download | initramfs-tools-573e21e410934f2293d5ac4c738af5f77083b43b.tar.gz initramfs-tools-573e21e410934f2293d5ac4c738af5f77083b43b.zip | |
Merge branch 'upstream' (0.98.2) into mendocino
Conflicts:
debian/changelog
debian/compat
debian/control
debian/rules
hook-functions
mkinitramfs
Diffstat (limited to 'debian/initramfs-tools.examples')
| -rw-r--r-- | debian/initramfs-tools.examples | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/initramfs-tools.examples b/debian/initramfs-tools.examples index 9f67297..bb28943 100644 --- a/debian/initramfs-tools.examples +++ b/debian/initramfs-tools.examples @@ -1,4 +1,4 @@ conf/modules docs/example_script docs/example_hook -docs/example_hook_cpiogz +docs/framebuffer |