Documentation/aoe/aoe.txt                  |   13 
 Documentation/aoe/status.sh                |    7 
 Documentation/aoe/udev-install.sh          |   26 +
 Documentation/aoe/udev.txt                 |   23 
 Documentation/feature-removal-schedule.txt |   17 
 drivers/base/bus.c                         |    2 
 drivers/base/class.c                       |   74 ++-
 drivers/base/class_simple.c                |   21 
 drivers/base/driver.c                      |   13 
 drivers/base/platform.c                    |    2 
 drivers/base/sys.c                         |   79 +--
 drivers/block/aoe/aoe.h                    |    1 
 drivers/block/aoe/aoechr.c                 |   41 -
 drivers/block/aoe/aoecmd.c                 |    8 
 drivers/block/genhd.c                      |   53 +-
 drivers/char/Kconfig                       |    2 
 drivers/char/Makefile                      |    2 
 drivers/char/tpm/Kconfig                   |   39 +
 drivers/char/tpm/Makefile                  |    7 
 drivers/char/tpm/tpm.c                     |  697 +++++++++++++++++++++++++++++
 drivers/char/tpm/tpm.h                     |   92 +++
 drivers/char/tpm/tpm_atmel.c               |  216 ++++++++
 drivers/char/tpm/tpm_nsc.c                 |  373 +++++++++++++++
 drivers/i2c/i2c-dev.c                      |    9 
 drivers/media/video/videodev.c             |   11 
 drivers/sh/Makefile                        |    6 
 drivers/sh/superhyway/Makefile             |    7 
 drivers/sh/superhyway/superhyway-sysfs.c   |   45 +
 drivers/sh/superhyway/superhyway.c         |  201 ++++++++
 drivers/usb/core/file.c                    |    9 
 include/linux/device.h                     |    4 
 include/linux/pci_ids.h                    |    1 
 include/linux/superhyway.h                 |   79 +++
 include/linux/sysdev.h                     |    2 
 lib/kobject.c                              |    2 
 35 files changed, 1998 insertions(+), 186 deletions(-)

<kjhall:us.ibm.com>:
  o tpm: fix cause of SMP stack traces
  o Add TPM hardware enablement driver

Alexander Nyberg:
  o AoE warning on 64-bit archs

Andrew Morton:
  o tpm_atmel build fix
  o tpm_msc-build-fix

Arjan van de Ven:
  o Kobject: remove some unneeded exports

Dominik Brodowski:
  o cpufreq 2.4 interface removal schedule

Ed L. Cashin:
  o aoe: drivers/block/aoe/aoechr.c cleanups
  o aoe status.sh: handle sysfs not in /etc/mtab
  o aoe: fail IO on disk errors
  o aoe: update documentation for udev users
  o aoe: add documentation for udev users

Greg Kroah-Hartman:
  o sysdev: change locking to use a class based spinlock
  o Driver Core: move the class core to use it's own semaphore and not the subsystem one

Kay Sievers:
  o videodev: pass dev_t to the class core
  o i2c: class driver pass dev_t to the class core
  o usb: class driver pass dev_t to the class core
  o class_simple: pass dev_t to the class core
  o block core: export MAJOR/MINOR to the hotplug env
  o class core: export MAJOR/MINOR to the hotplug env

Mike Waychison:
  o driver core: clean driver unload

Paul Mundt:
  o Add SuperHyway bus subsystem

Randy Dunlap:
  o Add 2.4.x cpufreq /proc and sysctl interface removal feature-removal-schedule

Russell King:
  o driver core: Separate platform device name from platform device number