summaryrefslogtreecommitdiff
path: root/include/configs/VoVPN-GW.h
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-20 10:42:05 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-03-20 10:42:05 -0600
commitf8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch)
tree92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /include/configs/VoVPN-GW.h
parent79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff)
parent7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff)
downloadu-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.zip
u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.gz
u-boot-imx-f8edca2e9a128f526b1fe6f997f7adb852cf5b3c.tar.bz2
Merge branch 'origin'
Conflicts: CHANGELOG
Diffstat (limited to 'include/configs/VoVPN-GW.h')
0 files changed, 0 insertions, 0 deletions