From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 21 Feb 2013 15:16:55 +0000 (+0100)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... 
X-Git-Tag: v3.9-rc1~26^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edb15d83a875a1f4b1576188844db5c330c3267d;p=pandora-kernel.git

Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux into mips-for-linux-next

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
---

edb15d83a875a1f4b1576188844db5c330c3267d
Reading git-diff-tree failed