Skip to content
Commit 6ee6c6ad authored by Pierre Ossman's avatar Pierre Ossman
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/atmel-mci-2.6.28 

Conflicts:
	drivers/mmc/host/atmel-mci.c
parents 162350eb 5e7184ae
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