]> git.kernelconcepts.de Git - karo-tx-uboot.git/commit
Merge branch 'mpc85xx'
authorJon Loeliger <jdl@freescale.com>
Tue, 19 Sep 2006 15:02:20 +0000 (10:02 -0500)
committerJon Loeliger <jdl@freescale.com>
Tue, 19 Sep 2006 15:02:20 +0000 (10:02 -0500)
commit504b5cd0e2e7b58c6265fb684a850a158c85e1b2
tree2125bf738ec1ea6ea87c807ee045832fecf27fe6
parentafbdc649f8751e4f4f1a6f527edfe139773f2c15
parent8272dc2f58f2473d8995fcc9b916440cfba080f0
Merge branch 'mpc85xx'

Conflicts:

drivers/tsec.c
drivers/tsec.c
drivers/tsec.h