From: David Woodhouse Date: Sat, 8 Aug 2009 10:25:28 +0000 (+0100) Subject: Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a131bc185528331451a93db6c50a7d2070376a61;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6 Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree no longer trip over bugs which were already fixed (sorry, Horms). --- a131bc185528331451a93db6c50a7d2070376a61