Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

diff --combined drivers/misc/Kconfig
index 962817e49fba02e063dc164a3d0971e221eaa3a7,4cf928e32e78fb3f713d7667f781e2469357126b..bb94ce78a6d003a1cfb8c9baa020c45eb0a416e9
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -22,6 -22,39 +22,39 @@@ config ATMEL_PW
          purposes including software controlled power-efficent backlights
          on LCD displays, motor control, and waveform generation.
  
+ config ATMEL_TCLIB
+       bool "Atmel AT32/AT91 Timer/Counter Library"
+       depends on (AVR32 || ARCH_AT91)
+       help
+         Select this if you want a library to allocate the Timer/Counter
+         blocks found on many Atmel processors.  This facilitates using
+         these blocks by different drivers despite processor differences.
+ 
+ config ATMEL_TCB_CLKSRC
+       bool "TC Block Clocksource"
+       depends on ATMEL_TCLIB && GENERIC_TIME
+       default y
+       help
+         Select this to get a high precision clocksource based on a
+         TC block with a 5+ MHz base clock rate.  Two timer channels
+         are combined to make a single 32-bit timer.
+ 
+         When GENERIC_CLOCKEVENTS is defined, the third timer channel
+         may be used as a clock event device supporting oneshot mode
+         (delays of up to two seconds) based on the 32 KiHz clock.
+ 
+ config ATMEL_TCB_CLKSRC_BLOCK
+       int
+       depends on ATMEL_TCB_CLKSRC
+       prompt "TC Block" if ARCH_AT91RM9200 || ARCH_AT91SAM9260 || CPU_AT32AP700X
+       default 0
+       range 0 1
+       help
+         Some chips provide more than one TC block, so you have the
+         choice of which one to use for the clock framework.  The other
+         TC can be used for other purposes, such as PWM generation and
+         interval timing.
+ 
  config IBM_ASM
        tristate "Device driver for IBM RSA service processor"
        depends on X86 && PCI && INPUT && EXPERIMENTAL
@@@ -108,7 -141,6 +141,7 @@@ config ACER_WM
        depends on ACPI
        depends on LEDS_CLASS
        depends on BACKLIGHT_CLASS_DEVICE
 +      depends on SERIO_I8042
        select ACPI_WMI
        ---help---
          This is a driver for newer Acer (and Wistron) laptops. It adds

diff --combined drivers/misc/Makefile
index bbc69fdd1b9d2d10f699ae702a119548fd253881,c975028f101b846b7b7b952bf828e149b18193bc..4581b2533111deb34f72a42d72bee4fdc8a7d63b
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -10,6 -10,7 +10,7 @@@ obj-$(CONFIG_ACER_WMI)     += acer-wmi.
  obj-$(CONFIG_ASUS_LAPTOP)     += asus-laptop.o
  obj-$(CONFIG_ATMEL_PWM)               += atmel_pwm.o
  obj-$(CONFIG_ATMEL_SSC)               += atmel-ssc.o
+ obj-$(CONFIG_ATMEL_TCLIB)     += atmel_tclib.o
  obj-$(CONFIG_TC1100_WMI)      += tc1100-wmi.o
  obj-$(CONFIG_LKDTM)           += lkdtm.o
  obj-$(CONFIG_TIFM_CORE)               += tifm_core.o
@@@ -22,4 -23,3 +23,4 @@@ obj-$(CONFIG_FUJITSU_LAPTOP)  += fujitsu
  obj-$(CONFIG_EEPROM_93CX6)    += eeprom_93cx6.o
  obj-$(CONFIG_INTEL_MENLOW)    += intel_menlow.o
  obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
 +obj-$(CONFIG_KGDB_TESTS)      += kgdbts.o