[arch-commits] Commit in kernel26/repos (3 files)

[Tobias Powalowski]

    Date: Friday, July 31, 2009 @ 14:30:56
  Author: tpowa
Revision: 48128

Merged revisions 48125 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/kernel26/trunk

........
  r48125 | tpowa | 2009-07-31 20:27:10 +0200 (Fr, 31 Jul 2009) | 1 line
  
  upgpkg: kernel26 2.6.30.4-1
........

Modified:
  kernel26/repos/testing-x86_64/	(properties)
  kernel26/repos/testing-x86_64/PKGBUILD
  kernel26/repos/testing-x86_64/config

----------+
 PKGBUILD |    2 +-
 config   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Property changes on: kernel26/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kernel26/trunk:1-48110
   + /kernel26/trunk:1-48127

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-07-31 18:27:44 UTC (rev 48127)
+++ testing-x86_64/PKGBUILD	2009-07-31 18:30:56 UTC (rev 48128)
@@ -33,7 +33,7 @@
 optdepends=('crda: to set the correct wireless channels of your country')
 md5sums=('7a80058a6382e5108cdb5554d1609615'
          'c819d48ba2d3940ee921c799fcb9253c'
-         '999272ccb838e6e61d03463cd52d1ad4'
+         '4c642e4fc9e8dbf90276599cf7d39821'
          '8a7e6e4157d33bd34ba31049a55e9777'
          '25584700a0a679542929c4bed31433b6')
 

Modified: testing-x86_64/config
===================================================================
--- testing-x86_64/config	2009-07-31 18:27:44 UTC (rev 48127)
+++ testing-x86_64/config	2009-07-31 18:30:56 UTC (rev 48128)
@@ -311,6 +311,7 @@
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
 CONFIG_MMU_NOTIFIER=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_HIGHPTE is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -4296,7 +4297,6 @@
 # CONFIG_SECURITY_NETWORK_XFRM is not set
 # CONFIG_SECURITY_PATH is not set
 CONFIG_SECURITY_FILE_CAPABILITIES=y
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
 # CONFIG_SECURITY_SELINUX is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set