From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 04:16:25 +0000 (+1000)
Subject: Merge remote-tracking branch 'trivial/for-next'
X-Git-Tag: next-20130619~39
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=32dc1c70ab2bbc1d1fee86ae8676651a96c9e24a;p=karo-tx-linux.git

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

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

32dc1c70ab2bbc1d1fee86ae8676651a96c9e24a