2e0e943436912ffe0848ece58167edfe754edb96 - linux

commit: 2e0e943436912ffe0848ece58167edfe754edb96
[log]
author: Russell King <rmk+kernel@arm.linux.org.uk>
Thu Jan 05 13:24:33 2012 +0000
committer: Russell King <rmk+kernel@arm.linux.org.uk>
Thu Jan 05 13:24:33 2012 +0000
tree: b91919095c74742fa06e2105db6d859bee39b2b4
parent: a32737e1ca650504f172292dd344eb64c02311f3 [diff]
parent: ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 [diff]

Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c

tree: b91919095c74742fa06e2105db6d859bee39b2b4