From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v2.6.35-rc3~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e411f2dda48c81c556c802d4430717950cf088fd;p=linux.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