projects / platform / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a612ae3 71bdf82)
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)
* '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


Trivial merge
Domain: System / Kernel;