projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7658cc2
92104e9
)
Merge branch 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
author
Linus Torvalds
<torvalds@woody.osdl.org>
Fri, 29 Dec 2006 18:03:29 +0000
(10:03 -0800)
committer
Linus Torvalds
<torvalds@woody.osdl.org>
Fri, 29 Dec 2006 18:03:29 +0000
(10:03 -0800)
* 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
netxen: remove private ioctl
Trivial merge