Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 14 Jan 2011 20:43:10 +0000 (12:43 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 14 Jan 2011 20:43:10 +0000 (12:43 -0800)
commit3b8f5945a24c78c77a88bd747812f7e07e075c7c
treedbd120f16acc181f662fe99dbfec9ea29d24dd5a
parent886d7f444cbf72d5a424ea5fee4e34a0219d4af1
parentaf667a29dd3dfc0464f83bac30cc3c63fe5d0206
Merge branch 'master' of /linux/kernel/git/jkirsher/net-2.6