Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jun 2010 19:22:43 +0000 (12:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jun 2010 19:22:43 +0000 (12:22 -0700)
commited8319e9b269ed19449432db3aefc11eb7be7376
treeedc9befbef6d5d42a6c51a2eac39c1172abab242
parentbc23416cd4579093acc1e7d819eee747def623da
parente29df91e67428c1a651d18df6ec047fcb30282d3
Merge branch 'sfi-release' of git://git./linux/kernel/git/lenb/linux-sfi-2.6

* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: do not return freed pointer