From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Oct 2014 21:43:42 +0000 (-0700)
Subject: Merge tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze
X-Git-Tag: v3.18-rc3~19
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9f58c62fcc66f06aee141fdd80d15213b7f4809a;p=people%2Fpauldu%2Flinux.git

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
---

9f58c62fcc66f06aee141fdd80d15213b7f4809a