Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/ppp/Kconfig b/drivers/net/ppp/Kconfig
index 872df3ef07a6..278dea0c4c98 100644
--- a/drivers/net/ppp/Kconfig
+++ b/drivers/net/ppp/Kconfig
@@ -82,8 +82,8 @@ config PPP_FILTER
           If unsure, say N.
 
 config PPP_MPPE
-        tristate "PPP MPPE compression (encryption) (EXPERIMENTAL)"
-        depends on PPP && EXPERIMENTAL
+        tristate "PPP MPPE compression (encryption)"
+        depends on PPP
         select CRYPTO
         select CRYPTO_SHA1
         select CRYPTO_ARC4
@@ -96,8 +96,8 @@ config PPP_MPPE
           configuring PPTP clients and servers to utilize this method.
 
 config PPP_MULTILINK
-        bool "PPP multilink support (EXPERIMENTAL)"
-        depends on PPP && EXPERIMENTAL
+        bool "PPP multilink support"
+        depends on PPP
         ---help---
           PPP multilink is a protocol (defined in RFC 1990) which allows you
           to combine several (logical or physical) lines into one logical PPP
@@ -118,8 +118,8 @@ config PPPOATM
           changes its encapsulation unilaterally.
 
 config PPPOE
-        tristate "PPP over Ethernet (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PPP
+        tristate "PPP over Ethernet"
+        depends on PPP
         ---help---
           Support for PPP over Ethernet.
 
@@ -130,8 +130,8 @@ config PPPOE
           the heading "Kernel mode PPPoE").
 
 config PPTP
-        tristate "PPP over IPv4 (PPTP) (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && PPP && NET_IPGRE_DEMUX
+        tristate "PPP over IPv4 (PPTP)"
+        depends on PPP && NET_IPGRE_DEMUX
         ---help---
           Support for PPP over IPv4.(Point-to-Point Tunneling Protocol)
 
@@ -141,8 +141,8 @@ config PPTP
           utilize this module.
 
 config PPPOL2TP
-        tristate "PPP over L2TP (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && L2TP && PPP
+        tristate "PPP over L2TP"
+        depends on L2TP && PPP
         ---help---
           Support for PPP-over-L2TP socket family. L2TP is a protocol
           used by ISPs and enterprises to tunnel PPP traffic over UDP