From: Anton Vorontsov <cbouatmailru@gmail.com>
Date: Sat, 18 Oct 2008 16:28:24 +0000 (+0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~93^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed8c3174dd227031d1f3b9fa4fbb512f8f623434;p=pandora-kernel.git

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

Conflicts:

	drivers/power/Makefile
---

ed8c3174dd227031d1f3b9fa4fbb512f8f623434
Reading git-diff-tree failed