Resolve conflicts around apb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>  | 
			||
|---|---|---|
| .. | ||
| Makefile.objs | ||
| apb.c | ||
| bonito.c | ||
| gpex.c | ||
| grackle.c | ||
| pam.c | ||
| piix.c | ||
| ppce500.c | ||
| prep.c | ||
| q35.c | ||
| uninorth.c | ||
| versatile.c | ||
| xilinx-pcie.c | ||
				
					
						
							Resolve conflicts around apb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>  | 
			||
|---|---|---|
| .. | ||
| Makefile.objs | ||
| apb.c | ||
| bonito.c | ||
| gpex.c | ||
| grackle.c | ||
| pam.c | ||
| piix.c | ||
| ppce500.c | ||
| prep.c | ||
| q35.c | ||
| uninorth.c | ||
| versatile.c | ||
| xilinx-pcie.c | ||