Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / arch / s390 / include / asm / scatterlist.h
2010-05-27 FUJITA Tomonoriasm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h
2009-09-11 Heiko Carstens[S390] use generic scatterlist.h
2008-08-01 Martin Schwidefsky[S390] move include/asm-s390 to arch/s390/include/asm