tree b0ad8d03710ee556e97515ba1c949233859391ce
parent 6cd9b49d7328c4656bfc17fcb47fb814955d40d2
parent 891dc5e73783eeabd2a704a9425e2a199b39c9f9
author David S. Miller <davem@davemloft.net> 1262209889 -0800
committer David S. Miller <davem@davemloft.net> 1262209889 -0800

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