Merge branch 'an' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
commitaa641935343e05795f7f7289e7b242138b612ffe
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 01:55:22 +0000 (4 17:55 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 5 Nov 2007 01:55:22 +0000 (4 17:55 -0800)
tree54909d05c0ad73b40fae8cc9fbfd0636efbdc246
parent5da0c7aad6271dd29526e3b49cbeb3bab9e8e491
parentf26792d5c63344e14540ced4b19deb29e360bb8d
Merge branch 'an' of /linux/kernel/git/jgarzik/libata-dev

* 'an' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] Utilize new SCSI event infrastructure
  SCSI: add asynchronous event notification API