git.karo-electronics.de Git - karo-tx-linux.git/commit

Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9_alt_reset.S
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-cpu9krea.c
arch/arm/mach-at91/board-cpuat91.c
arch/arm/mach-at91/board-snapper9260.c
arch/arm/mach-at91/generic.h
arch/arm/mach-at91/include/mach/system.h
arch/arm/mach-at91/setup.c
include/linux/platform_data/macb.h

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 28 Nov 2011 23:58:20 +0000 (10:58 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 28 Nov 2011 23:58:20 +0000 (10:58 +1100)
commit	dcd6db58cb7c7488043f406491b157ecbcef4a69
tree	13d2920a0d7a84ebfe743a83e6dfd0e9e5981ab0	tree \| snapshot
parent	4b6513706f037f1541cd99dda18281a19d8b87fa	commit \| diff
parent	7d288097164b7aed33dda62791ac9a76994df20b	commit \| diff

arch/arm/mach-at91/at91cap9.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9260.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9263.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/setup.c	diff1 \|	diff2 \|	blob \| history