]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 11 Oct 2010 19:30:34 +0000 (12:30 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Oct 2010 19:30:34 +0000 (12:30 -0700)
commit066bfe7cadb874bc8289a3331ea6ab0b886a9754
tree63a48b333e7565967b6d7c9e246557bfcb9f225f
parentecf9cc1a024d9a4fea3dc373146461e063806fbb
parent844be28b2070829429de4cf0b2c72ba047c406df
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
net/core/ethtool.c
drivers/atm/iphase.c
drivers/net/r8169.c
drivers/net/wimax/i2400m/rx.c
net/core/ethtool.c