Merge branch 'gianfar-bql' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...
authorDavid S. Miller <davem@davemloft.net>
Mon, 19 Mar 2012 20:46:22 +0000 (16:46 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 19 Mar 2012 20:46:22 +0000 (16:46 -0400)

Trivial merge