Merge branch 'for-next/misc'
Conflicts:
	commands/devinfo.c
commit 6331e58a2c99009587eeb2252d0c6ac9de882c1c
2 parents 4c37b77 + ae6d0b9
@Sascha Hauer Sascha Hauer authored on 4 Jun 2014
Showing 12 changed files
View
arch/arm/boards/Makefile
View
arch/arm/boards/sama5d3_xplained/Makefile 0 → 100644
View
arch/arm/boards/sama5d3_xplained/env/config 0 → 100644
View
arch/arm/boards/sama5d3_xplained/init.c 0 → 100644
View
arch/arm/configs/sama5d3_xplained_defconfig 0 → 100644
View
arch/arm/mach-at91/Kconfig
View
commands/devinfo.c
View
common/hush.c
View
drivers/eeprom/at25.c
View
drivers/mtd/devices/m25p80.c
View
drivers/mtd/partition.c
View
lib/vsprintf.c