tree 57ff502553918aa7309b7375e983f27f719e7b28
parent 44757223cd77f6e332dfa0b043c67df7b665bc19
parent ceeec3dc375e3b0618f16b34efc56fe093918f8b
author Linus Torvalds <torvalds@evo.osdl.org> 1125647313 -0700
committer Linus Torvalds <torvalds@evo.osdl.org> 1125647313 -0700

Merge refs/heads/ieee80211-wifi from master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6