summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeLines
* Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86Tom Rini2013-11-25-15/+24
|\
| * sandbox: Make map_to_sysmem() use a constant pointerSimon Glass2013-11-21-2/+2
| * sandbox: Correct data sizes and printf() strings in fdtdec.cSimon Glass2013-11-21-4/+4
| * sandbox: config: Don't use 64-bit physical memorySimon Glass2013-11-21-3/+2
| * sandbox: Use system headers first for sandbox's os.cSimon Glass2013-11-21-4/+11
| * sandbox: Use uint64_t instead of u64 for timeSimon Glass2013-11-21-2/+5
* | Merge branch 'master' of git://git.denx.de/u-boot-netTom Rini2013-11-25-386/+727
|\ \
| * | net: rtl8169: Add support for RTL8168d/8111dThierry Reding2013-11-22-1/+17
| * | net: rtl8169: Improve cache maintenanceThierry Reding2013-11-22-8/+53
| * | net: zynq_gem: Add d-cache supportSrikanth Thokala2013-11-22-29/+53
| * | phy: Use general phy code for smsc lan8720aDavid Dueck2013-11-22-1/+2
| * | phy: Use supported field during autonegotiationDavid Dueck2013-11-22-2/+3
| * | net: dm9000: random mac address supportAndrew Ruder2013-11-22-0/+9
| * | drivers/net/e1000: Introduce CONFIG_E1000_NO_NVMRojhalat Ibrahim2013-11-22-5/+38
| * | net: tftpsrv: Get correct client MAC addressAndrew Ruder2013-11-22-0/+3
| * | net: phy: atheros: Fix masks for AR8035 and AR8021Fabio Estevam2013-11-22-1/+1
| * | net/phy: Fix the phy id mask of AR8031Chunhe Lan2013-11-22-1/+1
| * | net: tsec: Fix mac addr setup portability, cleanupClaudiu Manoil2013-11-22-10/+8
| * | net: tsec: Use portable regs type (uint->u32)Claudiu Manoil2013-11-22-141/+139
| * | net: tsec: Use portable types and accessors for BDsClaudiu Manoil2013-11-22-54/+56
| * | net: tsec: Fix CamelCase issues around BD codeClaudiu Manoil2013-11-22-32/+32
| * | net: fsl_mdio: Fix warnings for __iomem pointersClaudiu Manoil2013-11-22-11/+14
| * | net: tsec: Cleanup tsec regs init and fix __iomem warnsClaudiu Manoil2013-11-22-27/+38
| * | net: tsec: Fix priv pointer in tsec_mcast_addr()Claudiu Manoil2013-11-22-7/+1
| * | net: tsec: Fix and cleanup tsec_mcast_addr()Claudiu Manoil2013-11-22-16/+15
| * | net: Fix mcast function pointer prototypeClaudiu Manoil2013-11-22-4/+4
| * | net: designware: Fix alignment of buffer descriptorsAlexey Brodkin2013-11-22-4/+3
| * | net: designware: Respect "bus mode" register contents on SW resetAlexey Brodkin2013-11-22-1/+1
| * | net: sh-eth: Add support R8A7791Nobuhiro Iwamatsu2013-11-22-4/+5
| * | net, phy: fix AR8031 phy_maskHeiko Schocher2013-11-22-1/+1
| * | net: rtl8169: Add support for RTL8168evl/8111evlThierry Reding2013-11-22-0/+1
| * | net: rtl8169: Fix format stringThierry Reding2013-11-22-5/+5
| * | net: add support for extended registers to mdio commandStefano Babic2013-11-22-16/+59
| * | net: add function to read/write extended registers in Micrel PhyStefano Babic2013-11-22-0/+32
| * | net: add extended function to phy APIStefano Babic2013-11-22-0/+3
| * | net: fix mask for phy Micrel KSZ9031Stefano Babic2013-11-22-1/+1
| * | phy: add missing constants for Micrel KSZ9031Stefano Babic2013-11-22-0/+5
| * | net/phy: realtek: Fix the PHY ID mask to ensure the correct Realtek PHY is de...Bhupesh Sharma2013-11-22-3/+3
| * | net: phy/vitesse: Add support for VSC8514 phy moduleArpit Goel2013-11-22-1/+68
| * | net: sh-eth: Add support R8A7790Nobuhiro Iwamatsu2013-11-22-1/+11
| * | net: sh-eth: Add invalidate cache control for rmobile (ARM SoC)Nobuhiro Iwamatsu2013-11-22-5/+26
| * | net: sh-eth: Add control for padding size of packet descriptorNobuhiro Iwamatsu2013-11-22-10/+30
| * | net: sh-eth: Change cache API of SHNobuhiro Iwamatsu2013-11-22-1/+2
| * | NET: mvgbe: avoid unused variable warning when used without phylib supportSascha Silbe2013-11-22-2/+3
| * | net: trivial: Fix typos in mii field descriptionsStephan Bauroth2013-11-22-2/+2
| * | phylib: update atheros ar803x phyShengzhou Liu2013-11-22-2/+2
| * | net: tftp: Make sure timeout will not effect wrap offsetrockly2013-11-22-1/+1
| |/
* | Merge branch 'master' of git://git.denx.de/u-boot-nand-flashTom Rini2013-11-25-220/+532
|\ \
| * | am335x: fix GPMC config for NAND and NOR SPL bootpekon gupta2013-11-21-41/+30
| * | mtd: nand: omap: add CONFIG_NAND_OMAP_ECCSCHEME for selection of ecc-schemepekon gupta2013-11-21-15/+43