diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-01-12 15:52:02 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-01-12 15:52:02 -0600 |
| commit | 06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e (patch) | |
| tree | af21232904f8c160cf9303bdf05244db1be0b4fc /CHANGELOG | |
| parent | d5e78b7bf4f54e3ec6b3720716331643fdc13bf8 (diff) | |
| parent | bc680b12d0021a1d6f9a7fc1163902007ec971e0 (diff) | |
| download | u-boot-imx-06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e.zip u-boot-imx-06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e.tar.gz u-boot-imx-06508f1c9b35ed16f42b3dfe99f9b1182b4ec82e.tar.bz2 | |
Merge branch 'mpc8349ads'
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2,6 +2,7 @@ Changes since U-Boot 1.1.4: ====================================================================== +<<<<<<< HEAD/CHANGELOG * Fixed PCI indirect config ops to handle multiple PCI controllers We need to adjust the bus number we are trying to access based on which PCI controller its on |