summaryrefslogtreecommitdiffstats
path: root/drivers/net/fec.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 23:04:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-21 23:04:25 +0200
commita9ccd80aadadef8c424142d41fddea7c0880f0e9 (patch)
treed8f1078b9154ce4b4046d4fa2d744e22e260b0eb /drivers/net/fec.c
parentMerge branch 'stable/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentswiotlb: Use page alignment for early buffer allocation (diff)
downloadlinux-a9ccd80aadadef8c424142d41fddea7c0880f0e9.tar.xz
linux-a9ccd80aadadef8c424142d41fddea7c0880f0e9.zip
Merge branch 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6
* 'stable/swiotlb-0.9' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6: swiotlb: Use page alignment for early buffer allocation swiotlb: make io_tlb_overflow static
Diffstat (limited to 'drivers/net/fec.c')
0 files changed, 0 insertions, 0 deletions