diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-12 12:39:09 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-12 12:39:09 +1100 |
| commit | afb8761150f3f58904a3de765d550460291dd307 (patch) | |
| tree | 53ef6f091591919cc3f0c52c4bebf887f3525fd0 /drivers/net/tun.c | |
| parent | f7e25c537e5946dc18220b076e7a592587121fdf (diff) | |
| parent | bfc672dcf323877228682aff79dff8ecd9f30ff8 (diff) | |
Merge remote branch 'trivial/for-next'
Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
fs/ext4/ext4.h
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 7599c457abd1..b100bd50a0d7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1309,7 +1309,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, break; case SIOCGIFHWADDR: - /* Get hw addres */ + /* Get hw address */ memcpy(ifr.ifr_hwaddr.sa_data, tun->dev->dev_addr, ETH_ALEN); ifr.ifr_hwaddr.sa_family = tun->dev->type; if (copy_to_user(argp, &ifr, ifreq_len)) |