Merge remote-tracking branch 'fam/tags/for-upstream' into staging
commit51cd8ef8ad014675e93dda2ad55537bbb23c9648
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 29 Nov 2016 14:15:14 +0000 (29 14:15 +0000)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 29 Nov 2016 14:15:14 +0000 (29 14:15 +0000)
tree0abeac6185833b8cbcdc86292472fee042b6c3c0
parent38e532aa7430ddf5177ff32bc3bb5f115449b0ec
parent6725f887acc023fc8850d62e1aaef083fdb4f3d4
Merge remote-tracking branch 'fam/tags/for-upstream' into staging

# gpg: Signature made Tue 29 Nov 2016 10:33:34 AM GMT
# gpg:                using RSA key 0xCA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* fam/tags/for-upstream:
  hbitmap: Fix shifts of constants by granularity

Message-id: 20161129103438.15955-1-famz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>