Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 11 Sep 2008 23:08:24 +0000 (16:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 11 Sep 2008 23:08:24 +0000 (16:08 -0700)
commit1f07553a58c65741d6d125621123ecf9093fa0e3
treeeda3dbe423a85a6bd07aba954f52d2fc6fa4336d
parentc65570503716015110350ba1c52a04156df3a455
parent69da6b87fcb270f758fe75141c32e041f8db510c
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

drivers/net/wireless/ath9k/beacon.c
drivers/net/wireless/ath9k/core.h