diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 18:01:14 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-21 18:01:14 +0300 |
commit | 6701ef0318f76a9765a3fc762cbac405e024a8c2 (patch) | |
tree | a5eecbee6deca75230f04980c9ad459cdfbce74c /drivers/tty/serial/atmel_serial.c | |
parent | 4f1d841475e1f6e9e32496dda11215db56f4ea73 (diff) | |
parent | 57df5380853460bc66b59a46273ce113c923d39c (diff) | |
download | linux-6701ef0318f76a9765a3fc762cbac405e024a8c2.tar.xz |
Merge tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Merge "Fixes for omaps for v4.3-rc cycle" from Tony Lindgren:
- Fix oops with LPAE and moew than 2GB of memory by enabling
ZONE_DMA for LPAE. Probably no need for stable on this one as we
only recently ran into this with the mainline kernel
- Fix imprecise external abort caused by bogus SRAM init. This affects
dm814x recently merged, so no need for stable on this one AFAIK
* tag 'omap-for-v4.3/fixes-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Fix imprecise external abort caused by bogus SRAM init
ARM: OMAP2+: Fix oops with LPAE and more than 2GB of memory
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
0 files changed, 0 insertions, 0 deletions