Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Remove double removal of blktrace directory
This commit is contained in:
Linus Torvalds 2009-08-12 09:55:46 -07:00
commit a3620f7545