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: (64 commits)
  debugfs: use specified mode to possibly mark files read/write only
  debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
  xen: remove driver_data direct access of struct device from more drivers
  usb: gadget: at91_udc: remove driver_data direct access of struct device
  uml: remove driver_data direct access of struct device
  block/ps3: remove driver_data direct access of struct device
  s390: remove driver_data direct access of struct device
  parport: remove driver_data direct access of struct device
  parisc: remove driver_data direct access of struct device
  of_serial: remove driver_data direct access of struct device
  mips: remove driver_data direct access of struct device
  ipmi: remove driver_data direct access of struct device
  infiniband: ehca: remove driver_data direct access of struct device
  ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
  hvcs: remove driver_data direct access of struct device
  xen block: remove driver_data direct access of struct device
  thermal: remove driver_data direct access of struct device
  scsi: remove driver_data direct access of struct device
  pcmcia: remove driver_data direct access of struct device
  PCIE: remove driver_data direct access of struct device
  ...

Manually fix up trivial conflicts due to different direct driver_data
direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}

diff --cc drivers/s390/char/con3215.c
Simple merge

diff --cc drivers/s390/char/raw3270.c
Simple merge

diff --cc drivers/s390/char/tape_34xx.c
Simple merge

diff --cc drivers/s390/char/tape_3590.c
Simple merge

diff --cc drivers/s390/char/tape_core.c
Simple merge

diff --cc drivers/s390/char/vmlogrdr.c
Simple merge

diff --cc drivers/s390/char/vmur.c
Simple merge

diff --cc drivers/s390/net/claw.c
Simple merge

diff --cc drivers/s390/net/lcs.c
Simple merge

diff --cc drivers/s390/net/netiucv.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge