Merge commit 'konrad/stable/xen-pcifront-0.8.2' into 2.6.36-rc8-initial-domain-v6
Stefano Stabellini [Fri, 22 Oct 2010 20:24:06 +0000 (21:24 +0100)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge