Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
commit64b3dcc35e8dcaa3032aa6aba416d05f41ead959
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2011 20:26:26 +0000 (16 12:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Dec 2011 20:26:26 +0000 (16 12:26 -0800)
treea9b16f5cef9ec006061b284fcf79645a7d89cbff
parent24545cf168d1128bd74dfe6ea9e864825e25dd02
parentb1f44e13a525d2ffb7d5afe2273b7169d6f2222e
Merge git://git./linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32: Be less strict in matching %lo part of relocation.
  sbus: convert drivers/sbus/char/* to use module_platform_driver()
  bbc_i2c: Remove unneeded err variable
  sparc: Use kmemdup rather than duplicating its implementation