From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 30 Mar 2009 13:14:53 +0000 (+0200)
Subject: Merge branch 'autosuspend' into for-next
X-Git-Tag: v2.6.30-rc1~219^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=621de593081524da2f0f7b060f5951b4155eb4a2;p=pandora-kernel.git

Merge branch 'autosuspend' into for-next

Conflicts:

	drivers/hid/hid-core.c
---

621de593081524da2f0f7b060f5951b4155eb4a2
Reading git-diff-tree failed