Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 23 Apr 2009 11:08:24 +0000 (04:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Apr 2009 11:08:24 +0000 (04:08 -0700)
commit5802b140ed52957ad150eaf40239a95f5f45fbd3
treee5c37962611bc5f39c56a1ec479b9059072f056a
parent09488e2e0fab14ebe41135f0d066cfe2c56ba9e5
parent29fe1b481283a1bada994a69f65736db4ae6f35f
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/iucv/af_iucv.c
drivers/net/8139too.c
drivers/net/ucc_geth.c
net/iucv/af_iucv.c