d2dc0fb65b30469c877e79bc70c7345097aef31c parent 7775c9753b94fe429dc4323360d6502c95e0dd6e parent cb62eccd7d946f7fb92b8beb79988726ec92c227 author David S. Miller 1213490018 -0700 committer David S. Miller 1213490018 -0700 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 ;p