Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / arch / m68k / include / asm / scatterlist.h
2010-05-27 FUJITA Tomonorim68k: use asm-generic/scatterlist.h
2009-03-24 Geert Uytterhoevenm68k: Use dma_addr_t for scatterlist.dma_address
2009-03-24 Greg Ungererm68k: use mmu scatterlist.h for non-mmu setups as well
2009-01-16 Sam Ravnborgm68k,m68knommu: merge header files