| commit | 642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 15 14:47:28 2011 -0200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 15 14:47:28 2011 -0200 |
| tree | 1d169633e0c0045bf1f5d215f68791b36228f146 | |
| parent | 80f01ca1fce2d5045b98f01989017767339b8700 [diff] | |
| parent | e0ce42e19ce1978a5aee33b2954d7e1a730e88c4 [diff] |
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