tree 9c548931dced2383c7eb8978b4fb2696a46d1a49
parent f29251ff532ca1124d14a03b040ba097edc6e9c0
parent 3cff484d4b264ff467a3b45c544cbbbab69f0bf8
author Russell King <rmk+kernel@arm.linux.org.uk> 1305583609 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1305583609 +0100

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