Albert ARIBAUD 4b19b7448e Merge remote-tracking branch 'u-boot-imx/master' ...

The single file conflict below is actually trivial.

Conflicts:
	board/boundary/nitrogen6x/nitrogen6x.c

2014-10-08 21:20:49 +02:00

..

bios_emulator

kbuild: use Linux Kernel build scripts

2014-02-19 11:07:50 -05:00

block

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

bootcount

qe: move immap_qe.h from arch directory into common directory

2014-07-22 16:25:54 -07:00

core

kbuild: refactor some makefiles

2014-09-24 18:30:29 -04:00

crypto

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

ddr/fsl

driver/ddr/fsl: Fix DDR4 driver

2014-09-25 08:36:20 -07:00

demo

kbuild: refactor some makefiles

2014-09-24 18:30:29 -04:00

dfu

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

dma

cosmetic: replace MIN, MAX with min, max

2014-09-24 18:30:29 -04:00

fpga

m68k: Fix warnings with gcc 4.6

2014-06-11 16:27:05 -04:00

gpio

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

hwmon

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

i2c

cosmetic: replace MIN, MAX with min, max

2014-09-24 18:30:29 -04:00

input

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

memory

ARM: keystone: aemif: move aemif driver to drivers/memory/ti-aemif.c

2014-06-19 17:53:58 -04:00

misc

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

mmc

cosmetic: replace MIN, MAX with min, max

2014-09-24 18:30:29 -04:00

mtd

Merge remote-tracking branch 'u-boot-imx/master'

2014-10-08 21:20:49 +02:00

net

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

2014-09-26 09:51:18 -04:00

pci

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

pcmcia

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

power

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

pwm

pwm, imx6: add support for pwm modul on imx6

2014-07-23 12:25:42 +02:00

qe

net: Merge asm/fsl_enet.h into fsl_mdio.h

2014-09-08 10:30:33 -07:00

rtc

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

serial

serial: add UniPhier serial driver

2014-10-05 14:10:09 +09:00

sound

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

spi

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

tpm

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

twserial

drivers: convert makefiles to Kbuild style

2013-10-31 13:26:01 -04:00

usb

Merge remote-tracking branch 'u-boot-imx/master'

2014-10-08 21:20:49 +02:00

video

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

watchdog

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

Kconfig

kconfig: add blank Kconfig files

2014-09-24 18:30:28 -04:00

Makefile

kbuild: refactor some makefiles

2014-09-24 18:30:29 -04:00