From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Nov 2011 16:47:28 +0000 (-0200)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03;p=openwrt%2Fstaging%2Fblogic.git

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
---

642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03