diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 15:16:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-20 15:16:00 -0800 |
| commit | d5379e5eddc09f8d172d9d6aa0e5a269a89dc60a (patch) | |
| tree | 8b5ea0d52c32d48bb4acda193e5f5d0c378f402e /net/lapb/lapb_timer.c | |
| parent | Merge tag 'xtensa-20161219' of git://github.com/jcmvbkbc/linux-xtensa (diff) | |
| parent | microblaze: Add new fpga families (diff) | |
| download | linux-d5379e5eddc09f8d172d9d6aa0e5a269a89dc60a.tar.gz linux-d5379e5eddc09f8d172d9d6aa0e5a269a89dc60a.zip | |
Merge tag 'microblaze-4.10-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull arch/microblaze updates from Michal Simek:
- wire-up new syscalls
- add new codes and fpga families
- fix a return value
* tag 'microblaze-4.10-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Add new fpga families
microblaze: Add missing release version code v9.6 and v10
microblaze: Add missing syscalls
microblaze: Fix return value from xilinx_timer_init
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions