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: cont_sys_log_2~6
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=e411f2dda48c81c556c802d4430717950cf088fd

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