From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2009 21:15:57 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://linux-arm.org/linux-2.6
X-Git-Tag: v2.6.31-rc1~382
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=512626a04e72aca60effe111fa0333ed0b195d21;p=pandora-kernel.git

Merge branch 'for-linus' of git://linux-arm.org/linux-2.6

* 'for-linus' of git://linux-arm.org/linux-2.6:
  kmemleak: Add the corresponding MAINTAINERS entry
  kmemleak: Simple testing module for kmemleak
  kmemleak: Enable the building of the memory leak detector
  kmemleak: Remove some of the kmemleak false positives
  kmemleak: Add modules support
  kmemleak: Add kmemleak_alloc callback from alloc_large_system_hash
  kmemleak: Add the vmalloc memory allocation/freeing hooks
  kmemleak: Add the slub memory allocation/freeing hooks
  kmemleak: Add the slob memory allocation/freeing hooks
  kmemleak: Add the slab memory allocation/freeing hooks
  kmemleak: Add documentation on the memory leak detector
  kmemleak: Add the base support

Manual conflict resolution (with the slab/earlyboot changes) in:
	drivers/char/vt.c
	init/main.c
	mm/slab.c
---

512626a04e72aca60effe111fa0333ed0b195d21
Reading git-diff-tree failed