Merge branch 'for-next/rs485'
Conflicts:
	common/console_common.c
commit ebf9022f2eee564fc4b0e4b37a8267319923d808
2 parents a293dc2 + 7359e28
@Sascha Hauer Sascha Hauer authored on 7 Oct 2013
Showing 7 changed files
View
arch/arm/boards/animeo_ip/init.c
View
arch/arm/configs/animeo_ip_defconfig
View
common/console_common.c
View
common/startup.c
View
drivers/serial/atmel.c
View
include/common.h
View
include/console.h