Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / arch / parisc / include / asm / scatterlist.h
2010-05-27 FUJITA Tomonoriparisc: use asm-generic/scatterlist.h
2008-10-10 Kyle McMartinparisc: move include/asm-parisc to arch/parisc/include/asm