diff options
author | David S. Miller | 2009-12-02 07:13:38 +0100 |
---|---|---|
committer | David S. Miller | 2009-12-02 07:13:38 +0100 |
commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /.gitignore | |
parent | net: remove [un]register_pernet_gen_... and update the docs. (diff) | |
parent | ip_fragment: also adjust skb->truesize for packets not owned by a socket (diff) | |
download | kernel-qcow2-linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.tar.gz kernel-qcow2-linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.tar.xz kernel-qcow2-linux-ff9c38bba37937adb909cceb2a6521f2e92e17c6.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b93fb7eff942..946c7ec5c922 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ *.elf *.bin *.gz +*.bz2 *.lzma *.patch *.gcno |