git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93c8b90 0523820)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 1 Oct 2008 13:12:56 +0000 (06:12 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Oct 2008 13:12:56 +0000 (06:12 -0700)
Conflicts:

drivers/net/wireless/ath9k/core.c
drivers/net/wireless/ath9k/main.c
net/core/dev.c


Trivial merge
Pandora Kernel Repository