commit | 9f58c62fcc66f06aee141fdd80d15213b7f4809a | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 31 14:43:42 2014 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 31 14:43:42 2014 -0700 |
tree | d794c0c65f662b8fdab41e3586b968666463bbbe | |
parent | 19e0d5f16ad9759d92f5739b53acdebfe22fa2a2 [diff] | |
parent | a4f174dee4ae842e07cab7eeec194a3e60925c8d [diff] |
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