tree 75b91356ca39463e0112931aa6790802fb1e07a2
parent fda0e18c8a7a3e02747c2b045b4fcd2c920410b9
parent a3685f00652af83f12b63e3b4ef48f29581ba48b
author Russell King <rmk+kernel@arm.linux.org.uk> 1274113444 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1274113444 +0100

Merge branch 'devel-stable' into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/system.h
	arch/arm/mm/Kconfig