Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:32:26 +0000 (15:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Jan 2009 23:32:26 +0000 (15:32 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2:
  async: make async a command line option for now
  partial revert of asynchronous inode delete


Trivial merge