Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2009 15:32:23 +0000 (08:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Apr 2009 15:32:23 +0000 (08:32 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Update defconfigs for 2.6.30-rc3
  m68k,m68knommu: Wire up preadv and pwritev
  scsi: a4000 - Correct driver unregistration in case of failure


Trivial merge