Merge branch 'virtex-for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-virtex into...

author Josh Boyer <jwboyer@linux.vnet.ibm.com>

Thu, 7 Feb 2008 03:06:45 +0000 (21:06 -0600)

committer Josh Boyer <jwboyer@linux.vnet.ibm.com>

Thu, 7 Feb 2008 03:06:45 +0000 (21:06 -0600)
author Josh Boyer <jwboyer@linux.vnet.ibm.com>
Thu, 7 Feb 2008 03:06:45 +0000 (21:06 -0600)
committer Josh Boyer <jwboyer@linux.vnet.ibm.com>
Thu, 7 Feb 2008 03:06:45 +0000 (21:06 -0600)
diff --cc Documentation/powerpc/booting-without-of.txt
Simple merge
author	Josh Boyer <jwboyer@linux.vnet.ibm.com>
	Thu, 7 Feb 2008 03:06:45 +0000 (21:06 -0600)
committer	Josh Boyer <jwboyer@linux.vnet.ibm.com>
	Thu, 7 Feb 2008 03:06:45 +0000 (21:06 -0600)