Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
authorWolfgang Denk <wd@denx.de>
Sat, 10 Dec 2011 21:45:34 +0000 (22:45 +0100)
committerWolfgang Denk <wd@denx.de>
Sat, 10 Dec 2011 21:45:34 +0000 (22:45 +0100)
commit84d018268a8af1d9f271b398748652c5112e951a
tree65572a9581dd795061b424a01ca118870fc52a66
parenta612ae37595b2b4af71c992d38a3bc17c1c866e2
parent71bdf829a0952b76710f945375a72181d61fd4c2
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