From: Linus Torvalds Date: Wed, 13 Dec 2006 23:57:58 +0000 (-0800) Subject: Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/linux/kernel/git/aegl... X-Git-Tag: v2.6.20-rc1~16 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8eefb2b7ad6195f4324629f35be0b9443cd8ee96;p=linux-2.6-omap-h63xx.git Merge branch 'release' of master.kernel.org:/home/ftp/pub/scm/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 --- 8eefb2b7ad6195f4324629f35be0b9443cd8ee96