]> xenbits.xen.org Git - xenclient/linux-2.6.27-pq.git/commit
Merge branch 'master' of git://git.uk.xensource.com/xenclient/linux-2.6.27-pq
authorJean Guyader <jean.guyader@eu.citrix.com>
Fri, 6 Nov 2009 14:09:04 +0000 (14:09 +0000)
committerJean Guyader <jean.guyader@eu.citrix.com>
Fri, 6 Nov 2009 14:13:34 +0000 (14:13 +0000)
commit35ad56964466cce975b3df16e9edbc951878109d
treeafd9bd9613f5f22a464f1743aa4fa4c6c0f70910
parent4a2a09c8fb3a2b84d55fef59e42dadb7f098f890
parent5dd7ec9bfa13fac16716899a0591e332a9f1153c
Merge branch 'master' of git://git.uk.xensource.com/xenclient/linux-2.6.27-pq

Conflicts:

master/v2v-dev
master/v2v-dev