| commit | 31351f73ea37a5881fa24377ebc9e79487a77039 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 03 12:22:49 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 03 12:22:49 2015 -0700 |
| tree | 190ddb8cb56fba4d726c13eb47acdad85ca1378c | |
| parent | 9a3c284a6dc894af066bbd6238a37996bb156c40 [diff] | |
| parent | a8955cc3a504e43ecd606e9f0d9bc25de240aacb [diff] |
Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next Pull nios2 update from Ley Foon Tan: "Check number of timer instances" * tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next: nios2: check number of timer instances