tree 1d169633e0c0045bf1f5d215f68791b36228f146
parent 80f01ca1fce2d5045b98f01989017767339b8700
parent e0ce42e19ce1978a5aee33b2954d7e1a730e88c4
author Linus Torvalds <torvalds@linux-foundation.org> 1321375648 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321375648 -0200

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

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