tree ca8654a286f61da917318645cab9e061095ecdba
parent a94d236dc355f374857ee4e6e78b7dec8a0f29e3
parent f31c2f1c68aff83277eddc6798adf3438e9c680a
author Arnd Bergmann <arnd@arndb.de> 1367876625 +0200
committer Arnd Bergmann <arnd@arndb.de> 1367876625 +0200

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