From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:29:57 +0000 (+1100)
Subject: Merge remote-tracking branch 'kbuild/for-next'
X-Git-Tag: next-20111103~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=963a01821769da1a427957d2d59cc0c9562ef5ab;p=karo-tx-linux.git

Merge remote-tracking branch 'kbuild/for-next'

Conflicts:
	drivers/net/ethernet/stmicro/stmmac/Kconfig
---

963a01821769da1a427957d2d59cc0c9562ef5ab