remove bits from HEAD, regenerate with bits from mdk10.0 branch only

1 files changed, 7 insertions, 150 deletions

diff --git a/ChangeLog b/ChangeLog
index fa8588dc..0be27069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,164 +1,21 @@
-2004-09-05 22:49  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+2004-09-06 06:09  Thierry Vignaud <tvignaud@mandrakesoft.com>
+
+	* Makefile: (changelog) only follow MDK10_0-branch
+
+2004-09-06 04:49  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
 
 	* ldetect-lst.spec, lst/pcitable: - Add nVidia GeForce FX 5750
 	  PCI-Express - Add some new nForce 3 ethernet chipsets
 	  (forcedeth?)
 
-2004-09-04 20:51  Frederic Lepied <flepied@mandrakesoft.com>
-
-	* lst/pcitable: added "nVidia Corp.|nForce2 UDMA 133 IDE
-	  Controller" (bug #11173) Corporation => Corp. to be coherent with
-	  the hardware database
-
-2004-09-01 03:32  Frederic Lepied <flepied@mandrakesoft.com>
-
-	* lst/pcitable: added entries for IPW2200 Intel Corporation =>
-	  Intel Corp.
-
-2004-08-31 23:14  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* ldetect-lst.spec: complete 0.1.16-3mdk's changelog
-
-2004-08-31 23:14  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* ldetect-lst.spec: package AUTHORS too
-
-2004-08-31 23:14  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* AUTHORS: automatic filling from ChangeLog (stats showed 2 groups:
-	  less than 70 commits and more than 200 commits)
-
-2004-08-31 05:48  Frederic Lepied <flepied@mandrakesoft.com>
-
-	* lst/usbtable: put newhidups driver for MGE UPS entries.  fixed
-	  wacom entries.
-
-2004-08-31 01:07  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* ldetect-lst.spec: 0.1.16-3mdk
-
-2004-08-31 00:58  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: use right qla driver
-
-2004-08-31 00:56  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: in 2.6.x kernel, pwcd was splited between pcwd_pci
-	  and pcwd_usb
-
-2004-08-31 00:55  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: according to kernel pcimap, ohci394 does not
-	  register this device whereas yenta_socket does (the description
-	  looks bogus and is neither in hwdata nor in pci.ids :-( despite
-	  pixel log points to them)
-
-	  kernel sources looks like this indeed a 'Ti|4450' device, but
-	  we've not the full description.
-
-2004-08-31 00:44  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: this device is now handled by sata_sx4
-
-2004-08-31 00:26  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: pc300 replaced pc300too in both 2.4.x and 2.6.x
-	  kernels long time ago
-
-2004-08-31 00:24  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: according to kernel pcimap, dmfe does not register
-	  this device whereas tulip does
-
-2004-08-31 00:22  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: this device has two PCI functions, one for video
-	  (tv) and one for audio.
-
-	  since most people listen to audio through a jack between their tv
-	  card and their sound card rather than using btaudio or snd-bt87x,
-	  it's more important to support their tv/satellite card rather
-	  than just soun,d
-
-2004-08-31 00:09  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: 3c359 replaced 3c559 in both 2.4.x and 2.6.x
-	  kernels
-
-2004-08-31 00:08  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: according to kernel pcimap, yenta_socket does not
-	  register this device whereas i82092 does
-
-2004-08-31 00:06  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: according to kernel pcimap, yenta_socket does not
-	  register this device whereas pd6729 does
-
-2004-08-31 00:05  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: do one s/tulip/de2104x/ (according to kernel
-	  pcimap, this device is only registred with de2104x)
-
-2004-08-31 00:02  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: donauboe replaced toshoboe
-
-2004-08-30 23:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: tulip_old is neither in 2.4.x kernel nor in 2.6.x
-	  one
-
-2004-08-30 23:51  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: hw_random replaced i810_rng too in both 2.4.x and
-	  2.6.x kernels
-
-2004-08-30 23:50  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: hw_random replaced both amd7xx_tco and amd768_rng
-	  in both 2.4.x and 2.6.x kernels
-
-2004-08-30 23:40  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: remove bogus 0xffff 0xffff entry
-
-2004-08-30 23:35  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: tmspci replaced sktr long time ago
-
-2004-08-30 05:59  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: sync with kernel-2.6.8.1.5mdk
-
-2004-08-30 01:33  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+2004-08-30 07:33  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
 
 	* ldetect-lst.spec: 0.1.9-17mdk
 
-2004-08-30 01:26  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
+2004-08-30 07:26  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
 
 	* lst/pcitable: Adapt for 3ware 9000-series controllers
 
-2004-08-29 22:23  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* lst/pcitable: switch one nForce2 from OSS to ALSA
-
-2004-08-27 05:04  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
-
-	* ldetect-lst.spec: 0.1.16-2mdk
-
-2004-08-27 05:04  Gwenole Beauchesne <gbeauchesne@mandrakesoft.com>
-
-	* lst/pcitable: handle 3w-9xxx
-
-2004-08-27 02:30  Olivier Thauvin <thauvin@aerov.jussieu.fr>
-
-	* lst/MonitorsDB: -add Dell laptop 16/10 screen
-
-2004-08-26 07:24  Thierry Vignaud <tvignaud@mandrakesoft.com>
-
-	* ldetect-lst.spec: 0.1.16-1mdk
-
 2004-08-26 06:57  Thierry Vignaud <tvignaud@mandrakesoft.com>
 
 	* lst/pcitable: switch Intel/ICH6 sound card from OSS to ALSA b/c