git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1dc0f3c 4b8fe66)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Dec 2010 20:27:22 +0000 (12:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Dec 2010 20:27:22 +0000 (12:27 -0800)
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c


Trivial merge
Pandora Kernel Repository