diff options
| author | 2010-01-28 06:13:13 -0800 | |
|---|---|---|
| committer | 2010-01-28 06:13:13 -0800 | |
| commit | ce96bc86bf2ee12e8a3bf461ca8027557c1ef42f (patch) | |
| tree | 7bc59ed51a9517ec39fb6e63f9a92c435f0e5e99 /include/linux | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
net: merge fixup for qlge_main
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions
