git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a33bc5c 0a92457)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 31 Jul 2009 02:22:43 +0000 (19:22 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 31 Jul 2009 02:22:43 +0000 (19:22 -0700)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c


Trivial merge
Pandora Kernel Repository