summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 11:25:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-04 11:25:58 -0700
commit5abd9ccced7a726c817dd6b5b96bc933859138d1 (patch)
tree52b4612b5fb54f00364eadf39e0155209498e5d9 /drivers/net/wireless/wl12xx
parentd5fc1d517543857ea117fc57f23b394aa9784f06 (diff)
parent57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a (diff)
downloadlinux-5abd9ccced7a726c817dd6b5b96bc933859138d1.tar.gz
linux-5abd9ccced7a726c817dd6b5b96bc933859138d1.tar.bz2
linux-5abd9ccced7a726c817dd6b5b96bc933859138d1.zip
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 'drivers/net/wireless/wl12xx')
0 files changed, 0 insertions, 0 deletions