tree 5e876e7587f299cadce0b53bfaf912fb28d8283d
parent 73e42897e8e5619eacb787d2ce69be12f47cfc21
parent a97f4424fb4cddecf9b13c9b0e3f79924b624a7f
author David S. Miller <davem@davemloft.net> 1245485800 -0700
committer David S. Miller <davem@davemloft.net> 1245485800 -0700

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