]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
Merge branch 'batman-adv/merge-oopsonly' of git://git.open-mesh.org/ecsv/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 06:16:34 +0000 (22:16 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 31 Jan 2011 06:16:34 +0000 (22:16 -0800)

Trivial merge