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)
commit503b1a529a6b62b31904bab4699752c523cf76b2
treec78d1850e9409295ad720b56ceb0d28efe9d0e39
parent4b4f54670859074cf7670cc6fa96fe34a65846d9
parent215faf9c5f6e319e97edea9e178123e07825c14d
Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods
drivers/net/bnx2.c