Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
[linux-3.10.git] / Documentation / powerpc / zImage_layout.txt
2005-04-16 Linus Torvalds Linux-2.6.12-rc2 master