git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4d562e fb9e2d8)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 7 Apr 2010 06:53:30 +0000 (23:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 7 Apr 2010 06:53:30 +0000 (23:53 -0700)
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c


Trivial merge
Pandora Kernel Repository