diff options
author | David S. Miller <davem@davemloft.net> | 2012-11-18 04:00:43 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-18 04:00:43 +0100 |
commit | 67f4efdce7d85282fbd5832cddc80a07eb89b6d6 (patch) | |
tree | 9a1771ef13b27abdf8cf172e5b7556ab93e5c48c /kernel/timer.c | |
parent | net: use right lock in __dev_remove_offload (diff) | |
parent | Linux 3.7-rc6 (diff) | |
download | linux-67f4efdce7d85282fbd5832cddc80a07eb89b6d6.tar.xz linux-67f4efdce7d85282fbd5832cddc80a07eb89b6d6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions