diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-09 09:05:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-09 09:05:25 -0700 |
| commit | 462e9a355e7488fde3712c3b2585fc2f2a2c263d (patch) | |
| tree | 2f1cdf7e4b72281f9fba51b6d1515c2b46f8434b /drivers/media/video/cpia.c | |
| parent | 5b50be743f495b000891d430ecba7372cc59bb64 (diff) | |
| parent | 3872fe83a2fbb7366daa93ca533a22138e2d483e (diff) | |
| download | blackbird-op-linux-462e9a355e7488fde3712c3b2585fc2f2a2c263d.tar.gz blackbird-op-linux-462e9a355e7488fde3712c3b2585fc2f2a2c263d.zip | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A number of ARM fixes:
- prevent oopses caused by dma_get_sgtable() and declared DMA
coherent memory
- fix boot failure on nommu caused by ID_PFR1 access
- a number of kprobes fixes from Jon Medhurst and Masami Hiramatsu"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8665/1: nommu: access ID_PFR1 only if CPUID scheme
ARM: dma-mapping: disallow dma_get_sgtable() for non-kernel managed memory
arm: kprobes: Align stack to 8-bytes in test code
arm: kprobes: Fix the return address of multiple kretprobes
arm: kprobes: Skip single-stepping in recursing path if possible
arm: kprobes: Allow to handle reentered kprobe on single-stepping
Diffstat (limited to 'drivers/media/video/cpia.c')
0 files changed, 0 insertions, 0 deletions
