From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Fri, 29 Dec 2006 18:03:29 +0000 (-0800)
Subject: Merge branch 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=007fb598b4674de82492a9961e82826875012229;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'netxen-ioctl' of /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
---

007fb598b4674de82492a9961e82826875012229