Merge branch 'stable/for-jens-3.2' of git://oss.oracle.com/git/kwilk/xen into for...
authorJens Axboe <axboe@kernel.dk>
Thu, 20 Oct 2011 13:10:59 +0000 (15:10 +0200)
committerJens Axboe <axboe@kernel.dk>
Thu, 20 Oct 2011 13:10:59 +0000 (15:10 +0200)

Trivial merge