| commit | e411f2dda48c81c556c802d4430717950cf088fd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 09 08:52:03 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jun 09 08:52:03 2010 -0700 |
| tree | 9c572940fe081cf84280b16c61e3ee2574ccd3fc | |
| parent | 79907d89c397b8bc2e05b347ec94e928ea919d33 [diff] | |
| parent | fcdcddbcbbd39a3363bd48414bfe44553b6d698a [diff] |
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