| commit | 007fb598b4674de82492a9961e82826875012229 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.osdl.org> | Fri Dec 29 10:03:29 2006 -0800 |
| committer | Linus Torvalds <torvalds@woody.osdl.org> | Fri Dec 29 10:03:29 2006 -0800 |
| tree | b72b84b6fb54d02f6021d8a9e16e143debdf45b9 | |
| parent | 7658cc289288b8ae7dd2c2224549a048431222b3 [diff] | |
| parent | 92104e94806f47e090e3bb40f6ae45f695351a5e [diff] |
Merge branch 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: netxen: remove private ioctl