summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-15 23:15:17 +0100
committerDavid S. Miller <davem@davemloft.net>2011-03-15 23:15:17 +0100
commitc337ffb68e1e71bad069b14d2246fa1e0c31699c (patch)
tree7861a59b196adfd63758cc0921e4fb56030fbaf3 /CREDITS
parentMerge branch 'irq/numa' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/... (diff)
parentsmsc911x: Fix build error when SMSC_TRACE() used (diff)
downloadlinux-c337ffb68e1e71bad069b14d2246fa1e0c31699c.tar.xz
linux-c337ffb68e1e71bad069b14d2246fa1e0c31699c.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions