Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Oct 2013 19:57:59 +0000 (12:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Oct 2013 19:57:59 +0000 (12:57 -0700)
commit0b936842c86392dad2c880539e824881e5d8ba77
tree95dbb304e8c0e83a0dc733b087f9b9eb8b7d21d4
parent517bf8fc211d37d3aa005fb35f9ee7f1d35cb860
parent2bd161a605f1f84a5fc8a4fe8410113a94f79355
Merge git://git./linux/kernel/git/davem/sparc

Pull sparc fix from David Miller:
 "Just a single bug fix to a regression added during some strlcpy()
  conversions"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: Fix buggy strlcpy() conversion in ldom_reboot().