diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 14:59:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-10 14:59:29 -0700 |
| commit | 6314410dd1e9db1c0009b0f7b56cc771a4d1e85a (patch) | |
| tree | dafb5034fbeb54ee608eb0740aae561f35782880 /net/sched/act_pedit.c | |
| parent | 7fc5b1e3a170d865f625e609c087cf8d84fd285d (diff) | |
| parent | d8e95e52a9db0e26b37f51ab5140b89da7c4b31e (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6
* 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/shemminger/netdev-2.6:
sis900: phy for FoxCon motherboard
dl2k: use DMA_48BIT_MASK constant
phy: mdiobus_register(): initialize all phy_map entries
sky2: ifdown kills irq mask
Diffstat (limited to 'net/sched/act_pedit.c')
0 files changed, 0 insertions, 0 deletions