Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
commit642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:47:28 +0000 (15 14:47 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:47:28 +0000 (15 14:47 -0200)
tree1d169633e0c0045bf1f5d215f68791b36228f146
parent80f01ca1fce2d5045b98f01989017767339b8700
parente0ce42e19ce1978a5aee33b2954d7e1a730e88c4
Merge branch 'for-linus' of git://git./linux/kernel/git/paulg/linux

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  fsl-rio: fix compile error