Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 15:52:03 +0000 (08:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Jun 2010 15:52:03 +0000 (08:52 -0700)
commite411f2dda48c81c556c802d4430717950cf088fd
tree9c572940fe081cf84280b16c61e3ee2574ccd3fc
parent79907d89c397b8bc2e05b347ec94e928ea919d33
parentfcdcddbcbbd39a3363bd48414bfe44553b6d698a
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