diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-05 02:06:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-05 02:06:47 -0800 |
| commit | 508827ff0ac3981d420edac64a70de7f4e304d38 (patch) | |
| tree | b0cee8ddef9f0ceab68c388e4ae46b7295eb2cb5 /kernel/sysctl.c | |
| parent | 2c3c3d02f28801d7ad2da4952b2c7ca6621ef221 (diff) | |
| parent | 72e2240f181871675d3a979766330c91d48a1673 (diff) | |
| download | linux-508827ff0ac3981d420edac64a70de7f4e304d38.tar.gz linux-508827ff0ac3981d420edac64a70de7f4e304d38.tar.bz2 linux-508827ff0ac3981d420edac64a70de7f4e304d38.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tokenring/tmspci.c
drivers/net/ucc_geth_mii.c
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions