summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeLines
* Merge git://git.denx.de/u-boot-nand-flashTom Rini2015-08-26-672/+2448
|\
| * mtd: nand: mxs invalidate dcache before DMA readPeng Fan2015-08-25-0/+6
| * mtd: nand: mxs support oobsize bigger than 512Peng Fan2015-08-25-9/+25
| * arm: mvebu: Enable NAND on db-mv784mp-gpStefan Roese2015-08-25-0/+6
| * mtd: nand: Add mvebu (PXA / AXP / A38x) NAND device driverStefan Roese2015-08-25-0/+1693
| * mtd: nand: Increase max sizes of OOB and Page sizeSiva Durga Prasad Paladugu2015-08-25-3/+3
| * nand: Sync with Linux v4.1Scott Wood2015-08-25-198/+657
| * mtd: Introduce mtd_block_isreserved()Ezequiel Garcia2015-08-25-2/+56
| * nand: Remove __UBOOT__ ifdefsScott Wood2015-08-25-462/+4
* | Merge git://git.denx.de/u-boot-pxaTom Rini2015-08-24-88/+94
|\ \
| * | arm: pxa: colibri_pxa270: add optional i2c supportMarcel Ziswiler2015-08-24-0/+9
| * | arm: pxa: colibri_pxa270: add optional lcd supportMarcel Ziswiler2015-08-24-0/+13
| * | arm: pxa: colibri_pxa270: add some more nor flash detailsMarcel Ziswiler2015-08-24-0/+4
| * | arm: pxa: palmtreo680: get rid of obsolete CONFIG_SYS_LCD_PXA_NO_L_BIASMarcel Ziswiler2015-08-24-1/+0
| * | lcd: pxa: clean-up include file orderMarcel Ziswiler2015-08-24-5/+4
| * | usb: pxa27x_udc: clean-up include file orderMarcel Ziswiler2015-08-24-3/+2
| * | serial: pxa: clean-up include file orderMarcel Ziswiler2015-08-24-2/+2
| * | arm: pxa: mmc: clean-up include file orderMarcel Ziswiler2015-08-24-5/+3
| * | arm: pxa: clean-up include file orderMarcel Ziswiler2015-08-24-3/+3
| * | arm: pxa: use common timer functionsAndrew Ruder2015-08-24-69/+30
| * | pxa: Fix boot hang by avoiding vector relocationAndrew Ruder2015-08-24-0/+24
| |/
* | Merge branch 'master' of git://git.denx.de/u-boot-mipsTom Rini2015-08-24-4/+4
|\ \ | |/ |/|
| * MIPS: fix syntax for fdt_chosen/initrd.Govindraj Raja2015-08-21-2/+2
| * mips: Use unsigned int when reading c0 registersChris Packham2015-08-21-2/+2
* | Merge git://git.denx.de/u-boot-socfpgaTom Rini2015-08-23-2760/+3220
|\ \
| * | arm: socfpga: Fix ArriaV SoCDK PLL configMarek Vasut2015-08-23-13/+13
| * | arm: socfpga: Enable ethernet on ArriaV SoCDKMarek Vasut2015-08-23-0/+3
| * | arm: socfpga: Fix SD/MMC boot on ArriaV SoCDKMarek Vasut2015-08-23-0/+6
| * | arm: socfpga: Fix MAINTAINERS entry for CV/AV SoCDKMarek Vasut2015-08-23-9/+4
| * | arm: socfpga: Enable DWAPB GPIO driverMarek Vasut2015-08-23-2/+8
| * | arm: socfpga: dts: Add bank-name property to each GPIO bankMarek Vasut2015-08-23-0/+3
| * | gpio: Add DW APB GPIO driverMarek Vasut2015-08-23-0/+175
| * | arm: socfpga: Make the pinmux table const u8Marek Vasut2015-08-23-8/+6
| * | arm: socfpga: Switch to filtered QTS filesMarek Vasut2015-08-23-2982/+2546
| * | arm: socfpga: Add qts-filter.sh scriptMarek Vasut2015-08-23-0/+205
| * | arm: socfpga: Remove AV-specific parts from CV-SoCDKMarek Vasut2015-08-23-1153/+0
| * | arm: socfpga: Remove CV-specific parts from AV-SoCDKMarek Vasut2015-08-23-1117/+0
| * | arm: socfpga: Split Altera socfpga into AV and CV SoCDKMarek Vasut2015-08-23-2/+2773
| * | arm: socfpga: Unbind CPU type from board typeMarek Vasut2015-08-23-8/+21
| * | arm: socfpga: Move wrappers into platform directoryMarek Vasut2015-08-23-11/+18
| * | arm: socfpga: Do not enable gmac1 in Cyclone V dtsiMarek Vasut2015-08-23-6/+1
| * | arm: socfpga: Make the DT mmc node consistentMarek Vasut2015-08-23-3/+2
| * | arm: socfpga: Fix delay in clock managerMarek Vasut2015-08-23-7/+5
| * | arm: socfpga: Fix delay in freeze controllerMarek Vasut2015-08-23-7/+5
| * | ddr: altera: Repair uninited variableMarek Vasut2015-08-23-1/+1
| * | ddr: altera: Replace float multiplication with integer oneMarek Vasut2015-08-23-1/+1
| |/
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2015-08-23-447/+1103
|\ \
| * | net: Move CONFIG_E1000 options to KconfigSimon Glass2015-08-21-36/+508
| * | Tidy up some defconfig filesSimon Glass2015-08-21-192/+165
| * | net: e1000: Add Kconfig optionsSimon Glass2015-08-21-10/+32