tree 2c0e42dd23907dbdff147fa0097ccc2ef7be9ae1
parent 0d34052dfeba307ebc18d2f672e80e3f419714d4
parent cdb80f630be5cbc23d82331f24dc4704f75b64f4
author Linus Torvalds <torvalds@linux-foundation.org> 1231543946 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231543946 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-2

* 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