Merge branch 'linus' into test

Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 0ed74d076a27..9494400e8fd0 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -15,7 +15,7 @@ if MISC_DEVICES
 
 config ATMEL_PWM
         tristate "Atmel AT32/AT91 PWM support"
-        depends on AVR32 || ARCH_AT91
+        depends on AVR32 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91CAP9
         help
           This option enables device driver support for the PWM channels
           on certain Atmel prcoessors.  Pulse Width Modulation is used for
@@ -421,6 +421,7 @@ config EEEPC_LAPTOP
         depends on BACKLIGHT_CLASS_DEVICE
         depends on HWMON
         depends on EXPERIMENTAL
+        depends on RFKILL
         ---help---
           This driver supports the Fn-Fx keys on Eee PC laptops.
           It also adds the ability to switch camera/wlan on/off.