From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 2 Apr 2013 12:24:04 +0000 (+0100)
Subject: ARM: ux500: Use de-globalised version of id.h
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~131^2~25^2~38
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fbc800726aaece4c549358e56ee774dcc089960;p=pandora-kernel.git

ARM: ux500: Use de-globalised version of id.h

Following commit: "7a4f260 ARM: ux500: de-globalize <mach/id.h>",
the use of 'mach/id.h' is no longer valid. This patch continues
the work of the aforementioned commit on patches applied around
the same time, containing the merge-conflict.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

Reading git-diff-tree failed