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)
commit2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a
treea15c29a0a0fd2c7b4c4b05bbd299c5cc2edd16f6
parentea4a0ce11160200410abbabd44ec9e75e93a95be
parent25e9789ddd9d14a8971f4a421d04f282719ab733
Merge tag 'vfio-v3.9-rc4' of git://github.com/awilliam/linux-vfio

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