git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56fd49e
0874073
)
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
author
John W. Linville
<linville@tuxdriver.com>
Fri, 30 Sep 2011 18:52:16 +0000
(14:52 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 30 Sep 2011 18:52:29 +0000
(14:52 -0400)
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff