]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'kraxel/build.1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 Jan 2013 19:26:31 +0000 (13:26 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 10 Jan 2013 19:26:31 +0000 (13:26 -0600)
commita6308bc2224db238e72c570482717b68246a7ce0
tree28ef7fd1a4d7a4f6ea3ed3037e54eafeeb1aa7da
parent8757c09f15dcd455f81b4faed73da0d35d7e6b53
parent067f0691277325dcce8401534d2ffc6164305021
Merge remote-tracking branch 'kraxel/build.1' into staging

* kraxel/build.1:
  m48t59-test: don't touch watchdog
  rtc-test: skip year-2038 overflow check in case time_t is 32bit only

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>