From: Linus Torvalds Date: Fri, 16 Dec 2011 20:26:26 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=64b3dcc35e8dcaa3032aa6aba416d05f41ead959;p=linux.git 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 --- 64b3dcc35e8dcaa3032aa6aba416d05f41ead959