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)
commit954f9ac43b87b44152b8c21163cefd466a87145e
tree31c4197f975c66c96976948663e6ce844900b41a
parent1b62ca7bf5775bed048032b7e779561e1fe66aa0
parent7fe0b14b725d6d09a1d9e1409bd465cb88b587f9
Merge git://git./linux/kernel/git/torvalds/linux

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>