From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 28 Mar 2009 20:30:18 +0000 (+0000)
Subject: Merge branch 'master' into devel
X-Git-Tag: v2.6.30-rc1~636^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9759d22c8348343b0da4e25d6150c41712686c14;p=pandora-kernel.git

Merge branch 'master' into devel

Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c
---

9759d22c8348343b0da4e25d6150c41712686c14
Reading git-diff-tree failed