summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-09-09 02:24:51 +0200
committerWolfgang Denk <wd@denx.de>2008-09-09 02:24:51 +0200
commitab00e7a23e088505b22cba7b84145806129b83bf (patch)
tree5acdfb4c2b87058d132dc8fe9fb81d394cb034bd /include/linux
parent4d2ae70e8c31c22e5710df5ff236b5565ea2cf2c (diff)
parent5ff889349d2ace13f10c9335e09365fcec8247cc (diff)
downloadu-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.zip
u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.tar.gz
u-boot-imx-ab00e7a23e088505b22cba7b84145806129b83bf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Conflicts: Makefile Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions