074d8912a59073ee5 parent fd76f148ebc67d662f71f00128c8ddb0538168c0 parent b8d92c9c141ee3dc9b3537b1f0ffb4a54ea8d9b2 author John W. Linville 1274117465 -0400 committer John W. Linville 1274117465 -0400 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Ÿ tYœNx