2741c3821061f2f40f2b5c8ec parent de221bd5eb5e754806fcc39c40bb12b96515d9c5 parent acd9f9cc305ca2e5da2a39f6f6160cd4b476e38b author David S. Miller 1296071389 -0800 committer David S. Miller 1296071389 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 ¨3q•š