summaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 17:52:03 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-06-09 17:52:03 +0200
commite411f2dda48c81c556c802d4430717950cf088fd (patch)
tree9c572940fe081cf84280b16c61e3ee2574ccd3fc /arch/frv/kernel
parentmisc: Fix allocation 'borrowed' by vhost_net (diff)
parentmicroblaze: Fix sg_dma_len() regression (diff)
downloadlinux-e411f2dda48c81c556c802d4430717950cf088fd.tar.xz
linux-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 'arch/frv/kernel')
0 files changed, 0 insertions, 0 deletions