diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-30 15:47:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-30 15:47:19 -0800 |
| commit | f9a42e0d58cf0fe3d902e63d4582f2ea4cd2bb8b (patch) | |
| tree | 4078d3ae27d4ebb85bdcd4d84e9b9a4d059f22bb /net/batman-adv | |
| parent | 751321b3dd5040dc5be19bd23f985e80c914621a (diff) | |
| parent | 54791b276b4000b307339f269d3bf7db877d536f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Several small bug fixes and tidies, along with a fix for non-resumable
memory errors triggered by userspace"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Handle PIO & MEM non-resumable errors.
sparc64: Zero pages on allocation for mondo and error queues.
sparc: Fixed typo in sstate.c. Replaced panicing with panicking
sparc: use symbolic names for tsb indexing
Diffstat (limited to 'net/batman-adv')