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)
commit9a100a4464917b5ffff3a8ce1c2758088fd9bb32
tree2c0e42dd23907dbdff147fa0097ccc2ef7be9ae1
parent0d34052dfeba307ebc18d2f672e80e3f419714d4
parentcdb80f630be5cbc23d82331f24dc4704f75b64f4
Merge git://git./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