diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-27 10:03:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-27 10:03:03 +0200 |
| commit | e40051d134f7ee95c8c1f7a3471e84eafc9ab326 (patch) | |
| tree | 88eb44e49a75721ae926665a2c42f08badac9d07 /arch/s390/Kconfig | |
| parent | net: r6040: store BIOS default MAC in perm_add (diff) | |
| parent | ipv6: add a missing unregister_pernet_subsys call (diff) | |
| download | linux-e40051d134f7ee95c8c1f7a3471e84eafc9ab326.tar.xz linux-e40051d134f7ee95c8c1f7a3471e84eafc9ab326.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/qlcnic/qlcnic_init.c
net/ipv4/ip_output.c
Diffstat (limited to 'arch/s390/Kconfig')
0 files changed, 0 insertions, 0 deletions