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

Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm 

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
	drivers/pcmcia/Kconfig
	drivers/pcmcia/Makefile
parents 1543966a 19ec95df
Expand all 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