Merge commit '3e6ba503400c34cbe0f9ad6e289921688bf303a3' into upstream-merge
commitb45995771e55dd9bb13ea03340265bed9ccbaad2
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 6 Nov 2009 12:33:46 +0000 (6 10:33 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Fri, 6 Nov 2009 12:33:46 +0000 (6 10:33 -0200)
tree098f63b97644f7957e62da759efc87eb6a1f0407
parentfdb6f2c35e5c39064b4c353769614e7b6974f0f2
parent3e6ba503400c34cbe0f9ad6e289921688bf303a3
Merge commit '3e6ba503400c34cbe0f9ad6e289921688bf303a3' into upstream-merge

* commit '3e6ba503400c34cbe0f9ad6e289921688bf303a3':
  Sparc: fix carry flag handling (Solaris bootblk fix)
  hw/sd: Support SDHC size cards

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>