diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
| commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
| tree | 4c3924d35d99d413a95205ac21da8d369063234b /net/netfilter/nf_log.c | |
| parent | inet_diag: Rename inet_diag_req_compat into inet_diag_req (diff) | |
| parent | mac80211: fix rx->key NULL pointer dereference in promiscuous mode (diff) | |
| download | linux-9ee6045f09a7875ebe55b9942b232a19076b157b.tar.gz linux-9ee6045f09a7875ebe55b9942b232a19076b157b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/netfilter/nf_log.c')
0 files changed, 0 insertions, 0 deletions