Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

diff --combined config/kernel/kernel.config.i586-ipfire-xen
index 1f1e07d11f0baf6042ece6442202c746c23de6ad,aa3e2b42d6bb6b46ab8d414484f7c8ebeab16d00..5ae27c2c427c981b529ca482a9369ecebb80a5b3
--- 1/config/kernel/kernel.config.i586-ipfire-xen
--- 2/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.27.25-ipfire-xen
 -# Sun Aug  9 16:17:27 2009
 +# Linux kernel version: 2.6.27.31
 +# Mon Sep  7 10:05:41 2009
  #
  # CONFIG_64BIT is not set
  CONFIG_X86_32=y
@@@ -252,7 -252,6 +252,7 @@@ CONFIG_RESOURCES_64BIT=
  CONFIG_ZONE_DMA_FLAG=1
  CONFIG_BOUNCE=y
  CONFIG_VIRT_TO_BUS=y
 +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
  # CONFIG_HIGHPTE is not set
  CONFIG_MTRR=y
  # CONFIG_X86_PAT is not set
@@@ -927,6 -926,7 +927,6 @@@ CONFIG_SONY_LAPTOP=
  # CONFIG_SONYPI_COMPAT is not set
  CONFIG_THINKPAD_ACPI=m
  # CONFIG_THINKPAD_ACPI_DEBUG is not set
 -CONFIG_THINKPAD_ACPI_BAY=y
  CONFIG_THINKPAD_ACPI_VIDEO=y
  CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
  CONFIG_INTEL_MENLOW=m
@@@ -2852,7 -2852,6 +2852,7 @@@ CONFIG_XEN_SMPBOOT=
  CONFIG_XEN_DEVMEM=y
  CONFIG_XEN_BALLOON=y
  CONFIG_XEN_SCRUB_PAGES=y
 +# CONFIG_STAGING is not set
  
  #
  # Firmware Drivers
@@@ -3024,8 -3023,24 +3024,24 @@@ CONFIG_CIFS_XATTR=
  #
  # Partition Types
  #
- # CONFIG_PARTITION_ADVANCED is not set
+ CONFIG_PARTITION_ADVANCED=y
+ # CONFIG_ACORN_PARTITION is not set
+ # CONFIG_OSF_PARTITION is not set
+ # CONFIG_AMIGA_PARTITION is not set
+ # CONFIG_ATARI_PARTITION is not set
+ # CONFIG_MAC_PARTITION is not set
  CONFIG_MSDOS_PARTITION=y
+ # CONFIG_BSD_DISKLABEL is not set
+ # CONFIG_MINIX_SUBPARTITION is not set
+ # CONFIG_SOLARIS_X86_PARTITION is not set
+ # CONFIG_UNIXWARE_DISKLABEL is not set
+ # CONFIG_LDM_PARTITION is not set
+ # CONFIG_SGI_PARTITION is not set
+ # CONFIG_ULTRIX_PARTITION is not set
+ # CONFIG_SUN_PARTITION is not set
+ # CONFIG_KARMA_PARTITION is not set
+ CONFIG_EFI_PARTITION=y
+ # CONFIG_SYSV68_PARTITION is not set
  CONFIG_NLS=y
  CONFIG_NLS_DEFAULT="cp850"
  # CONFIG_NLS_CODEPAGE_437 is not set