Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Mon, 22 Dec 2008 03:57:10 +0000 (19:57 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Dec 2008 03:57:10 +0000 (19:57 -0800)
commitc2da953a46b18b7515ad476c1c1686640a12e93a
treeb384f097718119e715cdebd74710ddceeb80fdc8
parentc94cb314503a69492bf4455dce4f6d300cff0851
parent9cf7f247bd0cd21e475c71a4e018bb612ef02aab
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6