diff options
| author | Linus Torvalds <[email protected]> | 2010-06-09 15:52:03 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-06-09 15:52:03 +0000 |
| commit | e411f2dda48c81c556c802d4430717950cf088fd (patch) | |
| tree | 9c572940fe081cf84280b16c61e3ee2574ccd3fc /fs/proc/array.c | |
| parent | misc: Fix allocation 'borrowed' by vhost_net (diff) | |
| parent | microblaze: Fix sg_dma_len() regression (diff) | |
| download | kernel-e411f2dda48c81c556c802d4430717950cf088fd.tar.gz kernel-e411f2dda48c81c556c802d4430717950cf088fd.zip | |
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
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions
