Mon, 26 Jan 2009 11:46:38 +0000merge -c1606 branches/stable-1.4: Output vendor Id in hex.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:46:38 +0000] rev 1329
merge -c1606 branches/stable-1.4: Output vendor Id in hex.

Mon, 26 Jan 2009 11:46:02 +0000merge -c1605 branches/stable-1.4: Output ioctl() debugging in hex.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:46:02 +0000] rev 1328
merge -c1605 branches/stable-1.4: Output ioctl() debugging in hex.

Mon, 26 Jan 2009 11:45:30 +0000merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:45:30 +0000] rev 1327
merge -c1604 branches/stable-1.4: Fixed spelling of EtherCAT terms.

Mon, 26 Jan 2009 11:16:10 +0000merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 11:16:10 +0000] rev 1326
merge -c1603 branches/stable-1.4: Changed licence headers to avoid conflicts with the GPL; restricted licence to GPLv2 only.

Mon, 26 Jan 2009 10:34:53 +0000merge -c1602 branches/stable-1.4: Fixed e1000 ring bug.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 10:34:53 +0000] rev 1325
merge -c1602 branches/stable-1.4: Fixed e1000 ring bug.

Mon, 26 Jan 2009 10:30:53 +0000merge -c1601 branches/stable-1.4: Ignores.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 10:30:53 +0000] rev 1324
merge -c1601 branches/stable-1.4: Ignores.

Mon, 26 Jan 2009 10:30:17 +0000merge -r1599:1600 branches/stable-1.4: Removed bashisms from init script.
Florian Pose <fp@igh-essen.com> [Mon, 26 Jan 2009 10:30:17 +0000] rev 1323
merge -r1599:1600 branches/stable-1.4: Removed bashisms from init script.