From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 22 Dec 2010 17:57:02 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v2.6.38-rc1~245^2~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b7bd364700d9ac8372eff48832062b936d0793b;p=pandora-kernel.git

Merge branch 'master' into for-next

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.
---

4b7bd364700d9ac8372eff48832062b936d0793b
Reading git-diff-tree failed