Merge branch 'master' of git://git.denx.de/u-boot-arm
authorWolfgang Denk <wd@denx.de>
Fri, 23 Sep 2011 06:23:25 +0000 (08:23 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 23 Sep 2011 06:23:25 +0000 (08:23 +0200)
commit279bbbca12e71ae68278b756048194003a6d6e21
tree0f0f8a2dcbd57a3f001ecb84e06c2b57067d5426
parent7de17781a44b0f9f7139c24742ec75a84635e559
parent513e6fd3eb98b74a71e2d83149f98c4e6fc3ce64
Merge branch 'master' of git://git.denx.de/u-boot-arm

* 'master' of git://git.denx.de/u-boot-arm:
  OMAP3: beagle: Fix build warning in beagle.c