summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2011-04-25 14:21:51 +0000
committerThomas Backlund <tmb@mageia.org>2011-04-25 14:21:51 +0000
commit1412b8077e5d92f47b838bb9ab1a38c2aa285707 (patch)
tree8b66a30ea5707b7b351da3b6545d2d230fb3475e
parent502d331edcf32253bd036f60776d8ecce34de9f4 (diff)
downloaddrakx-1412b8077e5d92f47b838bb9ab1a38c2aa285707.tar
drakx-1412b8077e5d92f47b838bb9ab1a38c2aa285707.tar.gz
drakx-1412b8077e5d92f47b838bb9ab1a38c2aa285707.tar.bz2
drakx-1412b8077e5d92f47b838bb9ab1a38c2aa285707.tar.xz
drakx-1412b8077e5d92f47b838bb9ab1a38c2aa285707.zip
sync changes
-rw-r--r--kernel/list_modules.pm2
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/install/NEWS4
3 files changed, 5 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 733eb4935..fa9a48222 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -163,7 +163,7 @@ our %l = (
bus =>
{
- usb => [ qw(ehci-hcd hwa-hc isp116x-hcd isp1760 ohci-hcd r8a66597-hcd sl811_cs sl811-hcd uhci-hcd u132-hcd usb-uhci usb-ohci whci-hcd) ],
+ usb => [ qw(xhci-hcd ehci-hcd hwa-hc isp116x-hcd isp1760 ohci-hcd r8a66597-hcd sl811_cs sl811-hcd uhci-hcd u132-hcd usb-uhci usb-ohci whci-hcd) ],
bluetooth => [ qw(bcm203x bfusb bpa10x btusb) ],
firewire => [ qw(ohci1394) ],
i2c => [
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 76f86f067..76ec795ba 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,5 @@
- fix the bugzilla url generated by drakbug by changing 'classificaiton=Mageia'
to 'product=Mageia' (mga#835)
-- add sdhci-pci to card-reader list
Version 13.49 - 21 April 2001
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 2ba05f661..b35a3f145 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,9 @@
+Version 13.49 - 25 May 2011
- add nokmsboot boot option also if the bootloader is installed after setting
up a conflicting display driver (e.g. draklive-install)
+- embed more of unicore, fixes \d on strings collected from Gtk2 (#39)
+- add sdhci-pci to card-reader list
+- add xhci-hcd (usb3 support)
Version 13.47
- update modules list needed for md raid456 and dm-raid 4/5/6 target