tree 72f8b6d6116e0ee7668c3159d698e9465bafbb9e
parent 6711ee5d3db3d08f99d7686a393f9034ad62f34b
parent 019435f034878d207e2761bab9124fdc89abdf9b
author Wolfgang Denk <wd@denx.de> 1324419277 +0100
committer Wolfgang Denk <wd@denx.de> 1324419277 +0100

Merge branch 'master' of /home/wd/git/u-boot/custodians

* 'master' of /home/wd/git/u-boot/custodians:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function