git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 726e07a 0a0755c)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 06:54:40 +0000 (22:54 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 6 Dec 2008 06:54:40 +0000 (22:54 -0800)
Conflicts:

drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-sta.c


Trivial merge
Pandora Kernel Repository