]> xenbits.xen.org Git - xenclient/ioemu-pq.git/commit
Merge branch 'master' of git://git.uk.xensource.com/xenclient/ioemu-pq
authorAlexandre Bique <alexandre.bique@citrix.com>
Tue, 4 Aug 2009 11:20:54 +0000 (11:20 +0000)
committerAlexandre Bique <alexandre.bique@citrix.com>
Tue, 4 Aug 2009 11:20:54 +0000 (11:20 +0000)
commit8dfa53dddcd4db1da071a3005d6e07bea62d800b
tree991d92b085cb728b259bb00fd678c6beb3d2e220
parent101d16ac6d29fe148916f4c1afe9af65e7e86d69
parentfc8517eeb41d541ae4d885c5a2d453fcc23da587
Merge branch 'master' of git://git.uk.xensource.com/xenclient/ioemu-pq

Conflicts:

master/series
master/series
master/status