Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Thu, 29 Jan 2009 23:27:47 +0000 (15:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Thu, 29 Jan 2009 23:27:47 +0000 (15:27 -0800)
commitae9e47e9e864bc5f0a7a7e71dc3f287196b3626b
tree08aac6bd0b77fb8a3936f120e87574cb32459d2d
parenta4e6db07984529847c6ad8bc616485e721dcb809
parentbe0093705c3ce98d73cac0ca8f93ea105cdf4e9c
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6