Merge branch 'pci' into mips

author phcoder <phcoder@debian.bg45.phnet>

Thu, 22 Oct 2009 12:32:09 +0000 (14:32 +0200)

committer phcoder <phcoder@debian.bg45.phnet>

Thu, 22 Oct 2009 12:32:09 +0000 (14:32 +0200)
author phcoder <phcoder@debian.bg45.phnet>
Thu, 22 Oct 2009 12:32:09 +0000 (14:32 +0200)
committer phcoder <phcoder@debian.bg45.phnet>
Thu, 22 Oct 2009 12:32:09 +0000 (14:32 +0200)
diff --cc bus/usb/ohci.c
Simple merge
diff --cc conf/i386-pc.rmk
Simple merge
diff --cc configure.ac
Simple merge
diff --cc disk/ata.c
Simple merge
author	phcoder <phcoder@debian.bg45.phnet>
	Thu, 22 Oct 2009 12:32:09 +0000 (14:32 +0200)
committer	phcoder <phcoder@debian.bg45.phnet>
	Thu, 22 Oct 2009 12:32:09 +0000 (14:32 +0200)
		1	2
bus/usb/ohci.c	patch \|	diff1 \|	diff2 \|	blob \| history
conf/i386-pc.rmk	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
disk/ata.c	patch \|	diff1 \|	diff2 \|	blob \| history