tree 03b2b4f92a5ccb3416adb69196248751e3a1d0c2
parent 326d8519fc97be186c55ac605c3a7c957c758ae1
parent bfbd442f69ec9c58590ffc6e93ac8d6809caa48b
author Linus Torvalds <torvalds@linux-foundation.org> 1237063398 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237063398 -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:
  Fix Xilinx SystemACE driver to handle empty CF slot
  block: fix memory leak in bio_clone()
  block: Add gfp_mask parameter to bio_integrity_clone()