Merge remote-tracking branch 'origin/master' into staging
commitcb4c2548ea7cceef7260465773c6b8e634c186d4
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 19:15:09 +0000 (23 14:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Apr 2012 19:15:09 +0000 (23 14:15 -0500)
treeab595ffdb87a6188dd85623938446ff88b79c229
parent5469963394eba2df7c0a093a3792dc82e060cd65
parent02f5da11d694df75af454205d8d81ac73dea50f0
Merge remote-tracking branch 'origin/master' into staging

* origin/master:
  fix BCD mask for date (Solaris 2.5 guest hang fix)