summaryrefslogtreecommitdiff
path: root/mm/memory.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-11-01 04:01:03 +0300
committerDavid S. Miller <davem@davemloft.net>2016-11-01 04:01:03 +0300
commit2c8657d226ad9f02030e12ce7db3076ead9c16a8 (patch)
tree2e0e03edc6e80a860d9a033313c6ca620810f2f9 /mm/memory.c
parentfcdefccac976ee51dd6071832b842d8fb41c479c (diff)
parentdeb507f91f1adbf64317ad24ac46c56eeccfb754 (diff)
downloadlinux-2c8657d226ad9f02030e12ce7db3076ead9c16a8.tar.xz
Merge tag 'linux-can-fixes-for-4.9-20161031' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says: ==================== pull-request: can 2016-10-31 this is a pull request of two patches for the upcoming v4.9 release. The first patch is by Lukas Resch for the sja1000 plx_pci driver that adds support for Moxa CAN devices. The second patch is by Oliver Hartkopp and fixes a potential kernel panic in the CAN broadcast manager. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions