Merge branch 'topic/yinghai-hostbridge-cleanup' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 30 Apr 2012 22:55:58 +0000 (16:55 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 30 Apr 2012 22:55:58 +0000 (16:55 -0600)

Trivial merge