From: Linus Torvalds Date: Wed, 9 Jun 2010 15:52:03 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e411f2dda48c81c556c802d4430717950cf088fd;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix sg_dma_len() regression microblaze: Define ARCH_SLAB_MINALIGN to fix slab crash --- e411f2dda48c81c556c802d4430717950cf088fd