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

This commit is contained in:
Russell King 2010-12-18 14:28:31 +00:00
commit 9326845f45
14 changed files with 912 additions and 13 deletions