projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90494cc 5f98ecd)
Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <[email protected]>
Thu, 9 Jun 2011 19:52:44 +0000 (12:52 -0700)
committerLinus Torvalds <[email protected]>
Thu, 9 Jun 2011 19:52:44 +0000 (12:52 -0700)
* 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6:
  swiotlb: Export swioltb_nr_tbl and utilize it as appropiate.

1  2 
drivers/xen/swiotlb-xen.c patch | diff1 | diff2 | blob | history

diff --cc drivers/xen/swiotlb-xen.c
Simple merge
John Crispins staging tree