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

Merge branch 'pxa-palm' into pxa-machines 

Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
parents 5ff7f78a 4e9687d9
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