Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
  Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev
  debugfs: Modify default debugfs directory for debugging pktcdvd.
  debugfs: Modified default dir of debugfs for debugging UHCI.
  debugfs: Change debugfs directory of IWMC3200
  debugfs: Change debuhgfs directory of trace-events-sample.h
  debugfs: Fix mount directory of debugfs by default in events.txt
  hpilo: add poll f_op
  hpilo: add interrupt handler
  hpilo: staging for interrupt handling
  driver core: platform_device_add_data(): use kmemdup()
  Driver core: Add support for compatibility classes
  uio: add generic driver for PCI 2.3 devices
  driver-core: move dma-coherent.c from kernel to driver/base
  mem_class: fix bug
  mem_class: use minor as index instead of searching the array
  driver model: constify attribute groups
  UIO: remove 'default n' from Kconfig
  Driver core: Add accessor for device platform data
  Driver core: move dev_get/set_drvdata to drivers/base/dd.c
  Driver core: add new device to bus's list before probing

diff --combined MAINTAINERS
index 64b9e44,01193a4..9117b65
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2218,6 -2218,13 +2218,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    include/asm-generic
  
+ GENERIC UIO DRIVER FOR PCI DEVICES
+ M:    Michael S. Tsirkin <mst@redhat.com>
+ L:    kvm@vger.kernel.org
+ L:    linux-kernel@vger.kernel.org
+ S:    Supported
+ F:    drivers/uio/uio_pci_generic.c
+ 
  GFS2 FILE SYSTEM
  M:    Steven Whitehouse <swhiteho@redhat.com>
  L:    cluster-devel@redhat.com
@@@ -3317,7 -3324,7 +3324,7 @@@ S:      Supporte
  F:    drivers/net/wireless/mwl8k.c
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 -M:    Nicolas Pitre <nico@cam.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  
  MARVELL YUKON / SYSKONNECT DRIVER
@@@ -4689,7 -4696,7 +4696,7 @@@ F:      include/linux/sl?b*.
  F:    mm/sl?b.c
  
  SMC91x ETHERNET DRIVER
 -M:    Nicolas Pitre <nico@cam.org>
 +M:    Nicolas Pitre <nico@fluxnic.net>
  S:    Maintained
  F:    drivers/net/smc91x.*
  

diff --combined init/main.c
index 63904bb,8e6a784..34971be
--- 1/init/main.c
--- 2/init/main.c
+++ b/init/main.c
@@@ -68,6 -68,7 +68,7 @@@
  #include <linux/async.h>
  #include <linux/kmemcheck.h>
  #include <linux/kmemtrace.h>
+ #include <linux/shmem_fs.h>
  #include <trace/boot.h>
  
  #include <asm/io.h>
@@@ -353,6 -354,7 +354,6 @@@ static void __init smp_init(void
  #define smp_init()    do { } while (0)
  #endif
  
 -static inline void setup_per_cpu_areas(void) { }
  static inline void setup_nr_cpu_ids(void) { }
  static inline void smp_prepare_cpus(unsigned int maxcpus) { }
  
@@@ -373,6 -375,29 +374,6 @@@ static void __init setup_nr_cpu_ids(voi
        nr_cpu_ids = find_last_bit(cpumask_bits(cpu_possible_mask),NR_CPUS) + 1;
  }
  
 -#ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
 -
 -EXPORT_SYMBOL(__per_cpu_offset);
 -
 -static void __init setup_per_cpu_areas(void)
 -{
 -      unsigned long size, i;
 -      char *ptr;
 -      unsigned long nr_possible_cpus = num_possible_cpus();
 -
 -      /* Copy section for each CPU (we discard the original) */
 -      size = ALIGN(PERCPU_ENOUGH_ROOM, PAGE_SIZE);
 -      ptr = alloc_bootmem_pages(size * nr_possible_cpus);
 -
 -      for_each_possible_cpu(i) {
 -              __per_cpu_offset[i] = ptr - __per_cpu_start;
 -              memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
 -              ptr += size;
 -      }
 -}
 -#endif /* CONFIG_HAVE_SETUP_PER_CPU_AREA */
 -
  /* Called by boot processor to activate the rest. */
  static void __init smp_init(void)
  {
@@@ -785,6 -810,7 +786,7 @@@ static void __init do_basic_setup(void
        init_workqueues();
        cpuset_init_smp();
        usermodehelper_init();
+       init_tmpfs();
        driver_init();
        init_irq_proc();
        do_ctors();