diff options
author | 2007-09-29 09:25:55 -0700 | |
---|---|---|
committer | 2007-09-29 09:25:55 -0700 | |
commit | ed7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41 (patch) | |
tree | 5ffcfeb380854f8be4303588f92efa267b3c656d /net/lapb/lapb_timer.c | |
parent | i386: remove bogus comment about memory barrier (diff) | |
parent | mv643xx_eth: Check ETH_INT_CAUSE_STATE bit (diff) | |
download | linux-rng-ed7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41.tar.xz linux-rng-ed7fdff5d6754f9ef9e47bbf0b171d3d96fb7e41.zip |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
mv643xx_eth: Check ETH_INT_CAUSE_STATE bit
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions