From: Nils Faerber <nils.faerber@kernelconcepts.de>
Date: Fri, 7 Jan 2011 10:50:01 +0000 (+0100)
Subject: Merge branch 'master' into csb1725
X-Git-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=59f40aff7930052a74ddf5c297aa1974b0838529

Merge branch 'master' into csb1725

Conflicts:
	arch/arm/mach-mv78xx0/mpp.c
resolved
---

59f40aff7930052a74ddf5c297aa1974b0838529