Merge branch 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6-block

* 'block-2.6.24' of git://git.kernel.dk/data/git/linux-2.6-block: (37 commits)
  [BLOCK] Fix failing compile with BLK_DEV_IO_TRACE=n
  compat_ioctl: move floppy handlers to block/compat_ioctl.c
  compat_ioctl: move cdrom handlers to block/compat_ioctl.c
  compat_ioctl: move BLKPG handling to block/compat_ioctl.c
  compat_ioctl: move hdio calls to block/compat_ioctl.c
  compat_ioctl: handle blk_trace ioctls
  compat_ioctl: add compat_blkdev_driver_ioctl()
  compat_ioctl: move common block ioctls to compat_blkdev_ioctl
  Sysace: Don't enable IRQ until after interrupt handler is registered
  Sysace: sparse fixes
  Sysace: Minor coding convention fixup
  drivers/block/umem: use DRIVER_NAME where appropriate
  drivers/block/umem: trim trailing whitespace
  drivers/block/umem: minor cleanups
  drivers/block/umem: use dev_printk()
  drivers/block/umem: move private include away from include/linux
  Sysace: Labels in C code should not be indented.
  Sysace: Add of_platform_bus binding
  Sysace: Move IRQ handler registration to occur after FSM is initialized
  Sysace: minor rework and cleanup changes
  ...

diff --combined MAINTAINERS
index 22497de381dab8c3084a88d9e55551682dc43c30,53144f4737ffab4adac59106f1a44b95cfc057db..60162706716fff315fe667aaf3d8394b7f361ca3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -718,8 -718,34 +718,8 @@@ M:        rpurdie@rpsys.ne
  S:    Maintained
  
  BLACKFIN ARCHITECTURE
 -P:    Aubrey Li
 -M:    aubrey.li@analog.com
 -P:    Bernd Schmidt
 -M:    bernd.schmidt@analog.com
  P:    Bryan Wu
  M:    bryan.wu@analog.com
 -P:    Grace Pan
 -M:    grace.pan@analog.com
 -P:    Marc Hoffman
 -M:    marc.hoffman@analog.com
 -P:    Michael Hennerich
 -M:    michael.hennerich@analog.com
 -P:    Mike Frysinger
 -M:    michael.frysinger@analog.com
 -P:    Jerry Zeng
 -M:    jerry.zeng@analog.com
 -P:    Jie Zhang
 -M:    jie.zhang@analog.com
 -P:    Robin Getz
 -M:    robin.getz@analog.com
 -P:    Roy Huang
 -M:    roy.huang@analog.com
 -P:    Sonic Zhang
 -M:    sonic.zhang@analog.com
 -P:    Vivi Li
 -M:    vivi.li@analog.com
 -P:    Yi Li
 -M:    yi.li@analog.com
  L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -2535,18 -2561,12 +2535,18 @@@ L:   linux-kernel@vger.kernel.or
  W:    http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
  S:    Maintained
  
 -MULTIMEDIA CARD (MMC) AND SECURE DIGITAL (SD) SUBSYSTEM
 +MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
  M:    drzeus-mmc@drzeus.cx
  L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
 +MULTIMEDIA CARD (MMC) ETC. OVER SPI
 +P:    David Brownell
 +M:    dbrownell@users.sourceforge.net
 +L:    linux-kernel@vger.kernel.org
 +S:    Odd fixes
 +
  MULTISOUND SOUND DRIVER
  P:    Andrew Veliath
  M:    andrewtv@usa.net
@@@ -4156,6 -4176,13 +4156,13 @@@ W:    http://oss.sgi.com/projects/xf
  T:    git git://oss.sgi.com:8090/xfs/xfs-2.6.git
  S:    Supported
  
+ XILINX SYSTEMACE DRIVER
+ P:    Grant Likely
+ M:    grant.likely@secretlab.ca
+ W:    http://www.secretlab.ca/
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
+ 
  XILINX UARTLITE SERIAL DRIVER
  P:    Peter Korsgaard
  M:    jacmet@sunsite.dk

diff --combined include/linux/pci_ids.h
index c8636bb3e3a76fd9146ee5ce1c0fe17cd5a03a51,506b9ae241fd4b034998e553ac3237e1ef736adf..cfee06bca2d3e615c7bfcc6c2b3d6d670f666496
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -1471,8 -1471,6 +1471,8 @@@
  #define PCI_DEVICE_ID_RICOH_RL5C476   0x0476
  #define PCI_DEVICE_ID_RICOH_RL5C478   0x0478
  #define PCI_DEVICE_ID_RICOH_R5C822    0x0822
 +#define PCI_DEVICE_ID_RICOH_R5C832    0x0832
 +#define PCI_DEVICE_ID_RICOH_R5C843    0x0843
  
  #define PCI_VENDOR_ID_DLINK           0x1186
  #define PCI_DEVICE_ID_DLINK_DGE510T   0x4c00
@@@ -1738,6 -1736,11 +1738,11 @@@
  
  #define PCI_VENDOR_ID_RADISYS         0x1331
  
+ #define PCI_VENDOR_ID_MICRO_MEMORY            0x1332
+ #define PCI_DEVICE_ID_MICRO_MEMORY_5415CN     0x5415
+ #define PCI_DEVICE_ID_MICRO_MEMORY_5425CN     0x5425
+ #define PCI_DEVICE_ID_MICRO_MEMORY_6155               0x6155
+ 
  #define PCI_VENDOR_ID_DOMEX           0x134a
  #define PCI_DEVICE_ID_DOMEX_DMX3191D  0x0001