From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 6 May 2013 21:43:45 +0000 (+0200)
Subject: Merge branch 'late/clksrc' into late/cleanup
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~7^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=442a33ebce9e02a2dd6662f16c9f2aad834d0115;p=pandora-kernel.git

Merge branch 'late/clksrc' into late/cleanup

There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.

Conflicts:
	arch/arm/mach-spear/spear13xx.c
	drivers/irqchip/Makefile
---

442a33ebce9e02a2dd6662f16c9f2aad834d0115
Reading git-diff-tree failed