]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a3c284 a8955cc)
Merge tag 'nios2-v4.2' of git://git.rocketboards.org/linux-socfpga-next
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jul 2015 19:22:49 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Jul 2015 19:22:49 +0000 (12:22 -0700)
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

1  2 
arch/nios2/kernel/time.c patch | diff1 | diff2 | blob | history

diff --cc arch/nios2/kernel/time.c
Simple merge
A mirror of Linus' kernel repository