summaryrefslogtreecommitdiffstats
path: root/fs/xfs/linux-2.6
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-26 17:18:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-26 17:18:11 -0800
commit41630959ed5ce694ec2e8c0f3c69743e011394c8 (patch)
tree868cfa36577ebfad69f78180656cdca313c7498d /fs/xfs/linux-2.6
parent2b8c70b2174402ca3dec13310ce56597233392d7 (diff)
parentc4d1409bbed8cf2a11b48ce3a075e142f686a588 (diff)
Merge branch 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6
* 'ibft-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6: ibft: Update MAINTAINERS file. drivers/firmware/iscsi_ibft.c: remove NIPQUAD_FMT, use %pI4
Diffstat (limited to 'fs/xfs/linux-2.6')
0 files changed, 0 insertions, 0 deletions