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
  ...

1 files changed, 7 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 22497de381d..60162706716 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4156,6 +4156,13 @@ W:	http://oss.sgi.com/projects/xfs
 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