| #
f8edca2e |
| 20-Mar-2006 |
Kumar Gala <galak@kernel.crashing.org> |
Merge branch 'origin'
Conflicts:
CHANGELOG
|
| #
4e3ccd26 |
| 06-Mar-2006 |
Wolfgang Denk <wd@nyx.denx.de> |
Merge the new NAND code (testing-NAND brach); see doc/README.nand
Rewrite of NAND code based on what is in 2.6.12 Linux kernel
Patch by Ladislav Michl, 29 Jun 2005
[Merge with /home/tur/nand/u-boot]
|
| #
0377dca2 |
| 24-Feb-2006 |
Markus Klotzbücher <mk@pollux.(none)> |
Merge /home/tur/nand/u-boot/
This is a first version of the testing-NAND branch merged back to main.
|
| #
038ccac5 |
| 24-Feb-2006 |
Bartlomiej Sieka <tur@semihalf.com> |
Merge with /home/wd/git/u-boot/testing-NAND/ to add new NAND handling.
|
| #
05b47540 |
| 17-Aug-2005 |
Wolfgang Denk <wd@pollux.denx.de> |
Merge with testing-NAND (Rewrite of NAND code)
|
| #
932394ac |
| 17-Aug-2005 |
Wolfgang Denk <wd@pollux.denx.de> |
Rewrite of NAND code based on what is in 2.6.12 Linux kernel
Patch by Ladislav Michl, 29 Jun 2005
|