9
0
Fork 0
barebox/arch
Sascha Hauer efa4d684d8 Merge branch 'for-next/misc'
Conflicts:
	arch/arm/boards/chumby_falconwing/falconwing.c
	arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
	arch/x86/mach-x86.dox
	scripts/setupmbr/setupmbr.c
2014-07-04 17:27:06 +02:00
..
arm Merge branch 'for-next/misc' 2014-07-04 17:27:06 +02:00
blackfin Documentation: remove doxygen documentation 2014-06-26 10:09:52 +02:00
mips Merge branch 'for-next/mips' 2014-07-04 17:26:05 +02:00
nios2 treewide: remove address of the Free Software Foundation 2014-06-11 08:35:25 +02:00
openrisc treewide: remove address of the Free Software Foundation 2014-06-11 08:35:25 +02:00
ppc Merge branch 'for-next/misc' 2014-07-04 17:27:06 +02:00
sandbox Merge branch 'for-next/misc' 2014-07-04 17:27:06 +02:00
x86 Merge branch 'for-next/misc' 2014-07-04 17:27:06 +02:00