From: Wolfgang Denk <wd@denx.de>
Date: Tue, 20 Dec 2011 22:14:32 +0000 (+0100)
Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc3~11^2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c89fd4f0a271d8f7f252266b6591be9ddee53d4e;p=u-boot

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  common/cmd_pxe.c: Fix GCC 4.6 build warnings
  AVR32: fix timer_init() function
---

c89fd4f0a271d8f7f252266b6591be9ddee53d4e