git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99dd1a2 066b211)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Thu, 15 May 2008 07:34:44 +0000 (00:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 15 May 2008 07:34:44 +0000 (00:34 -0700)
Conflicts:

drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c


Trivial merge
Pandora Kernel Repository