Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-11 15:37:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/drivers
History
Albert ARIBAUD 3e11350255 Merge branch 'u-boot/master' into 'u-boot-arm/master' 
Conflicts:
	Makefile
	drivers/net/npe/Makefile

These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
2014-02-20 13:16:05 +01:00
..
bios_emulator kbuild: use Linux Kernel build scripts 2014-02-19 11:07:50 -05:00
block sandbox: block driver using host file/device as backing store 2014-01-08 17:24:03 -07:00
bootcount am33xx: Make SoC bootcount driver have its own symbol 2013-11-11 12:17:35 -05:00
crypto drivers: convert makefiles to Kbuild style 2013-10-31 13:26:01 -04:00
ddr/fsl powerpc/mpc85xx: Revise workaround for DDR-A003 2014-01-21 13:40:52 -08:00
dfu dfu: Export allocated dfu buffer size 2013-12-18 19:53:19 +01:00
dma drivers: convert makefiles to Kbuild style 2013-10-31 13:26:01 -04:00
fpga fpga: zynq: Correct fpga load when buf is not aligned 2014-02-06 10:08:03 +01:00
gpio s5p: gpio: change gpio coding method for s5p gpio. 2014-02-03 15:36:14 +09:00
hwmon kbuild: use Linux Kernel build scripts 2014-02-19 11:07:50 -05:00
i2c ARM: IXP: Remove the IXP architecture support 2014-02-06 02:51:52 +01:00
input drivers: convert makefiles to Kbuild style 2013-10-31 13:26:01 -04:00
misc Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2014-01-06 08:49:58 +01:00
mmc Merge branch 'master' of git://git.denx.de/u-boot-arm 2014-02-17 14:22:02 -05:00
mtd driver/ifc:Change accessor function to take care of endianness 2014-02-03 08:38:51 -08:00
net Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-02-20 13:16:05 +01:00
pci Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' 2014-02-19 12:04:45 +01:00
pcmcia drivers: convert makefiles to Kbuild style 2013-10-31 13:26:01 -04:00
power trats2: Code cleanup. 2014-02-03 15:36:14 +09:00
qe drivers/qe: move the entry to drivers/Makefile 2013-11-17 14:11:31 -05:00
rtc kbuild: use Linux Kernel build scripts 2014-02-19 11:07:50 -05:00
serial serial_zynq: Migrate to Zynq clock framework 2014-02-19 09:41:22 +01:00
sound drivers: convert makefiles to Kbuild style 2013-10-31 13:26:01 -04:00
spi Merge branch 'master' of git://git.denx.de/u-boot-arm 2014-01-16 13:50:16 -05:00
tpm sandbox: tpm: Fix nvwrite command 2014-01-08 17:26:17 -07:00
twserial drivers: convert makefiles to Kbuild style 2013-10-31 13:26:01 -04:00
usb Merge branch 'u-boot/master' into 'u-boot-arm/master' 2014-02-20 13:16:05 +01:00
video video: exynos: fimd: add support for various display color modes 2014-02-03 15:36:14 +09:00
watchdog Merge branch 'iu-boot/master' into 'u-boot-arm/master' 2013-11-09 22:59:47 +01:00
Makefile drivers/qe: move the entry to drivers/Makefile 2013-11-17 14:11:31 -05:00