From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Nov 2012 02:00:09 +0000 (+1100)
Subject: Merge remote-tracking branch 'slab/for-next'
X-Git-Tag: next-20121108~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=71c18ea28da0cb5714f0a6e3084b6111565037cb;p=karo-tx-linux.git

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

Conflicts:
	mm/slob.c
---

71c18ea28da0cb5714f0a6e3084b6111565037cb