| commit | 928509bc48cd3997694a681590acbfeb51ac5bd8 | [log] [tgz] |
|---|---|---|
| author | Wolfgang Denk <wd@denx.de> | Sat Dec 10 22:45:34 2011 +0100 |
| committer | Wolfgang Denk <wd@denx.de> | Sat Dec 10 22:45:34 2011 +0100 |
| tree | 65572a9581dd795061b424a01ca118870fc52a66 | |
| parent | 70d791b4128771ddd32a9d227020fb1777d6cd2a [diff] | |
| parent | bc7a09c5a590fbd5e6c23c87b579246f33c6d24f [diff] |
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