Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

Browse source

* '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

...

This commit is contained in:

Linus Torvalds 2010-06-09 08:52:03 -07:00

parent 79907d89c3 fcdcddbcbb

commit e411f2dda4

2 changed files with 2 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/microblaze/include/asm/page.h

View file

1

arch/microblaze/kernel/dma.c

View file