Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion

This commit is contained in:
Russell King 2010-09-23 11:52:04 +01:00
commit 94bf275866
5 changed files with 12 additions and 11 deletions