]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branches 'video' and 'video-edid' into release
authorLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:18:12 +0000 (16:18 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:18:12 +0000 (16:18 -0400)

Trivial merge