OSDN Git Service

Update prebuilt emulator kernel
authorDima Zavin <dima@android.com>
Mon, 15 Jun 2009 21:01:27 +0000 (14:01 -0700)
committerDima Zavin <dima@android.com>
Mon, 15 Jun 2009 21:01:27 +0000 (14:01 -0700)
commitb9ff3b864846e0a3b56099b324a4c13649cbd569
tree24e85cad082b2da3d99cb4db784c877a7a8a5a70
parentb101944950cd53bf1b6352be998a44b9cb300abf
Update prebuilt emulator kernel

commit b10edef14984cc56182d8014815a4e47518c2cdc
Merge: a4ae495 7620ea5
Author: Dima Zavin <dima@android.com>
Date:   Mon Jun 15 13:36:58 2009 -0700

    Merge branch 'android-2.6.29' into android-goldfish-2.6.29

    Conflicts:
        drivers/misc/Kconfig
android-arm/kernel/kernel-qemu
android-arm/kernel/vmlinux-qemu