Merge tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Oct 2014 21:43:42 +0000 (14:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Oct 2014 21:43:42 +0000 (14:43 -0700)
commit9f58c62fcc66f06aee141fdd80d15213b7f4809a
treed794c0c65f662b8fdab41e3586b968666463bbbe
parent19e0d5f16ad9759d92f5739b53acdebfe22fa2a2
parenta4f174dee4ae842e07cab7eeec194a3e60925c8d
Merge tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze

Pull Microblaze updates from Michal Simek:
 - wire-up new bpf syscall
 - fix PCI bug
 - fix Kconfig warning

* tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Wire up bpf syscall
  microblaze: Fix IO space breakage after of_pci_range_to_resource() change
  microblaze: Fix missing NR_CPUS in menuconfig