Merge branch 'u300' into devel
Conflicts: arch/arm/Makefile Updates: arch/arm/mach-u300/core.c arch/arm/mach-u300/timer.c
Showing
arch/arm/configs/u300_defconfig
0 → 100644
arch/arm/mach-u300/Kconfig
0 → 100644
arch/arm/mach-u300/Makefile
0 → 100644
arch/arm/mach-u300/Makefile.boot
0 → 100644
arch/arm/mach-u300/clock.c
0 → 100644
arch/arm/mach-u300/clock.h
0 → 100644
arch/arm/mach-u300/core.c
0 → 100644
arch/arm/mach-u300/gpio.c
0 → 100644
arch/arm/mach-u300/mmc.c
0 → 100644
arch/arm/mach-u300/mmc.h
0 → 100644
arch/arm/mach-u300/padmux.c
0 → 100644
arch/arm/mach-u300/padmux.h
0 → 100644
arch/arm/mach-u300/timer.c
0 → 100644
arch/arm/mach-u300/u300.c
0 → 100644
想要评论请 注册 或 登录