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
This commit is contained in:
Wolfgang Denk 2011-12-20 23:14:37 +01:00
commit e27334212c

View file

@ -918,7 +918,7 @@ static int parse_menu(char **c, struct pxe_menu *cfg, char *b, int nest_level)
{
struct token t;
char *s = *c;
int err;
int err = 0;
get_token(c, &t, L_KEYWORD);