Merge mulgrave-w:git/scsi-misc-2.6
[linux-2.6] / include / asm-powerpc / dma-mapping.h
2005-11-20  Jeff GarzikMerge branch 'upstream'
2005-11-20  Jeff GarzikMerge branch 'master'
2005-11-20  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2005-11-19  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-19  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-11-19  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-19  Paul MackerrasMerge branch 'mymerge' of ssh://ozlabs.org/home/sfr...
2005-11-18  Stephen Rothwellpowerpc: merge dma-mapping.h