From: Anton Vorontsov <cbouatmailru@gmail.com>
Date: Tue, 29 Jul 2008 22:05:23 +0000 (+0400)
Subject: Merge branch 'master' of /home/cbou/linux-2.6
X-Git-Tag: v2.6.27-rc2~110^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6;p=pandora-kernel.git

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

Conflicts:

	drivers/power/Kconfig
	drivers/power/Makefile
---

9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6
Reading git-diff-tree failed