tree bac4953f8899d6600f4716c0bcde1e25e34c2591
parent 8aef7e8f8de2d900da892085edbf14ea35fe6881
parent 0cfd81031a26717fe14380d18275f8e217571615
author Anton Vorontsov <cbouatmailru@gmail.com> 1224347304 +0400
committer Anton Vorontsov <cbouatmailru@gmail.com> 1224347304 +0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/power/Makefile