tree cad990f58f9ec6d400226dda86718fc10781416e
parent 16e310ae6ed352c4963b1f2413fcd88fa693eeda
parent 547b1e81afe3119f7daf702cc03b158495535a25
author David S. Miller <davem@davemloft.net> 1349802872 -0400
committer David S. Miller <davem@davemloft.net> 1349802872 -0400

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 <davem@davemloft.net>