Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 14:53:34 +0000 (07:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 May 2011 14:53:34 +0000 (07:53 -0700)
commit8043f4eb85bf772e3af82678657019937388b6e1
treea30b4fd36f31dcc306c2dca8962e4f5656a04575
parent75c0b3b466388f2fad60fda57b6ca2c4fabbcaf7
parentb1054282d752c5a026e2c0450616ebf37fc0413e
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc32: Fixed unaligned memory copying in function __csum_partial_copy_sparc_generic
  sparc32: fix sparcstation 5 boot
  sparc32: fix section mismatch warnings in apc, pmc and time_32