From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 11 Oct 2012 00:52:45 +0000 (+1100)
Subject: Merge remote-tracking branch 'kmemleak/kmemleak'
X-Git-Tag: next-20121011~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a31254ab6c803d7852455ec95a8bcda274741dc4;p=karo-tx-linux.git

Merge remote-tracking branch 'kmemleak/kmemleak'

Conflicts:
	mm/kmemleak.c
---

a31254ab6c803d7852455ec95a8bcda274741dc4