Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git] / include / asm-powerpc / ide.h
2005-11-09 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2005-11-09 Jeff GarzikMerge branch 'master'
2005-11-08 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2005-11-08 Stephen Rothwellpowerpc: merge ide.h