Home
last modified time | relevance | path

Searched hist:"2 c601c7208713ba9b2158c57adcf515f4bdbc212" (Results 1 – 25 of 272) sorted by relevance

1234567891011

/rk3399_rockchip-uboot/arch/x86/dts/
H A Dskeleton.dtsi2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/include/
H A Dphysmem.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/lib/
H A Dphysmem.c2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/drivers/usb/musb-new/
H A Dmusb_debug.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Domap2430.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dmusb_host.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dmusb_gadget.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/arch/x86/cpu/coreboot/
H A Dcar.S2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/arch/x86/include/asm/
H A Dcontrol_regs.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dbitops.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/include/power/
H A Dmax8997_muic.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dpower_chrg.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dbattery.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dfg_battery_cell_params.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dmax17042_fg.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/drivers/power/pmic/
H A Dmuic_max8997.c2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dpmic_max8998.c2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/lib/lzma/
H A DLzmaDec.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dlzma.txt2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A DTypes.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A DLzmaDec.c2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
H A Dhistory.txt2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/drivers/power/
H A Dpower_dialog.c2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/board/freescale/corenet_ds/
H A Dp5040ds_ddr.c2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h
/rk3399_rockchip-uboot/arch/powerpc/include/asm/
H A Dspl.h2c601c7208713ba9b2158c57adcf515f4bdbc212 Mon Dec 10 04:44:41 UTC 2012 Minkyu Kang <mk7.kang@samsung.com> Merge branch 'master' of git://git.denx.de/u-boot into resolve

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h

1234567891011