Merge branch 'for_david' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Sat, 26 Nov 2011 19:26:24 +0000 (14:26 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sat, 26 Nov 2011 19:26:24 +0000 (14:26 -0500)

Trivial merge