Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit ef1a6884 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable 

Conflicts:
	arch/arm/mach-at91/Kconfig
parents 1508c995 0912e535
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