tree ffa66c2c788af7a0b9c23e0c3a28e2ab81e5b7f4
parent 74b8721099992b76d3faff78cb8a5d13c65c3529
parent 57475b1a47b3e891ce087ca3c6fc93f5a446a244
author Russell King <rmk+kernel@arm.linux.org.uk> 1273864186 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1273864186 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable