]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 16:19:38 +0000 (09:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 May 2016 16:19:38 +0000 (09:19 -0700)
Pull Microblaze updates from Michal Simek:

 - Wire-up new syscalls

 - Fix link error

* tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: pci: export isa_io_base to fix link errors
  microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls


Trivial merge