Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2009 16:55:46 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Aug 2009 16:55:46 +0000 (09:55 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Remove double removal of blktrace directory


Trivial merge