From: Blue Swirl Date: Sat, 6 Apr 2013 12:53:54 +0000 (+0000) Subject: Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~900^2~59^2~431 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9196dd411d580c27f85daa209ff9a501d719ebc0;p=sdk%2Femulator%2Fqemu.git Merge branch 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm * 'arm-devs.next' of git://git.linaro.org/people/pmaydell/qemu-arm: hw/nand.c: Fix nand erase operation cadence_uart: Flush queued characters on reset pl330: Don't inhibit ES bits on INTEN pflash_cfi01: Implement migration support pflash_cfi01: Drop unused 'bypass' field hw/arm_gic_common: Use vmstate struct rather than save/load functions arm_gic: Fix sizes of state fields in preparation for vmstate support vmstate: Add support for two dimensional arrays hw/onenand.c: fix migration of dynamically allocated buffer "otp" hw/sd.c: fix migration of dynamically allocated buffer "buf" vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro hw/arm_mptimer: Save the timer state pl050: Don't send always-constant is_mouse field hw/arm/nseries: don't print to stdout or stderr --- 9196dd411d580c27f85daa209ff9a501d719ebc0