]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Mar 2013 01:25:20 +0000 (18:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Mar 2013 01:25:20 +0000 (18:25 -0700)
Pull vfio fix from Alex Williamson.

* tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio:
  vfio: include <linux/slab.h> for kmalloc


Trivial merge