]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
Conflicts:

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


Trivial merge