| commit | 41f5b1c0157408777bf58e514fb7f7e324413eac | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Thu Aug 27 22:56:25 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 27 22:56:25 2015 +0000 |
| tree | 8000fb756cd3ece996fd986ce1b36ac2586f6f40 | |
| parent | 7956af2a0bedd945644b8600f438a4dbf6668134 [diff] | |
| parent | fa62b6f544032745bf66552a51b889f9bb0b42f4 [diff] |
Merge "Upgrade 3.4 kernel images to b1dfee2" automerge: c2b08d6 automerge: fa62b6f * commit 'fa62b6f544032745bf66552a51b889f9bb0b42f4':
diff --git a/arm/kernel-qemu-armv7 b/arm/kernel-qemu-armv7 index 18738e9..779a2bc 100755 --- a/arm/kernel-qemu-armv7 +++ b/arm/kernel-qemu-armv7 Binary files differ
diff --git a/arm/vmlinux-qemu-armv7 b/arm/vmlinux-qemu-armv7 index 79ade59..c635999 100755 --- a/arm/vmlinux-qemu-armv7 +++ b/arm/vmlinux-qemu-armv7 Binary files differ
diff --git a/arm64/kernel-qemu b/arm64/kernel-qemu index 3726515..7271265 100755 --- a/arm64/kernel-qemu +++ b/arm64/kernel-qemu Binary files differ
diff --git a/arm64/vmlinux-qemu b/arm64/vmlinux-qemu index 3580f67..2f0e7fe 100755 --- a/arm64/vmlinux-qemu +++ b/arm64/vmlinux-qemu Binary files differ
diff --git a/mips/kernel-qemu b/mips/kernel-qemu index 54aee01..2c3185e 100755 --- a/mips/kernel-qemu +++ b/mips/kernel-qemu Binary files differ
diff --git a/mips/vmlinux-qemu b/mips/vmlinux-qemu index 54aee01..2c3185e 100755 --- a/mips/vmlinux-qemu +++ b/mips/vmlinux-qemu Binary files differ
diff --git a/mips64/kernel-qemu b/mips64/kernel-qemu index 95f2502..4291a80 100755 --- a/mips64/kernel-qemu +++ b/mips64/kernel-qemu Binary files differ
diff --git a/mips64/vmlinux-qemu b/mips64/vmlinux-qemu index 95f2502..4291a80 100755 --- a/mips64/vmlinux-qemu +++ b/mips64/vmlinux-qemu Binary files differ
diff --git a/x86/kernel-qemu b/x86/kernel-qemu index 731664c..b026196 100644 --- a/x86/kernel-qemu +++ b/x86/kernel-qemu Binary files differ
diff --git a/x86/pc-bios/bios-256k.bin b/x86/pc-bios/bios-256k.bin deleted file mode 100644 index fab9da2..0000000 --- a/x86/pc-bios/bios-256k.bin +++ /dev/null Binary files differ
diff --git a/x86/pc-bios/bios.bin b/x86/pc-bios/bios.bin index ed9b8f7..1281f42 100644 --- a/x86/pc-bios/bios.bin +++ b/x86/pc-bios/bios.bin Binary files differ
diff --git a/x86/pc-bios/efi-virtio.rom b/x86/pc-bios/efi-virtio.rom deleted file mode 100644 index 935c927..0000000 --- a/x86/pc-bios/efi-virtio.rom +++ /dev/null Binary files differ
diff --git a/x86/pc-bios/kvmvapic.bin b/x86/pc-bios/kvmvapic.bin deleted file mode 100644 index 045f5c2..0000000 --- a/x86/pc-bios/kvmvapic.bin +++ /dev/null Binary files differ
diff --git a/x86/pc-bios/linuxboot.bin b/x86/pc-bios/linuxboot.bin deleted file mode 100644 index 130103f..0000000 --- a/x86/pc-bios/linuxboot.bin +++ /dev/null Binary files differ
diff --git a/x86/vmlinux-qemu b/x86/vmlinux-qemu index 41ad543..4ff4a7b 100755 --- a/x86/vmlinux-qemu +++ b/x86/vmlinux-qemu Binary files differ
diff --git a/x86_64/kernel-qemu b/x86_64/kernel-qemu index 6bc7208..fd583f4 100644 --- a/x86_64/kernel-qemu +++ b/x86_64/kernel-qemu Binary files differ
diff --git a/x86_64/vmlinux-qemu b/x86_64/vmlinux-qemu index a2f0f7b..c1fcd79 100755 --- a/x86_64/vmlinux-qemu +++ b/x86_64/vmlinux-qemu Binary files differ