diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:37 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-02 14:16:47 +0200 |
| commit | ba67cf5cf2ce10ad86a212b70f8c7c75d93a5016 (patch) | |
| tree | 70242f5927c6d6454bd352ff78f956cfc5238f59 /drivers/net/bcm63xx_enet.c | |
| parent | aff364860aa105b2deacc6f21ec8ef524460e3fc (diff) | |
| parent | 2be19102b71c1a45d37fec50303791daa1a06869 (diff) | |
Merge branch 'x86/urgent' into x86-mm
Merge reason: Pick up the following two fix commits.
2be19102b7: x86, NUMA: Fix empty memblk detection in numa_cleanup_meminfo()
765af22da8: x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
Scheduled NUMA init 32/64bit unification changes depend on these.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/net/bcm63xx_enet.c')
| -rw-r--r-- | drivers/net/bcm63xx_enet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index e94a966af41..c48104b0886 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c @@ -597,7 +597,7 @@ static int bcm_enet_set_mac_address(struct net_device *dev, void *p) } /* - * Change rx mode (promiscous/allmulti) and update multicast list + * Change rx mode (promiscuous/allmulti) and update multicast list */ static void bcm_enet_set_multicast_list(struct net_device *dev) { |