Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl...
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 23:57:58 +0000 (15:57 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 23:57:58 +0000 (15:57 -0800)
commit8eefb2b7ad6195f4324629f35be0b9443cd8ee96
treeaf0da81d6715e9fa84763f1aba6b6fb691c4a6db
parentf89bce3d9afc6b1fb898ae176df4962c1303ee86
parent7806ca89bc0437d9952c6337d3bbddf1ea3591ff
Merge branch 'release' of /home/ftp/linux/kernel/git/aegl/linux-2.6

* 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Move sg_dma_{len,address} from pci.h to scatterlist.h