From: David S. Miller <davem@davemloft.net>
Date: Mon, 13 Apr 2009 21:41:05 +0000 (-0700)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Tag: v2.6.30-rc3~78^2~42
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83400207a07584539366f6859362db6872809a12;p=pandora-kernel.git

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	MAINTAINERS
---

83400207a07584539366f6859362db6872809a12
Reading git-diff-tree failed