Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Oct 2012 03:02:10 +0000 (23:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Oct 2012 03:02:10 +0000 (23:02 -0400)
There's a Niagara 2 memcpy fix in this tree and I have
a Kconfig fix from Dave Jones which requires the sparc-next
changes which went upstream yesterday.

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge