From: Jiri Kosina <jkosina@suse.cz>
Date: Sun, 8 Apr 2012 19:48:52 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.5-rc1~137^2~39
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e75d660672ddd11704b7f0fdb8ff21968587b266;p=pandora-kernel.git

Merge branch 'master' into for-next

Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.

Conflicts:
	drivers/net/ethernet/realtek/r8169.c
---

e75d660672ddd11704b7f0fdb8ff21968587b266
Reading git-diff-tree failed