From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 3 Apr 2009 16:02:32 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ea02259fdf47ca81ff3ca0c22906d989094fb8ff;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/linux-hdreg-h-cleanup:
  remove <linux/ata.h> include from <linux/hdreg.h>
  include/linux/hdreg.h: remove unused defines
  isd200: use ATA_* defines instead of *_STAT and *_ERR ones
  include/linux/hdreg.h: cover WIN_* and friends with #ifndef/#endif __KERNEL__
  aoe: WIN_* -> ATA_CMD_*
  isd200: WIN_* -> ATA_CMD_*
  include/linux/hdreg.h: cover struct hd_driveid with #ifndef/#endif __KERNEL__
  xsysace: make it 'struct hd_driveid'-free
  ubd_kern: make it 'struct hd_driveid'-free
  isd200: make it 'struct hd_driveid'-free
---

ea02259fdf47ca81ff3ca0c22906d989094fb8ff