original_kernel/arch/arm/mach-netx
Russell King 7b9dd47136 Merge branch 'restart' into for-linus
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
2012-01-05 13:25:27 +00:00
..
include/mach Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Kconfig
Makefile
Makefile.boot
fb.c
fb.h
generic.c
generic.h
nxdb500.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
nxdkn.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
nxeb500hmi.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
pfifo.c
time.c
xc.c