Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-12 16:07:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/drivers
History
Stefano Babic 05a860c228 Merge branch 'master' of git://git.denx.de/u-boot into master 
Conflicts:
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/woodburn_common.h
	board/woodburn/woodburn.c

These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.

Fix all conflicts and update woodburn to use Power Framework.

Signed-off-by: Stefano Babic <sbabic@denx.de>
2012-12-08 12:02:45 +01:00
..
bios_emulator Add abs() macro to return absolute value 2012-05-15 08:31:37 +02:00
block drivers/block/: sparse fixes 2012-11-04 11:00:37 -07:00
bootcount Consolidate bootcount code into drivers/bootcount 2012-09-01 14:26:02 +02:00
dfu dfu:usb:fix: Read the "filesize" environment variable only when file read 2012-09-21 00:05:00 +02:00
dma MX28: DMA: Prolong the DMA timeout 2012-09-01 14:58:29 +02:00
fpga FPGA: Cyclon II: Correctly reset the FPGA before configuration 2012-10-29 14:21:20 -07:00
gpio Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
hwmon hwmon: do not init sensors on startup 2011-08-04 23:30:38 +02:00
i2c Merge branch 'master' of git://git.denx.de/u-boot-arm 2012-10-26 15:44:31 -07:00
input drivers/input/input.c: sparse fix 2012-11-04 11:00:37 -07:00
misc x86: Add console command to display CBMEM console buffer 2012-11-30 13:44:03 -08:00
mmc mmc: Properly determine maximum supported bus width 2012-11-27 17:48:46 -06:00
mtd nand: Add torture feature 2012-11-26 15:41:29 -06:00
net powerpc/85xx: add support for the Freescale P5040DS Superhydra reference board 2012-11-27 18:28:06 -06:00
pci powerpc/p4080ds: fix PCI-e x8 link training down failure 2012-11-27 18:28:07 -06:00
pcmcia PXA: Remove PXA PCMCIA support 2012-03-26 23:09:23 +02:00
power Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
qe mpc83xx: add support for mpc8309 2012-10-23 15:23:26 -05:00
rtc pmic: Extend PMIC framework to support multiple instances of PMIC devices 2012-11-14 11:21:09 +01:00
serial serial_pl011: Set RTS during initialization 2012-12-07 08:47:52 -07:00
spi spi: mxc_spi: Fix spi clock glitch durant reset 2012-11-19 08:49:00 +01:00
tpm Introduce generic TPM support in u-boot 2011-12-07 08:45:51 +01:00
twserial Switch from archive libraries to partial linking 2010-11-17 21:02:18 +01:00
usb Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
video Merge branch 'master' of git://git.denx.de/u-boot into master 2012-12-08 12:02:45 +01:00
watchdog dm: wdt: arm: Move tnetv107x into drivers/watchdog/ 2012-10-18 06:52:02 +02:00