From: David S. Miller Date: Tue, 9 Oct 2012 17:14:32 +0000 (-0400) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux X-Git-Tag: v3.7-rc1~66^2~7 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8dd9117cc7a021ced1c5cf177e2d44dd92b88617;p=~emulex%2Finfiniband.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux Pulled mainline in order to get the UAPI infrastructure already merged before I pull in David Howells's UAPI trees for networking. Signed-off-by: David S. Miller --- 8dd9117cc7a021ced1c5cf177e2d44dd92b88617