From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 22:11:46 +0000 (+0100)
Subject: Merge branch 'depends/rmk/memory_h' into next/fixes
X-Git-Tag: v3.2-rc1~99^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5725aeae5ff2e39f3815bbef788ee326c9afea2c;p=pandora-kernel.git

Merge branch 'depends/rmk/memory_h' into next/fixes

Fix up all conflicts between the memory.h cleanup and bug fixes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

5725aeae5ff2e39f3815bbef788ee326c9afea2c
Reading git-diff-tree failed