tree 6020618997a6ea1b5f5b59c89df35344023f7c82
parent 7cc026f21e2acdcea8640df5da470c6fdca92911
parent 489e7bece7f6859a7df484a4dce08fa51fb0d876
author Arnd Bergmann <arnd@arndb.de> 1332283344 +0000
committer Arnd Bergmann <arnd@arndb.de> 1332283344 +0000

Merge branch 'next/fixes-non-critical' into next/drivers

Conflicts:
	arch/arm/mach-lpc32xx/clock.c
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c

The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>