From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 12 Nov 2012 01:18:06 +0000 (+1100)
Subject: Merge remote-tracking branch 'slab/for-next'
X-Git-Tag: next-20121112~56
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ea326ca0d974b81ead43dae175c768dd974e81c4;p=karo-tx-linux.git

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

Conflicts:
	mm/slob.c
---

ea326ca0d974b81ead43dae175c768dd974e81c4