Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Dec 2017 00:47:14 +0000 (16:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Dec 2017 00:47:14 +0000 (16:47 -0800)
Pull ARM fix from Russell King:
 "Just one fix for a problem in the csum_partial_copy_from_user()
  implementation when software PAN is enabled"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch


Trivial merge