diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 21:22:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-03 21:22:49 +0200 |
commit | 31351f73ea37a5881fa24377ebc9e79487a77039 (patch) | |
tree | 190ddb8cb56fba4d726c13eb47acdad85ca1378c /mm/memory-failure.c | |
parent | Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | nios2: check number of timer instances (diff) | |
download | linux-31351f73ea37a5881fa24377ebc9e79487a77039.tar.xz linux-31351f73ea37a5881fa24377ebc9e79487a77039.zip |
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
Diffstat (limited to 'mm/memory-failure.c')
0 files changed, 0 insertions, 0 deletions