Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / arch / score / include / asm / scatterlist.h
2010-05-27 FUJITA Tomonoriasm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h
2009-06-19 Chen Liqinscore: Add support for Sunplus S+core architecture