tree 92f55e374a84d06ce8213a4540454760fdecf137
parent 8ef12c9f01afba47c2d33bb939085111ca0d0f7d
parent 5367f2d67c7d0bf1faae90e6e7b4e2ac3c9b5e0f
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1136834313 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1136834313 +0000

Merge Linus' tree.