Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Oct 2009 22:00:08 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 4 Oct 2009 22:00:08 +0000 (15:00 -0700)
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
  SFI: remove __init from sfi_verify_table
  SFI: fix section mismatch warnings in sfi_core.c


Trivial merge