diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-15 03:28:08 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-15 03:28:08 +0400 |
| commit | 179c0ac67b9d947d2de69e9f08a743e7c74a8dce (patch) | |
| tree | 3f3e22af02df6d8e685fb8aa89731f3746306e35 /drivers/nfc/pn544/mei.c | |
| parent | ad15afb8b9e80bec6c4337369f63207ff59c44ae (diff) | |
| parent | 10cf15e1d1289aa0bf1d26e9f55176b4c7c5c512 (diff) | |
| download | linux-179c0ac67b9d947d2de69e9f08a743e7c74a8dce.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull Sparc fixes from David Miller:
"Hook up the memfd syscall, and properly claim all PCI resources
discovered when building the PCI device tree"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc: Hook up memfd_create system call.
sparc64: Properly claim resources as each PCI bus is probed.
sparc64: Skip bogus PCI bridge ranges.
sparc64: Expand PCI bridge probing debug logging.
Diffstat (limited to 'drivers/nfc/pn544/mei.c')
0 files changed, 0 insertions, 0 deletions