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)
commita3620f7545344f932873bf98fbdf416b49409c8e
treefebf6c9547e5f860d614cc78a55eefe888ad1419
parent78efd1ddd95d2fac1ed8d5fadd9dab885ea70e55
parent39cbb602b543e477df71dca84b5b2e36f8bd29fc
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