tree febf6c9547e5f860d614cc78a55eefe888ad1419
parent 78efd1ddd95d2fac1ed8d5fadd9dab885ea70e55
parent 39cbb602b543e477df71dca84b5b2e36f8bd29fc
author Linus Torvalds <torvalds@linux-foundation.org> 1250096146 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1250096146 -0700

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