diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 11:25:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 11:25:58 -0700 |
| commit | 5abd9ccced7a726c817dd6b5b96bc933859138d1 (patch) | |
| tree | 52b4612b5fb54f00364eadf39e0155209498e5d9 /include/net/scm.h | |
| parent | d5fc1d517543857ea117fc57f23b394aa9784f06 (diff) | |
| parent | 57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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.
Diffstat (limited to 'include/net/scm.h')
0 files changed, 0 insertions, 0 deletions