git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c655705 69da6b8)
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
Pandora Kernel Repository