From: Linus Torvalds Date: Wed, 4 Aug 2010 18:25:58 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad... X-Git-Tag: v2.6.36-rc1~572 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=5abd9ccced7a726c817dd6b5b96bc933859138d1;p=cascardo%2Flinux.git 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. --- 5abd9ccced7a726c817dd6b5b96bc933859138d1