Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
[linux-3.10.git] / Documentation / zorro.txt
2005-04-16 Linus Torvalds Linux-2.6.12-rc2 master