diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 18:25:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-19 18:25:20 -0700 |
| commit | 2ffdd7e23cde5a8b94d41ec0adfdd58cffe67f3a (patch) | |
| tree | a15c29a0a0fd2c7b4c4b05bbd299c5cc2edd16f6 /net/nfc/llcp | |
| parent | ea4a0ce11160200410abbabd44ec9e75e93a95be (diff) | |
| parent | 25e9789ddd9d14a8971f4a421d04f282719ab733 (diff) | |
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
Diffstat (limited to 'net/nfc/llcp')
0 files changed, 0 insertions, 0 deletions