diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-30 08:41:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-30 08:41:36 -0800 |
| commit | dbeb17016e4d0affccfa07f4e8f61feac75c5a18 (patch) | |
| tree | 0cbda9fb039cb96d7c76cce19e1f792d46cd2a3c /include/keys | |
| parent | 0461ec5bc7745b89a8ab67ba0ea497abd58a6301 (diff) | |
| parent | f99ec0649accb581cf3e8fcfeea796e82d05f4ea (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (29 commits)
tulip: fix 21142 with 10Mbps without negotiation
drivers/net/skfp: if !capable(CAP_NET_ADMIN): inverted logic
gianfar: Fix Wake-on-LAN support
smsc911x: timeout reaches -1
smsc9420: fix interrupt signalling test failures
ucc_geth: Change uec phy id to the same format as gianfar's
wimax: fix build issue when debugfs is disabled
netxen: fix memory leak in drivers/net/netxen_nic_init.c
tun: Add some missing TUN compat ioctl translations.
ipv4: fix infinite retry loop in IP-Config
net: update documentation ip aliases
net: Fix OOPS in skb_seq_read().
net: Fix frag_list handling in skb_seq_read
netxen: revert jumbo ringsize
ath5k: fix locking in ath5k_config
cfg80211: print correct intersected regulatory domain
cfg80211: Fix sanity check on 5 GHz when processing country IE
iwlwifi: fix kernel oops when ucode DMA memory allocation failure
rtl8187: Fix error in setting OFDM power settings for RTL8187L
mac80211: remove Michael Wu as maintainer
...
Diffstat (limited to 'include/keys')
0 files changed, 0 insertions, 0 deletions