]> www.infradead.org Git - users/jedix/linux-maple.git/commit
projects / users / jedix / linux-maple.git / commit
summary | shortlog | log | commit | commitdiff | tree
(parent: 7176b41) | patch
xen/gntdev: Fix merge error.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 11 May 2012 20:29:09 +0000 (16:29 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 11 May 2012 20:29:09 +0000 (16:29 -0400)
commit1a51296a1b150b58240a8f34f313add1488161da
tree6d3f37723a023a6a81e896470254ea5ed2579431tree
parent7176b411e3b21919c286e26ea1c0a235c3665e04commit | diff
xen/gntdev: Fix merge error.

Somehow a merge error ensued were an important part of
 "xen/gnt{dev,alloc}: reserve event channels for notify"
went missing. Fortunatly for us we aren't using this driver yet.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/xen/gntdev.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.