Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
authorDavid S. Miller <davem@davemloft.net>
Tue, 4 Sep 2012 19:17:52 +0000 (15:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 4 Sep 2012 19:17:52 +0000 (15:17 -0400)

Trivial merge