Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Linus Torvalds [Tue, 15 Nov 2011 16:47:28 +0000 (14:47 -0200)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  fsl-rio: fix compile error


Trivial merge