Merge branch 'master' of git://git.denx.de/u-boot-ixp
authorWolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:24:38 +0000 (21:24 +0100)
committerWolfgang Denk <wd@denx.de>
Sun, 1 Feb 2009 20:24:38 +0000 (21:24 +0100)
commitf4b6f45dcba989f5a900edc07ececae80c79abdf
tree85e623dc76eba877275c5978a6527f368975abb2
parenta87fb1b308a2a375cb9ca74ca0dd3e2c5793d3bf
parent930590f3e49c8f32256edf2e5861e1535a329c6c
Merge branch 'master' of git://git.denx.de/u-boot-ixp