From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 28 Jun 2013 04:27:22 +0000 (+1000)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20130628~40
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=176dd8b7c73cd775bce1e8120d4f07fa0916f455;p=karo-tx-linux.git

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

Conflicts:
	Documentation/networking/netlink_mmap.txt
---

176dd8b7c73cd775bce1e8120d4f07fa0916f455