From: David Vrabel <david.vrabel@csr.com>
Date: Mon, 20 Oct 2008 15:07:19 +0000 (+0100)
Subject: Merge branch 'master' into for-upstream
X-Git-Tag: v2.6.28-rc1~59^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61e0e79ee3c609eb34edf2fe023708cba6a79b1f;p=pandora-kernel.git

Merge branch 'master' into for-upstream

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile
---

61e0e79ee3c609eb34edf2fe023708cba6a79b1f
Reading git-diff-tree failed