From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 May 2010 06:01:55 +0000 (-0700)
Subject: Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
X-Git-Tag: v2.6.35-rc1~473^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ec8c6bb5d8f3a62a79f463525054bae1e3d4487;p=pandora-kernel.git

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

Conflicts:
	include/linux/mod_devicetable.h
	scripts/mod/file2alias.c
---

2ec8c6bb5d8f3a62a79f463525054bae1e3d4487
Reading git-diff-tree failed