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

This commit is contained in:
Russell King 2010-05-14 20:09:46 +01:00
commit b12f3cbd7a
6 changed files with 574 additions and 6 deletions