Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods
authorDavid S. Miller <davem@davemloft.net>
Tue, 21 Dec 2010 21:26:15 +0000 (13:26 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 21 Dec 2010 21:26:15 +0000 (13:26 -0800)
1  2 
drivers/net/bnx2.c

Simple merge