Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:27:14 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Oct 2010 00:27:14 +0000 (17:27 -0700)
commit7eb901e79129d457b72b3876a948a28c34557285
tree4685b1b5f167904f9b82926c0a4262e59242c8f9
parente404f91ed2180dfecbab15dd4d39c543353385fb
parent82acf2a8fe4764e21a7ad406590453b004751e58
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: remove the v0.7 related definitions from sfi.h