Skip to content
GitLab
Commit 9fec6060 authored by Anton Vorontsov's avatar Anton Vorontsov
Browse files

Merge branch 'master' of /home/cbou/linux-2.6 

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile
parents fece4184 6e86841d
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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