projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d5fc1d5 57a5f3c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Aug 2010 18:25:58 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Aug 2010 18:25:58 +0000 (11:25 -0700)
commit5abd9ccced7a726c817dd6b5b96bc933859138d1
tree52b4612b5fb54f00364eadf39e0155209498e5d9tree | snapshot
parentd5fc1d517543857ea117fc57f23b394aa9784f06commit | diff
parent57a5f3c99c99f70f8fdfa0bbc83b98c48f56551acommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/konrad/ibft-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6:
  ibft: Use IBFT_SIGN instead of open-coding the search string.
  ibft: convert iscsi_ibft module to iscsi boot lib
  ibft: separate ibft parsing from sysfs interface
  ibft: For UEFI machines actually do scan ACPI for iBFT.
  ibft: Update iBFT handling for v1.03 of the spec.
John Crispins staging tree