Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
David S. Miller [Tue, 17 Jan 2012 17:11:52 +0000 (12:11 -0500)]

Trivial merge