Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes

This commit is contained in:
Russell King 2011-03-28 18:57:19 +01:00
commit 255bae73b2
4 changed files with 17 additions and 13 deletions