From: Jiri Kosina <jkosina@suse.cz>
Date: Wed, 11 Aug 2010 07:36:51 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v2.6.37-rc1~139^2~34
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6396fc3b3ff3f6b942992b653a62df11dcef9bea;p=pandora-kernel.git

Merge branch 'master' into for-next

Conflicts:
	fs/exofs/inode.c
---

6396fc3b3ff3f6b942992b653a62df11dcef9bea
Reading git-diff-tree failed