tree 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5
parent fece418418f51e92dd7e67e17c5e3fe5a28d3279
parent 6e86841d05f371b5b9b86ce76c02aaee83352298
author Anton Vorontsov <cbouatmailru@gmail.com> 1217369123 +0400
committer Anton Vorontsov <cbouatmailru@gmail.com> 1217369123 +0400

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

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile