From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Nov 2012 04:49:18 +0000 (+1100)
Subject: Merge remote-tracking branch 'drop-experimental/linux-next'
X-Git-Tag: next-20121113~8
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b6ff140ebe29241846e3b5578777a80d5e435c7d;p=karo-tx-linux.git

Merge remote-tracking branch 'drop-experimental/linux-next'

Conflicts:
	drivers/net/ethernet/intel/Kconfig
	drivers/ptp/Kconfig
---

b6ff140ebe29241846e3b5578777a80d5e435c7d