diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-20 07:05:02 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-20 07:05:02 +0300 |
| commit | 99bc7215bc60f6cd414cf1b85cd9d52cc596cccb (patch) | |
| tree | 8bba8cc01d6494acd2443ccce4dfba1612d58981 /fs/nls/nls_cp1255.c | |
| parent | 30ec56824897fc70f668dcb302f08cc9080eadfa (diff) | |
| parent | 7ae85dc7687c7e7119053d83d02c560ea217b772 (diff) | |
| download | linux-99bc7215bc60f6cd414cf1b85cd9d52cc596cccb.tar.xz | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"Three fixes and a resulting cleanup for -rc2:
- Andre Przywara reported that he was seeing a warning with the new
cast inside DMA_ERROR_CODE's definition, and fixed the incorrect
use.
- Doug Anderson noticed that kgdb causes a "scheduling while atomic"
bug.
- OMAP5 folk noticed that their Thumb-2 compiled X servers crashed
when enabling support to cover ARMv6 CPUs due to a kernel bug
leaking some conditional context into the signal handler"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8425/1: kgdb: Don't try to stop the machine when setting breakpoints
ARM: 8437/1: dma-mapping: fix build warning with new DMA_ERROR_CODE definition
ARM: get rid of needless #if in signal handling code
ARM: fix Thumb2 signal handling when ARMv6 is enabled
Diffstat (limited to 'fs/nls/nls_cp1255.c')
0 files changed, 0 insertions, 0 deletions