tree 4718ca3186d92819b3d617f32813eab6a1896b91
parent db98a6cfcc9ac951067c9a2cb60459b618fd7b10
parent d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197
author John W. Linville <linville@tuxdriver.com> 1294256141 -0500
committer John W. Linville <linville@tuxdriver.com> 1294256141 -0500

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6