3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727 - linux

commit: 3c0c01ab742ddfaf6b6f2d64b890e77cda4b7727
[log]
author: Russell King <rmk+kernel@arm.linux.org.uk>
Sat Jun 29 11:44:43 2013 +0100
committer: Russell King <rmk+kernel@arm.linux.org.uk>
Sat Jun 29 11:44:43 2013 +0100
tree: d0f196c53d209f44190fd8a6481823b7770866e6
parent: cbd379b10019617457bda31eb243890f4377fa3e [diff]
parent: 809e660f438fc5a69bf57630a85bcd8112263f37 [diff]

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/Makefile
	arch/arm/include/asm/glue-proc.h

tree: d0f196c53d209f44190fd8a6481823b7770866e6