Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
[linux-3.10.git] / Documentation / svga.txt
2005-04-16 Linus Torvalds Linux-2.6.12-rc2 master