Skip to content
Commit 8f9993f7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into next/cleanup 

* 'at91-3.4-base' of git://github.com/at91linux/linux-at91:
  ARM: at91: code removal of CAP9 SoC

Conflicts:
	arch/arm/mach-at91/at91cap9.c
parents a5f17d1f 9918ceaf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment