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

This commit is contained in:
Russell King 2011-05-16 23:06:49 +01:00
commit 1e87347c2f
43 changed files with 2219 additions and 3521 deletions