linux/Documentation/powerpc
David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c
2008-07-18 02:39:39 -07:00
..
dts-bindings/fsl powerpc/fsl: update crypto node definition and device tree instances 2008-07-14 07:55:47 -05:00
00-INDEX [POWERPC] QE: Add ability to upload QE firmware 2008-01-23 19:34:06 -06:00
SBC8260_memory_mapping.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
booting-without-of.txt Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2008-07-18 02:39:39 -07:00
bootwrapper.txt powerpc/bootwrapper: Add documentation of boot wrapper targets 2008-07-04 00:59:03 -06:00
cpu_features.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
eeh-pci-error-recovery.txt typo fixes 2007-10-20 01:34:40 +02:00
hvcs.txt Fix typos in Documentation/: 'F'-'G' 2006-10-03 22:49:15 +02:00
kvm_440.txt KVM: ppc: PowerPC 440 KVM implementation 2008-04-27 18:21:39 +03:00
mpc52xx-device-tree-bindings.txt [POWERPC] mpc5200: Allow for fixed speed MII configurations 2008-05-01 11:05:58 -06:00
mpc52xx.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
phyp-assisted-dump.txt [POWERPC] pseries: phyp dump: Documentation 2008-03-26 08:44:06 +11:00
ppc_htab.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
qe_firmware.txt [POWERPC] QE: Add ability to upload QE firmware 2008-01-23 19:34:06 -06:00
smp.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sound.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
zImage_layout.txt Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00