diff options
author | David S. Miller <davem@davemloft.net> | 2010-10-21 08:43:05 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-10-21 08:43:05 -0700 |
commit | 2198a10b501fd4443430cb17e065a9e859cc58c9 (patch) | |
tree | 87f3781d293da0f8f8f61615905eb7bf62b7c128 /include/linux/const.h | |
parent | 9941fb62762253774cc6177d0b9172ece5133fe1 (diff) | |
parent | db5a753bf198ef7a50e17d2ff358adf37efe8648 (diff) | |
download | blackbird-op-linux-2198a10b501fd4443430cb17e065a9e859cc58c9.tar.gz blackbird-op-linux-2198a10b501fd4443430cb17e065a9e859cc58c9.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'include/linux/const.h')
0 files changed, 0 insertions, 0 deletions