From: Wolfgang Denk <wd@denx.de>
Date: Sat, 10 Dec 2011 21:45:34 +0000 (+0100)
Subject: Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2011.12-rc1~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84d018268a8af1d9f271b398748652c5112e951a;p=oweals%2Fu-boot.git

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

* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
  Update pci_ids.h from current Linux sources
  omap: overo: Use ubifs instead of jffs2 for nand
  omap: TWL4030 Bump VMMC1 interface voltage from 3V to 3.15V
---

84d018268a8af1d9f271b398748652c5112e951a