git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0c81733
56e6417
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Wed, 15 Dec 2010 21:33:28 +0000
(16:33 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 15 Dec 2010 21:33:28 +0000
(16:33 -0500)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff