Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
authorDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2012 23:31:32 +0000 (19:31 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 8 May 2012 23:31:32 +0000 (19:31 -0400)

Trivial merge