]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 18:34:43 +0000 (10:34 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 12 Jan 2016 18:34:43 +0000 (10:34 -0800)
Pull m68knommu update from Greg Ungerer:
 "Only a single change, limiting the return values for coldfire gpio get
  function"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: coldfire/gpio: Be sure to clamp return value


Trivial merge